diff --git a/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml b/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
index b031e885f93eaf7205c7b97057482c3d4fd21752..27660b98bf93c2d48b014963f99ee0890769cc2d 100644
--- a/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
+++ b/config/metrics/counts_28d/20210216174910_analytics_unique_visits_for_any_target_monthly.yml
@@ -5,11 +5,11 @@ description: Unique visitors to any analytics feature by month
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 tier:
@@ -19,3 +19,4 @@ performance_indicator_type:
 - smau
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml b/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
index 85c50572707a21564b1bc978e4fed2da1550cfe4..af6504f4ae16bad0fa847a62c94c18002ae461f4 100644
--- a/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
+++ b/config/metrics/counts_28d/20210216174933_p_analytics_pipelines_monthly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /groups/:group/-/analytics/ci_cd by month
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_analytics_pipelines
+  - p_analytics_pipelines
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml b/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
index 70d4cb50aa43c6fd6fcfd8fab94aa8b7b103417d..4512b97d6e9e107d754c42049cc7c37ea74ccd65 100644
--- a/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
+++ b/config/metrics/counts_28d/20210216174941_p_analytics_valuestream_monthly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /:group/:project/-/value_stream_analytics by mon
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_analytics_valuestream
+  - p_analytics_valuestream
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml b/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
index ed867d30ff3f72ddaa80eeffdd203d23ec7c7def..a46d13e0085e502e71e24b3a2a6335afa62826e2 100644
--- a/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
+++ b/config/metrics/counts_28d/20210216174956_i_analytics_cohorts_monthly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.analytics.i_analytics_cohorts_monthly
-description: 
+description:
 product_section: fulfillment
 product_stage: fulfillment
 product_group: group::utilization
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_analytics_cohorts
+  - i_analytics_cohorts
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml b/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
index af99fdbcca85f3b6e0e5521c3f5887c770274017..9e94beda9b673dde4c27e7d54f9eab8532b012b6 100644
--- a/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
+++ b/config/metrics/counts_28d/20210216175000_i_analytics_dev_ops_score_monthly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /admin/dev_ops_report by month
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_analytics_dev_ops_score
+  - i_analytics_dev_ops_score
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml b/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml
index 7ef394eddae1dab5f04cf41d1919abf090c760dc..f6671c22f1351b82fdd74e833712e95d10b9d00c 100644
--- a/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216175004_g_analytics_merge_request_monthly.yml
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_analytics_merge_request
+  - g_analytics_merge_request
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml b/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml
index b46687608b45933a80665de8539b5449e9be127b..41048735686649bc7412c33a38204a1758bfa5a3 100644
--- a/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml
+++ b/config/metrics/counts_28d/20210216175012_i_analytics_instance_statistics_monthly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /admin/usage_trends by month
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_analytics_instance_statistics
+  - i_analytics_instance_statistics
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
index fa71e5607c1e82e9919425f189d9950f3d074a3d..2e3317dc4ba38b56a87e69f066910673fb50ac7e 100644
--- a/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216175016_analytics_total_unique_counts_monthly.yml
@@ -13,26 +13,27 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - users_viewing_analytics_group_devops_adoption
-    - i_analytics_dev_ops_adoption
-    - i_analytics_dev_ops_score
-    - p_analytics_merge_request
-    - i_analytics_instance_statistics
-    - g_analytics_contribution
-    - g_analytics_insights
-    - g_analytics_issues
-    - g_analytics_productivity
-    - g_analytics_valuestream
-    - p_analytics_pipelines
-    - p_analytics_code_reviews
-    - p_analytics_valuestream
-    - p_analytics_insights
-    - p_analytics_issues
-    - p_analytics_repo
-    - i_analytics_cohorts
+  - users_viewing_analytics_group_devops_adoption
+  - i_analytics_dev_ops_adoption
+  - i_analytics_dev_ops_score
+  - p_analytics_merge_request
+  - i_analytics_instance_statistics
+  - g_analytics_contribution
+  - g_analytics_insights
+  - g_analytics_issues
+  - g_analytics_productivity
+  - g_analytics_valuestream
+  - p_analytics_pipelines
+  - p_analytics_code_reviews
+  - p_analytics_valuestream
+  - p_analytics_insights
+  - p_analytics_issues
+  - p_analytics_repo
+  - i_analytics_cohorts
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175055_merge_requests.yml b/config/metrics/counts_28d/20210216175055_merge_requests.yml
index 97e1983b5d6bf1352743a26b27ec851630c18d2b..999370ab812fcac59900e763fed86741fd6f007b 100644
--- a/config/metrics/counts_28d/20210216175055_merge_requests.yml
+++ b/config/metrics/counts_28d/20210216175055_merge_requests.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml
index 921ab4885fad9459b79655cc23d06f8ad845e200..4f0568162b66c05247407d89178857eb4ea6c71c 100644
--- a/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_28d/20210216175057_projects_with_disable_overriding_approvers_per_merge_request.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.create.projects_with_disable_overriding_approvers_per_merge_request
-description: Count of the number of projects with setting to disable overriding approvers per merge request
+description: Count of the number of projects with setting to disable overriding approvers
+  per merge request
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml
index b86af740a13e37da8fdac39fdcf8a76f06931602..462121c8f682a42d55f525c74f89ab342024b642 100644
--- a/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_28d/20210216175059_projects_without_disable_overriding_approvers_per_merge_request.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.create.projects_without_disable_overriding_approvers_per_merge_request
-description: Count of the number of projects without setting to disable overriding approvers per merge request
+description: Count of the number of projects without setting to disable overriding
+  approvers per merge request
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175101_merge_requests_users.yml b/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
index 6cdb30a18bfbd6e9f879cb5aeb636e4e6eca7c8d..4eb2daf0291640694f9acecbcf7ffe421c0d8e7e 100644
--- a/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
+++ b/config/metrics/counts_28d/20210216175101_merge_requests_users.yml
@@ -20,3 +20,4 @@ tier:
 performance_indicator_type:
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175109_suggestions.yml b/config/metrics/counts_28d/20210216175109_suggestions.yml
index 6b41d92d91f7099d78700954dc30cf79a30b563b..301f0774ea13439cc48fa89f3dd16f695f57748c 100644
--- a/config/metrics/counts_28d/20210216175109_suggestions.yml
+++ b/config/metrics/counts_28d/20210216175109_suggestions.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.create.suggestions
-description: Count of unique users per month who create suggestions in merge request comments
+description: Count of unique users per month who create suggestions in merge request
+  comments
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml b/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml
index 2db087832d0eefa3c652b24f7b7a83e99c8965c6..adb4c24b1e5bfe23d05f7cfcff509c8764c569e2 100644
--- a/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216175113_merge_request_action_monthly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml b/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml
index be85a73c7fa04a03180f36b03dfec64251e96f9c..0eb0c0cd202e0a17c43dbaed97871585a6ff9edb 100644
--- a/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml
+++ b/config/metrics/counts_28d/20210216175117_i_source_code_code_intelligence_monthly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml b/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml
index 18b89a5b25a99d2f962caf6a6660ec2a953894ca..0d074a735e4dd2b2de446f365f56ef921c7b6c28 100644
--- a/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml
+++ b/config/metrics/counts_28d/20210216175120_i_code_review_mr_diffs_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_mr_diffs
+  - i_code_review_mr_diffs
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml b/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml
index b518c0409262bbb2b87023ebda266785e32b7eb3..7d384cd15f3471af0422b2e54bd31031891b6e29 100644
--- a/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml
+++ b/config/metrics/counts_28d/20210216175124_i_code_review_user_single_file_diffs_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_single_file_diffs
+  - i_code_review_user_single_file_diffs
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml b/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml
index c256637f36707bdb7741129ad86632150059d6f7..7ea07ce02ec08024abe08691ea18949c9ed515bc 100644
--- a/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml
+++ b/config/metrics/counts_28d/20210216175128_i_code_review_mr_single_file_diffs_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_mr_single_file_diffs
+  - i_code_review_mr_single_file_diffs
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml b/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
index 013f185730af1041b5cc96289ec850b4819ad2e3..dbfdd9cd8dfb8f35620310afdd96e8dd559ea042 100644
--- a/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175132_i_code_review_user_create_mr_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_create_mr
+  - i_code_review_user_create_mr
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml b/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml
index 744afd9809bfb4a61ffc908e058a5ce84493d6c4..726ceaa2f1b788ef239e3075ff1c9da38ec03aff 100644
--- a/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175136_i_code_review_user_close_mr_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_close_mr
+  - i_code_review_user_close_mr
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml b/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml
index 45f5b8e6dac3bff3b29225854b6780a48c8fd970..56d20c546e94b505c01486e09a194d656a2fe42c 100644
--- a/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175140_i_code_review_user_reopen_mr_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_reopen_mr
+  - i_code_review_user_reopen_mr
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml b/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml
index 4a7035c3ee158987202f0b9836921ae864513ac0..7a38d14c85a4ab1491a01498bc4dee6c0872583f 100644
--- a/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216175144_i_code_review_user_merge_mr_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_merge_mr
+  - i_code_review_user_merge_mr
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml
index 8fd9dd9778049f11229d2ef8398baa72e4d11b4c..a2803df3bdcd9fb686f574991fc05514fcc3b6af 100644
--- a/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216175148_i_code_review_user_create_mr_comment_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_create_mr_comment
+  - i_code_review_user_create_mr_comment
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml
index 693e70751044bbb544e38aacd6927b692c00eab0..450e631927ecfd2af16d44ad130339f6f5e19dc8 100644
--- a/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216175152_i_code_review_user_edit_mr_comment_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_edit_mr_comment
+  - i_code_review_user_edit_mr_comment
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml
index 80d47f52583210b170de3c48b475a5d50e4465c9..48d9a9374f6a764569acd0a67171d9ed374ba069 100644
--- a/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216175156_i_code_review_user_remove_mr_comment_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_remove_mr_comment
+  - i_code_review_user_remove_mr_comment
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml b/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml
index a92186f2678857d10a80295a0600c1df0eecb282..0399cc259a99e21c533ecbe9af70c8c13a39089f 100644
--- a/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml
+++ b/config/metrics/counts_28d/20210216175159_i_code_review_user_add_suggestion_monthly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_add_suggestion
+  - i_code_review_user_add_suggestion
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml b/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml
index 468b10623651594110d8f52ecf8adfd4485b2c89..53ecc3e24144f472c4cde48b861e26abc122168a 100644
--- a/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml
+++ b/config/metrics/counts_28d/20210216175203_i_code_review_user_apply_suggestion_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_apply_suggestion
+  - i_code_review_user_apply_suggestion
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml b/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml
index 4637648ce92ee231f25429aa8db8b7eeba6658d8..87255c7f02766c42145dd708d0e2d9f564c72a1c 100644
--- a/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml
+++ b/config/metrics/counts_28d/20210216175405_clusters_applications_cert_managers.yml
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -18,5 +18,8 @@ tier:
 - premium
 - ultimate
 skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters_applications_cert_managers.status IN (3, 5))'>_clusters_<with>_<adjective describing: '(clusters_applications_cert_managers.status IN (3, 5))'>_clusters_applications_cert_managers"
+name: 'count_distinct_user_id_from_<adjective describing: ''(clusters_applications_cert_managers.status
+  IN (3, 5))''>_clusters_<with>_<adjective describing: ''(clusters_applications_cert_managers.status
+  IN (3, 5))''>_clusters_applications_cert_managers'
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml b/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
index 9e092d6f2e35ee2290b71b1c171ee33f5dd1e94e..bf78e778964f99cc108ee2c8544224d48d9b2534 100644
--- a/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
+++ b/config/metrics/counts_28d/20210216175407_clusters_applications_helm.yml
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -18,5 +18,8 @@ tier:
 - premium
 - ultimate
 skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters_applications_helm.status IN (3, 5))'>_clusters_<with>_<adjective describing: '(clusters_applications_helm.status IN (3, 5))'>_clusters_applications_helm"
+name: 'count_distinct_user_id_from_<adjective describing: ''(clusters_applications_helm.status
+  IN (3, 5))''>_clusters_<with>_<adjective describing: ''(clusters_applications_helm.status
+  IN (3, 5))''>_clusters_applications_helm'
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml b/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
index 56ee17554ebf3c86a19b43197b8de1885cc98bdd..caa279e3c814d37ddbfb9e3f799e4d8e449b45b3 100644
--- a/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
+++ b/config/metrics/counts_28d/20210216175409_clusters_applications_ingress.yml
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -18,5 +18,8 @@ tier:
 - premium
 - ultimate
 skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters_applications_ingress.status IN (3, 5))'>_clusters_<with>_<adjective describing: '(clusters_applications_ingress.status IN (3, 5))'>_clusters_applications_ingress"
+name: 'count_distinct_user_id_from_<adjective describing: ''(clusters_applications_ingress.status
+  IN (3, 5))''>_clusters_<with>_<adjective describing: ''(clusters_applications_ingress.status
+  IN (3, 5))''>_clusters_applications_ingress'
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml b/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
index 3bed0406dd57f7fa98ea97d3d71b08b963caf950..0aa251b4426eb6e6441b6f5926820700daf2b7c1 100644
--- a/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
+++ b/config/metrics/counts_28d/20210216175411_clusters_applications_knative.yml
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -18,5 +18,8 @@ tier:
 - premium
 - ultimate
 skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters_applications_knative.status IN (3, 5))'>_clusters_<with>_<adjective describing: '(clusters_applications_knative.status IN (3, 5))'>_clusters_applications_knative"
+name: 'count_distinct_user_id_from_<adjective describing: ''(clusters_applications_knative.status
+  IN (3, 5))''>_clusters_<with>_<adjective describing: ''(clusters_applications_knative.status
+  IN (3, 5))''>_clusters_applications_knative'
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175413_clusters_management_project.yml b/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
index 6e7f851eb6d15dedcea2adc012307f5b35dba7de..bf25c13788be3565d3320ea9da95fd95f62a1d1b 100644
--- a/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
+++ b/config/metrics/counts_28d/20210216175413_clusters_management_project.yml
@@ -1,8 +1,9 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.clusters_management_project
-name: "count_distinct_user_id_from_management_project_clusters"
-description: Number of Kubernetes clusters with clusters management project being set
+name: count_distinct_user_id_from_management_project_clusters
+description: Number of Kubernetes clusters with clusters management project being
+  set
 product_section: ops
 product_stage: configure
 product_group: group::configure
@@ -19,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175415_clusters_disabled.yml b/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
index 8c2e9b87870ae733695cf985ab1596ddd4a31218..7e1604b2bc1134289cced8dc74a00473d3e607ec 100644
--- a/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175415_clusters_disabled.yml
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -18,5 +18,6 @@ tier:
 - premium
 - ultimate
 skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = FALSE)'>_clusters"
+name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.enabled = FALSE)''>_clusters'
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175417_clusters_enabled.yml b/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
index 80e3872ddc3552fa594a97d3ce016ed8b2651e6e..b3e973348db5d0f9d9822a171e0c1d165d5ccb9c 100644
--- a/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175417_clusters_enabled.yml
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -18,5 +18,6 @@ tier:
 - premium
 - ultimate
 skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = TRUE)'>_clusters"
+name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.enabled = TRUE)''>_clusters'
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml b/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
index 0a2f09a4bc00b631abe228b318e704e091ae14d8..e766872ba8b2df0dbbffab2cffb740f23948e2aa 100644
--- a/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
+++ b/config/metrics/counts_28d/20210216175419_clusters_platforms_gke.yml
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -18,5 +18,9 @@ tier:
 - premium
 - ultimate
 skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters.provider_type = 1 AND (cluster_providers_gcp.status IN (3)) AND clusters.enabled = TRUE)'>_clusters_<with>_<adjective describing: '(clusters.provider_type = 1 AND (cluster_providers_gcp.status IN (3)) AND clusters.enabled = TRUE)'>_cluster_providers_gcp"
+name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.provider_type
+  = 1 AND (cluster_providers_gcp.status IN (3)) AND clusters.enabled = TRUE)''>_clusters_<with>_<adjective
+  describing: ''(clusters.provider_type = 1 AND (cluster_providers_gcp.status IN (3))
+  AND clusters.enabled = TRUE)''>_cluster_providers_gcp'
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml b/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
index 63da2198876c1147c747c6333773c876c2892fef..2cf73d21b2054d28260e2bebaa1cafb3e85ae738 100644
--- a/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
+++ b/config/metrics/counts_28d/20210216175420_clusters_platforms_eks.yml
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -18,5 +18,9 @@ tier:
 - premium
 - ultimate
 skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters.provider_type = 2 AND (cluster_providers_aws.status IN (3)) AND clusters.enabled = TRUE)'>_clusters_<with>_<adjective describing: '(clusters.provider_type = 2 AND (cluster_providers_aws.status IN (3)) AND clusters.enabled = TRUE)'>_cluster_providers_aws"
+name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.provider_type
+  = 2 AND (cluster_providers_aws.status IN (3)) AND clusters.enabled = TRUE)''>_clusters_<with>_<adjective
+  describing: ''(clusters.provider_type = 2 AND (cluster_providers_aws.status IN (3))
+  AND clusters.enabled = TRUE)''>_cluster_providers_aws'
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml b/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
index 2cb190d348f28cfbc1c497a1e9cc7f44a2ae40a0..8051bc1da6d455011e80436c39b8a979200be528 100644
--- a/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
+++ b/config/metrics/counts_28d/20210216175422_clusters_platforms_user.yml
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -18,5 +18,7 @@ tier:
 - premium
 - ultimate
 skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters.provider_type = 0 AND clusters.enabled = TRUE)'>_clusters"
+name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.provider_type
+  = 0 AND clusters.enabled = TRUE)''>_clusters'
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml b/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
index e67abe0543c04491a4efd94c60a7bb01cc850d82..6f8691ffdae9dfea7419973d0db74879bb8d9b86 100644
--- a/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175424_instance_clusters_disabled.yml
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -18,5 +18,7 @@ tier:
 - premium
 - ultimate
 skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = FALSE AND clusters.cluster_type = 1)'>_clusters"
+name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.enabled = FALSE
+  AND clusters.cluster_type = 1)''>_clusters'
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml b/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
index 44784dbf040a63a3e58d976ffb17c537e826a491..d97c7babe34f2f08fe7c874303c5b02f36e99a0b 100644
--- a/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175426_instance_clusters_enabled.yml
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -18,5 +18,7 @@ tier:
 - premium
 - ultimate
 skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = TRUE AND clusters.cluster_type = 1)'>_clusters"
+name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.enabled = TRUE
+  AND clusters.cluster_type = 1)''>_clusters'
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml b/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
index 61735006560d162f94a12d7773c23b07fc6e6434..00d71cf8de5f77cd06007ec5845cac06908d7b37 100644
--- a/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175428_group_clusters_disabled.yml
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -18,5 +18,7 @@ tier:
 - premium
 - ultimate
 skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = FALSE AND clusters.cluster_type = 2)'>_clusters"
+name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.enabled = FALSE
+  AND clusters.cluster_type = 2)''>_clusters'
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml b/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
index 3973ddf26b6ff5471ca8940217a9bc9f26ef4131..aae8498d975548aec39ca7f3254b02fa4acac273 100644
--- a/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175430_group_clusters_enabled.yml
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -18,5 +18,7 @@ tier:
 - premium
 - ultimate
 skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = TRUE AND clusters.cluster_type = 2)'>_clusters"
+name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.enabled = TRUE
+  AND clusters.cluster_type = 2)''>_clusters'
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml b/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
index 17b6fef01515e6c685c446d67c9598b0f87832e6..a3ac9e910acb915a9a1eaedd06a53e11fcba8339 100644
--- a/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
+++ b/config/metrics/counts_28d/20210216175432_project_clusters_disabled.yml
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -18,5 +18,7 @@ tier:
 - premium
 - ultimate
 skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = FALSE AND clusters.cluster_type = 3)'>_clusters"
+name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.enabled = FALSE
+  AND clusters.cluster_type = 3)''>_clusters'
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml b/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
index a59cdae01e5037f0eccc99b663c9bbeb687d9438..32a019838d9538ffffaaf59f9dad9cc75f2b77e1 100644
--- a/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
+++ b/config/metrics/counts_28d/20210216175434_project_clusters_enabled.yml
@@ -9,7 +9,7 @@ product_category: kubernetes_management
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -18,5 +18,7 @@ tier:
 - premium
 - ultimate
 skip_validation: true
-name: "count_distinct_user_id_from_<adjective describing: '(clusters.enabled = TRUE AND clusters.cluster_type = 3)'>_clusters"
+name: 'count_distinct_user_id_from_<adjective describing: ''(clusters.enabled = TRUE
+  AND clusters.cluster_type = 3)''>_clusters'
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175542_ci_builds.yml b/config/metrics/counts_28d/20210216175542_ci_builds.yml
index ac42d618ea00da4fced0de6bed7b1622e8a1cc29..95cb0135e623279d9f93f72b6c53f8a808ebf7db 100644
--- a/config/metrics/counts_28d/20210216175542_ci_builds.yml
+++ b/config/metrics/counts_28d/20210216175542_ci_builds.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml b/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
index a3044a7b9aa9494d5f65ca928abf0a2b94a6feaf..7cb2afc5f493586e6aae2bd294c7afd141c9fe24 100644
--- a/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175544_ci_external_pipelines.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml b/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
index 2b125cf1a7c4a055fdd294a31552742e0924ea02..1d0d719d736a56db87da93683c3ed8cf7124c40c 100644
--- a/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175546_ci_internal_pipelines.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml
index 8bf228643c8a36c19e79585fd51a62fc9b0c7212..76788ba1b8eafc0a772f5d12ea4476d47f3e11c0 100644
--- a/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml
+++ b/config/metrics/counts_28d/20210216175548_ci_pipeline_config_auto_devops.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml b/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
index dd470b7da229fdcd8764bcf7ab2638331607ce14..19f793da7f8706ed61bfa7913d2080df9012bbb3 100644
--- a/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_28d/20210216175550_ci_pipeline_config_repository.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml b/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
index a593d08a567eae102d101a1a1cf58cbfee626915..e24c10ab6aad26effb16897f4e5b34b79dc281db 100644
--- a/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_28d/20210216175552_ci_pipeline_schedules.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175554_ci_pipelines.yml b/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
index fdb67b99e55c27702969d470fdb1efa77fe0ce1e..f6d9c2c77b27ec5f3bbeea51a028a28207d107a1 100644
--- a/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
+++ b/config/metrics/counts_28d/20210216175554_ci_pipelines.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.verify.ci_pipelines
-description: "Distinct users triggering pipelines in a month"
+description: Distinct users triggering pipelines in a month
 product_section: ops
 product_stage: verify
 product_group: group::pipeline execution
@@ -22,3 +22,4 @@ performance_indicator_type:
 - smau
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216175556_ci_triggers.yml b/config/metrics/counts_28d/20210216175556_ci_triggers.yml
index a8f784ec579d8e4362a390a5b3b6b15e42d68b0f..1b79e112a37203520486ee1ba2f1138a8fb81d41 100644
--- a/config/metrics/counts_28d/20210216175556_ci_triggers.yml
+++ b/config/metrics/counts_28d/20210216175556_ci_triggers.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180308_personal_snippets.yml b/config/metrics/counts_28d/20210216180308_personal_snippets.yml
index 1a4183acc620577190001f3b31d971826fa64793..993aa62a3841bc2238bd2e957eafef371e0b8eea 100644
--- a/config/metrics/counts_28d/20210216180308_personal_snippets.yml
+++ b/config/metrics/counts_28d/20210216180308_personal_snippets.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180310_project_snippets.yml b/config/metrics/counts_28d/20210216180310_project_snippets.yml
index 1037c5ed029a4a9ee594fd8547f6971299be7394..bcc0e607f5af40e749321ae70f4bae182707ca39 100644
--- a/config/metrics/counts_28d/20210216180310_project_snippets.yml
+++ b/config/metrics/counts_28d/20210216180310_project_snippets.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180312_snippets.yml b/config/metrics/counts_28d/20210216180312_snippets.yml
index 22e242d5cab36a90c12615e9c190f4956a7dacdf..ba80b6c583fcf26aaf2bc1d6a88aa8d1b0adf946 100644
--- a/config/metrics/counts_28d/20210216180312_snippets.yml
+++ b/config/metrics/counts_28d/20210216180312_snippets.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180317_snippets.yml b/config/metrics/counts_28d/20210216180317_snippets.yml
index b501c8dd6d0130cd85fdd2327b6b7250e27d76cb..783613bd5090348a8dd48487b0d9f08fdb799dbe 100644
--- a/config/metrics/counts_28d/20210216180317_snippets.yml
+++ b/config/metrics/counts_28d/20210216180317_snippets.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml b/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml
index fc52a50969e32b7d60f1bb1ecffd97976ab29533..3b482949b35b935fee4a63282d5d8f71e0d07830 100644
--- a/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml
+++ b/config/metrics/counts_28d/20210216180319_action_monthly_active_users_web_ide_edit.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml b/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml
index 809f1bcc52fe91eef8aa9dd847204afa91628d87..6ec45a8c101be92b79d3b62792760cba68089fd3 100644
--- a/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml
+++ b/config/metrics/counts_28d/20210216180321_action_monthly_active_users_sfe_edit.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml b/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml
index 6c9bb0319cc9e48d9b1912040d8bc7f78ccc3461..d28300e73a182079ba8c60b04a8b20db0e436cac 100644
--- a/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml
+++ b/config/metrics/counts_28d/20210216180323_action_monthly_active_users_snippet_editor_edit.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml b/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml
index a181eacd724ef6d669690b7aa306ded98d292270..5cdc25d64666abb77d558a7a8418905fc7b90a41 100644
--- a/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml
+++ b/config/metrics/counts_28d/20210216180325_action_monthly_active_users_sse_edit.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml b/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
index f15f9817a58e2e5acf6a78ad396e9edfa88f711e..120550075894465b6a050b8dd0ee7dcad4ee0adb 100644
--- a/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
+++ b/config/metrics/counts_28d/20210216180327_action_monthly_active_users_ide_edit.yml
@@ -20,3 +20,4 @@ tier:
 performance_indicator_type:
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml b/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
index 770ba30b8a2cfce544f6c61640bb06843f73a7ea..94a7b14186b91ca836c4f0ccd80686e355e84fb2 100644
--- a/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
+++ b/config/metrics/counts_28d/20210216180330_g_edit_by_web_ide_monthly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml b/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
index 44a6758d41eba54c471c9c9dee2b029555b6a9da..6b1c4f7a657733a87bf43227da1ca51049504f43 100644
--- a/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
+++ b/config/metrics/counts_28d/20210216180334_g_edit_by_sfe_monthly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml b/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
index 5cc87cba4692e521b195b3d3e30aee26cab0f533..a09a4d808072decbcdf8abf0992c8419bf232a06 100644
--- a/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
+++ b/config/metrics/counts_28d/20210216180338_g_edit_by_snippet_ide_monthly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
index 81ccdfd085403f1b4cadde7d749f049cf46b7bc1..30f88f07af8dc9d1d157e71c320f5cef6da422be 100644
--- a/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216180341_ide_edit_total_unique_counts_monthly.yml
@@ -25,3 +25,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml b/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml
index 89afaa17bcea576df40225c0b9e4db4996cf2b12..d8e256c5a27c80d88a94b60517ae3b1060da9c8e 100644
--- a/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml
+++ b/config/metrics/counts_28d/20210216180424_i_search_total_monthly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml
index 41d6d1f0d962508cbef52fddeee9b7e7989ba450..c2a2fa740282b833a806bf0d6d38e016568e40d3 100644
--- a/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216180431_search_total_unique_counts_monthly.yml
@@ -1,7 +1,10 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.search.search_total_unique_counts_monthly
-description: Total unique users for i_search_total, i_search_advanced, i_search_paid for recent 28 days. This metric is redundant because advanced will be a subset of paid and paid will be a subset of total. i_search_total is more appropriate if you just want the total
+description: Total unique users for i_search_total, i_search_advanced, i_search_paid
+  for recent 28 days. This metric is redundant because advanced will be a subset of
+  paid and paid will be a subset of total. i_search_total is more appropriate if you
+  just want the total
 product_section: enablement
 product_stage: enablement
 product_group: group::global search
@@ -25,3 +28,4 @@ tier:
 - ultimate
 performance_indicator_type:
 - gmau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml b/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml
index 8a76ed1dc22ba0f8af7c712b2177a1f1b69828a9..f1aff3238387c74d5375e5ab7a30bc20a08b350b 100644
--- a/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml
+++ b/config/metrics/counts_28d/20210216180509_incident_management_alerts_total_unique_counts.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml b/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml
index c561aafb14432949c3047e6c62e60937bb56755f..32f3effb44da2e4c5622e12a439e838d1f72351d 100644
--- a/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml
+++ b/config/metrics/counts_28d/20210216180511_incident_management_incidents_total_unique_counts.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml b/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml
index f9a8a2d440a1a51e346b162ba5ebc5e477460f97..643e4e40a6a230d425efd503d29881eae08e4206 100644
--- a/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml
+++ b/config/metrics/counts_28d/20210216180524_projects_with_incidents.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.projects_with_incidents
-description: 'Count of unique projects with an incident created in the last month'
+description: Count of unique projects with an incident created in the last month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml b/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml
index 70234ac6602fe4fc72b0e14a7b3fa8c59eadb578..46a076ed2e0419ca8dccf19eedcee409aa464720 100644
--- a/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml
+++ b/config/metrics/counts_28d/20210216180526_projects_with_alert_incidents.yml
@@ -1,8 +1,8 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.projects_with_alert_incidents
-description: 'Count of unique projects with an incident from an alert created in the
-  last month'
+description: Count of unique projects with an incident from an alert created in the
+  last month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180530_incident_management_alert_status_changed_monthly.yml b/config/metrics/counts_28d/20210216180530_incident_management_alert_status_changed_monthly.yml
index 5bbb15c786c146d4004394f989b7baece6c918e0..412b1b718731da977e4ee827c874eefe327ee59a 100644
--- a/config/metrics/counts_28d/20210216180530_incident_management_alert_status_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216180530_incident_management_alert_status_changed_monthly.yml
@@ -5,7 +5,7 @@ description: Count of unique users changing alert's status changes per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_alert_status_changed
+  - incident_management_alert_status_changed
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180533_incident_management_alert_assigned_monthly.yml b/config/metrics/counts_28d/20210216180533_incident_management_alert_assigned_monthly.yml
index a23e14b88799a0d0a1ecf378eff50fe4e2f1d54f..f10043b70c5de6c502dadc8348e930e50f4216ab 100644
--- a/config/metrics/counts_28d/20210216180533_incident_management_alert_assigned_monthly.yml
+++ b/config/metrics/counts_28d/20210216180533_incident_management_alert_assigned_monthly.yml
@@ -5,7 +5,7 @@ description: Count of unique users assigning an alert per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_alert_assigned
+  - incident_management_alert_assigned
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180537_incident_management_alert_todo_monthly.yml b/config/metrics/counts_28d/20210216180537_incident_management_alert_todo_monthly.yml
index 4cbc1280562f00109aa393052911d29c71bdfa24..6276f172cb814cd14719d9cf9fa34c9263ef88ca 100644
--- a/config/metrics/counts_28d/20210216180537_incident_management_alert_todo_monthly.yml
+++ b/config/metrics/counts_28d/20210216180537_incident_management_alert_todo_monthly.yml
@@ -5,7 +5,7 @@ description: Count of unique users adding alerts to the TODO list per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_alert_todo
+  - incident_management_alert_todo
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180541_incident_management_incident_created_monthly.yml b/config/metrics/counts_28d/20210216180541_incident_management_incident_created_monthly.yml
index 97680ad4d1b823ba7fe7226501a1848079950f12..124f29ae5a16383d80ca732ec3dd38ab53227afb 100644
--- a/config/metrics/counts_28d/20210216180541_incident_management_incident_created_monthly.yml
+++ b/config/metrics/counts_28d/20210216180541_incident_management_incident_created_monthly.yml
@@ -5,7 +5,7 @@ description: Count of unique users creating incidents per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_created
+  - incident_management_incident_created
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180545_incident_management_incident_reopened_monthly.yml b/config/metrics/counts_28d/20210216180545_incident_management_incident_reopened_monthly.yml
index f14f31af62dab8ec4f273e7a80f921712e9a669d..38f5dc4735cd3b269eef1abf7b267085b225d78b 100644
--- a/config/metrics/counts_28d/20210216180545_incident_management_incident_reopened_monthly.yml
+++ b/config/metrics/counts_28d/20210216180545_incident_management_incident_reopened_monthly.yml
@@ -5,7 +5,7 @@ description: Count of unique users reopening incidents per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_reopened
+  - incident_management_incident_reopened
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180548_incident_management_incident_closed_monthly.yml b/config/metrics/counts_28d/20210216180548_incident_management_incident_closed_monthly.yml
index 0809c3fab68b3927295367191f3c0d62d2985bd5..c1383c422fbb2900cb96929d3fd54b59f3bb5d21 100644
--- a/config/metrics/counts_28d/20210216180548_incident_management_incident_closed_monthly.yml
+++ b/config/metrics/counts_28d/20210216180548_incident_management_incident_closed_monthly.yml
@@ -5,7 +5,7 @@ description: Count of users closing incidents per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_closed
+  - incident_management_incident_closed
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180552_incident_management_incident_assigned_monthly.yml b/config/metrics/counts_28d/20210216180552_incident_management_incident_assigned_monthly.yml
index ceed852b509f848ef4fb15a931c2aa8d5b3f7303..cd051e1ad5cb43fd2697df05c2c35928d6eb6ca5 100644
--- a/config/metrics/counts_28d/20210216180552_incident_management_incident_assigned_monthly.yml
+++ b/config/metrics/counts_28d/20210216180552_incident_management_incident_assigned_monthly.yml
@@ -5,7 +5,7 @@ description: Count of users assigning incidents per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_assigned
+  - incident_management_incident_assigned
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180556_incident_management_incident_todo_monthly.yml b/config/metrics/counts_28d/20210216180556_incident_management_incident_todo_monthly.yml
index fbe1a334bbb375c22c610cfeac4fa9edbf723d58..c8cc00bb9d613bc1e285a51c86aff17b2964df56 100644
--- a/config/metrics/counts_28d/20210216180556_incident_management_incident_todo_monthly.yml
+++ b/config/metrics/counts_28d/20210216180556_incident_management_incident_todo_monthly.yml
@@ -5,7 +5,7 @@ description: Count of unique users adding incidents to the TODO list per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_todo
+  - incident_management_incident_todo
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180559_incident_management_incident_comment_monthly.yml b/config/metrics/counts_28d/20210216180559_incident_management_incident_comment_monthly.yml
index d812b52d97b61cd6604f61860646ce5ac48f92c9..773e99ed0039056a6e0d831c0d30912e26bac008 100644
--- a/config/metrics/counts_28d/20210216180559_incident_management_incident_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216180559_incident_management_incident_comment_monthly.yml
@@ -5,7 +5,7 @@ description: Count of unique users adding comments per month on incidents
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_comment
+  - incident_management_incident_comment
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180603_incident_management_incident_zoom_meeting_monthly.yml b/config/metrics/counts_28d/20210216180603_incident_management_incident_zoom_meeting_monthly.yml
index 313f75f7ebba9aec2366dd93c0e292abdb022c49..96f4de1240cdb90988c9ef97f422506fbd69f5c9 100644
--- a/config/metrics/counts_28d/20210216180603_incident_management_incident_zoom_meeting_monthly.yml
+++ b/config/metrics/counts_28d/20210216180603_incident_management_incident_zoom_meeting_monthly.yml
@@ -5,7 +5,7 @@ description: Count of users creating Zoom meetings about incidents per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_zoom_meeting
+  - incident_management_incident_zoom_meeting
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180611_incident_management_incident_relate_monthly.yml b/config/metrics/counts_28d/20210216180611_incident_management_incident_relate_monthly.yml
index 75c9fa64f8c50a52037d584f3709b247a3ec4aca..28d30ee0378ebc9b328797026a99e95ab55c4af4 100644
--- a/config/metrics/counts_28d/20210216180611_incident_management_incident_relate_monthly.yml
+++ b/config/metrics/counts_28d/20210216180611_incident_management_incident_relate_monthly.yml
@@ -1,11 +1,12 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_incident_relate_monthly
-description: Count of unique users adding issues per month that are related to an incident
+description: Count of unique users adding issues per month that are related to an
+  incident
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_relate
+  - incident_management_incident_relate
 distribution:
 - ce
 - ee
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180614_incident_management_incident_unrelate_monthly.yml b/config/metrics/counts_28d/20210216180614_incident_management_incident_unrelate_monthly.yml
index 473b0a2b2adcb0a5f9bb1f91a3312211bb4cfa44..01e21b8a3c56cfd3f24a12e237b4f5a35179ce73 100644
--- a/config/metrics/counts_28d/20210216180614_incident_management_incident_unrelate_monthly.yml
+++ b/config/metrics/counts_28d/20210216180614_incident_management_incident_unrelate_monthly.yml
@@ -5,7 +5,7 @@ description: Count of users removing issues that are related to an incident per
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_unrelate
+  - incident_management_incident_unrelate
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180618_incident_management_incident_change_confidential_monthly.yml b/config/metrics/counts_28d/20210216180618_incident_management_incident_change_confidential_monthly.yml
index 17ab21c98184a6ac67e415b3f984458320e6965d..60d606fb6115138219d159dd2be697b30d464269 100644
--- a/config/metrics/counts_28d/20210216180618_incident_management_incident_change_confidential_monthly.yml
+++ b/config/metrics/counts_28d/20210216180618_incident_management_incident_change_confidential_monthly.yml
@@ -5,7 +5,7 @@ description: Count of users changing incidents to confidential per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_change_confidential
+  - incident_management_incident_change_confidential
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml
index 5a09b270eb2fcbb52063d15752f722012820c9e5..f9430a0c9eba3370d39994182e1f47fa0285b9ec 100644
--- a/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216180622_incident_management_total_unique_counts_monthly.yml
@@ -5,7 +5,7 @@ description: Count of unique users performing events related with incidents per
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,20 +13,20 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_incident_created
-    - incident_management_incident_reopened
-    - incident_management_incident_closed
-    - incident_management_incident_assigned
-    - incident_management_incident_todo
-    - incident_management_incident_comment
-    - incident_management_incident_zoom_meeting
-    - incident_management_incident_published
-    - incident_management_incident_relate
-    - incident_management_incident_unrelate
-    - incident_management_incident_change_confidential
-    - incident_management_alert_status_changed
-    - incident_management_alert_assigned
-    - incident_management_alert_todo
+  - incident_management_incident_created
+  - incident_management_incident_reopened
+  - incident_management_incident_closed
+  - incident_management_incident_assigned
+  - incident_management_incident_todo
+  - incident_management_incident_comment
+  - incident_management_incident_zoom_meeting
+  - incident_management_incident_published
+  - incident_management_incident_relate
+  - incident_management_incident_unrelate
+  - incident_management_incident_change_confidential
+  - incident_management_alert_status_changed
+  - incident_management_alert_assigned
+  - incident_management_alert_todo
 distribution:
 - ce
 - ee
@@ -38,3 +38,4 @@ performance_indicator_type:
 - smau
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180625_incident_management_alert_create_incident_monthly.yml b/config/metrics/counts_28d/20210216180625_incident_management_alert_create_incident_monthly.yml
index 14ba7fa3421c9e92943d7d68f2404a1da133764a..56b05502bbfd983a8f486780810a021f41bfa7cc 100644
--- a/config/metrics/counts_28d/20210216180625_incident_management_alert_create_incident_monthly.yml
+++ b/config/metrics/counts_28d/20210216180625_incident_management_alert_create_incident_monthly.yml
@@ -14,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - incident_management_alert_create_incident
+  - incident_management_alert_create_incident
 distribution:
 - ce
 - ee
@@ -23,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml b/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml
index 38048e0f443b31d2f1ae79f61ac270639271f710..4bb680d579c9f87b5f2e171cdcfbfeffc9db13a2 100644
--- a/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml
+++ b/config/metrics/counts_28d/20210216180731_projects_imported_from_github.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml b/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
index beb8969618fac81827101b6fc3ae0b8101ef735b..213fa6da4b93ea5ce265a7f28e0436a49e12d0e0 100644
--- a/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
+++ b/config/metrics/counts_28d/20210216180745_action_monthly_active_users_design_management.yml
@@ -19,3 +19,4 @@ tier:
 - ultimate
 performance_indicator_type:
 - paid_gmau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml b/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml
index 1353686c5a61da4381a5b7f53d56dc853f4c27b7..d52e9b4c348da4fa9ae253533f16ffd088ae59b9 100644
--- a/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml
+++ b/config/metrics/counts_28d/20210216180747_action_monthly_active_users_wiki_repo.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180814_events.yml b/config/metrics/counts_28d/20210216180814_events.yml
index 384505384f8ffb163d4747d3f37567dfd8321158..f901c8ce508833792f2c25b5f9f7449a62284105 100644
--- a/config/metrics/counts_28d/20210216180814_events.yml
+++ b/config/metrics/counts_28d/20210216180814_events.yml
@@ -5,7 +5,7 @@ description: Number of distinct users who have generated a manage event by month
 product_section: dev
 product_stage: manage
 product_group: group::manage
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -19,3 +19,4 @@ tier:
 - ultimate
 performance_indicator_type:
 - umau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180816_groups.yml b/config/metrics/counts_28d/20210216180816_groups.yml
index 247fa015c2265ab85e4dabc7883ebcf2f4220230..a6876a8536ae9305f337d7fba580865b5679b720 100644
--- a/config/metrics/counts_28d/20210216180816_groups.yml
+++ b/config/metrics/counts_28d/20210216180816_groups.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180818_users_created.yml b/config/metrics/counts_28d/20210216180818_users_created.yml
index 319b8a08e79c677bdf94fffca7b356179aab5974..28af6c26da7283908ad5bdd83595f7b6864842b8 100644
--- a/config/metrics/counts_28d/20210216180818_users_created.yml
+++ b/config/metrics/counts_28d/20210216180818_users_created.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml b/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
index 7b928a08faee03d7e08c94fd47b276ae8db56bf9..301c0db93b6e2bd2489e2227a35345bab98c5ba1 100644
--- a/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_28d/20210216180955_projects_with_prometheus_alerts.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: usage_activity_by_stage_monthly.configure.projects_with_prometheus_alerts
 description: Projects with Prometheus alerting enabled
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180956_clusters.yml b/config/metrics/counts_28d/20210216180956_clusters.yml
index d5a54796a1f696b1c1d872d827ef58a9ae02aa7a..e740a7ef2e72281f44bc6557925f57257aac09d1 100644
--- a/config/metrics/counts_28d/20210216180956_clusters.yml
+++ b/config/metrics/counts_28d/20210216180956_clusters.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.clusters
 description: Count users creating clusters in last 28 days.
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml b/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
index 615bb247f867b83fc6df7247eccd96363bf9480c..2ad307ce7a5d76f4dd9e45fee1d4b51c6db9be95 100644
--- a/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_28d/20210216180958_clusters_applications_prometheus.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.clusters_applications_prometheus
 description: Users creating clusters with Prometheus enabled in last 28 days.
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml b/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
index 2d29c9fd088fd33d15d90db2a02be51cd6a9ba5e..14ab239037c234c4ce1017767cbe05bf2991bd3a 100644
--- a/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_28d/20210216181000_operations_dashboard_default_dashboard.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.operations_dashboard_default_dashboard
 description: Active users with enabled operations dashboard
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml b/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
index ac0e6015cb99dfff3afa66d60e74c20ab9962793..e0e5e90dc511c3fa25a955339153ad5e06d9aaf5 100644
--- a/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_28d/20210216181002_projects_with_tracing_enabled.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.projects_with_tracing_enabled
 description: Projects with tracing enabled
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: tracing
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml b/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml
index f5c1ecec384e3193019d2f97a0481d3ec982c8ac..f7fe9f25b0d61336e787f64983580308433a25eb 100644
--- a/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml
+++ b/config/metrics/counts_28d/20210216181004_projects_with_error_tracking_enabled.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.projects_with_error_tracking_enabled
 description: Count of users creating projects with error tracking enabled.
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml b/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml
index 7ffe2e82ab2ba8e2754cfbea1162fdfe3f101483..39fd144b66d03333261c3281f8b1a90968df9159 100644
--- a/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml
+++ b/config/metrics/counts_28d/20210216181006_operations_dashboard_users_with_projects_added.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.operations_dashboard_users_with_projects_added
 description: Active users with projects on operations dashboard
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181050_packages.yml b/config/metrics/counts_28d/20210216181050_packages.yml
index c007ab501829fd04ac44c2d2452b42f9b0370641..27b996c773522ece08237929bdc92dc527c5b956 100644
--- a/config/metrics/counts_28d/20210216181050_packages.yml
+++ b/config/metrics/counts_28d/20210216181050_packages.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181057_projects_with_packages.yml b/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
index e1f1bcd05e7b232358b8f0b3cd84d9f9c976a313..bbee004d1304f2be953ad77158f0997b1eebb375 100644
--- a/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
+++ b/config/metrics/counts_28d/20210216181057_projects_with_packages.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181139_issues.yml b/config/metrics/counts_28d/20210216181139_issues.yml
index dd36265fe9dc1c3fe986292fa36424cd4b27aa2b..e8ec3406622c3d2ece5e058c27f8edad818843f9 100644
--- a/config/metrics/counts_28d/20210216181139_issues.yml
+++ b/config/metrics/counts_28d/20210216181139_issues.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181141_notes.yml b/config/metrics/counts_28d/20210216181141_notes.yml
index 0e2d39e42e70218a76a9aaf82964d1f5f752d49c..bc38186bd10adad4c2e0187600805c2088c9ec33 100644
--- a/config/metrics/counts_28d/20210216181141_notes.yml
+++ b/config/metrics/counts_28d/20210216181141_notes.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181143_projects.yml b/config/metrics/counts_28d/20210216181143_projects.yml
index 16e2ddf8050b5671b5adbeb18aa9bd8a60692dce..3dafe40b3e423d5836f3affbabf9cd817152d088 100644
--- a/config/metrics/counts_28d/20210216181143_projects.yml
+++ b/config/metrics/counts_28d/20210216181143_projects.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181145_todos.yml b/config/metrics/counts_28d/20210216181145_todos.yml
index e35963f2a57fcb1fcaedf87b346b84fd5aa1cdcf..c83f054859d3ca257e08a34a0856ff62506b5a40 100644
--- a/config/metrics/counts_28d/20210216181145_todos.yml
+++ b/config/metrics/counts_28d/20210216181145_todos.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml b/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml
index 92f5a618bff90b30324b419a5d9aeab7af202566..4344144d592fba932e196449c1b6e0ab366ad892 100644
--- a/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_28d/20210216181147_service_desk_enabled_projects.yml
@@ -15,6 +15,7 @@ distribution:
 - ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181148_service_desk_issues.yml b/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
index 0cd2ea2632fe00cb3a13b348ded5d87d84585017..75e4bc9335484b0e6a17d4a34bb45b2fa54d570a 100644
--- a/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
+++ b/config/metrics/counts_28d/20210216181148_service_desk_issues.yml
@@ -5,7 +5,7 @@ description: Count of service desk issues
 product_section: dev
 product_stage: plan
 product_group: group::plan
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181150_projects_jira_active.yml b/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
index a51dfa3e49fd558597d2a70f803b50a59dcfee4c..8a386ce02e98805324a4c51079ee584cff58c598 100644
--- a/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
+++ b/config/metrics/counts_28d/20210216181150_projects_jira_active.yml
@@ -1,7 +1,7 @@
 ---
 data_category: operational
 key_path: usage_activity_by_stage_monthly.plan.projects_jira_active
-description:  Distinct count of creator_id from projects with an active Jira integration.
+description: Distinct count of creator_id from projects with an active Jira integration.
 product_section: dev
 product_stage: ecosystem
 product_group: group::integrations
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml b/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml
index e78d178c081e175aab301e7d78a4b98fbc119fc5..3aef852d44ce3b06734bb6f28d059539375af7f5 100644
--- a/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml
+++ b/config/metrics/counts_28d/20210216181152_projects_jira_dvcs_cloud_active.yml
@@ -1,7 +1,8 @@
 ---
 data_category: operational
 key_path: usage_activity_by_stage_monthly.plan.projects_jira_dvcs_cloud_active
-description: Distinct count of creator_id from projects with an active Jira Cloud DVCS integration.
+description: Distinct count of creator_id from projects with an active Jira Cloud
+  DVCS integration.
 product_section: dev
 product_stage: ecosystem
 product_group: group::integration
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml b/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml
index c5a8b0cf75e25ed0268b6b7c732aea1cb2268fee..d28e4295dcf38f030e08101bc655f13950cc222f 100644
--- a/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml
+++ b/config/metrics/counts_28d/20210216181154_projects_jira_dvcs_server_active.yml
@@ -1,7 +1,8 @@
 ---
 data_category: operational
 key_path: usage_activity_by_stage_monthly.plan.projects_jira_dvcs_server_active
-description: Distinct count of creator_id from projects with an active Jira Server DVCS integration.
+description: Distinct count of creator_id from projects with an active Jira Server
+  DVCS integration.
 product_section: dev
 product_stage: ecosystem
 product_group: group::integration
@@ -18,4 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181158_epics.yml b/config/metrics/counts_28d/20210216181158_epics.yml
index 9ede1ef12f8e387da258aed0a51671e902536917..c9bb535f3cdbe15c832cc097bb7e92afb534364d 100644
--- a/config/metrics/counts_28d/20210216181158_epics.yml
+++ b/config/metrics/counts_28d/20210216181158_epics.yml
@@ -17,3 +17,4 @@ tier:
 performance_indicator_type:
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181200_label_lists.yml b/config/metrics/counts_28d/20210216181200_label_lists.yml
index f7eaf2bf48436849c145b16e8904b1ff9ed55c47..091a0138cf7057f505cec1ba3d1b20422f1afeab 100644
--- a/config/metrics/counts_28d/20210216181200_label_lists.yml
+++ b/config/metrics/counts_28d/20210216181200_label_lists.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml b/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
index 285f837178597b82dd3495bc80d8053148534db1..ce25144a574b4003c518e63f58c55a6e8ed8fc9a 100644
--- a/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181304_g_project_management_issue_title_changed_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_title_changed
+  - g_project_management_issue_title_changed
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml b/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
index 554bc86cada470c72c180175dd64cf46a968ea3f..972fd1b6f416240257a45a376032a4636fc83dad 100644
--- a/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181308_g_project_management_issue_description_changed_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_description_changed
+  - g_project_management_issue_description_changed
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml b/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
index 07fa4ceaa3c73588cc76dc03fdf6865143b5cd57..503b4aff95bd698cbeb328e56ea5279c73aa0a1d 100644
--- a/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181311_g_project_management_issue_assignee_changed_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_assignee_changed
+  - g_project_management_issue_assignee_changed
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml b/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
index 5417ffe24339d620762993e0cca336807863dbd0..a861ee461ee95de44ba2b8c1df647c132f8a1e29 100644
--- a/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
+++ b/config/metrics/counts_28d/20210216181315_g_project_management_issue_made_confidential_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_made_confidential
+  - g_project_management_issue_made_confidential
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml b/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
index f7c63e9bd03e454e1e7026ac83356b370ec132c6..6d494397b8bd3674c3c279076e2c7e5def65b672 100644
--- a/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
+++ b/config/metrics/counts_28d/20210216181319_g_project_management_issue_made_visible_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_made_visible
+  - g_project_management_issue_made_visible
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml b/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
index a0b173e5c379d53ece56624227eeea55055911e6..0640c7cb6be361f86c776214bb4c61982349435f 100644
--- a/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
+++ b/config/metrics/counts_28d/20210216181323_g_project_management_issue_created_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_created
+  - g_project_management_issue_created
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml b/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
index 7ff662b2466820aa6ddbfd95ee2834af128ea99c..1be3e1a1ead05403d4ac8f4b12433ebb29491b9e 100644
--- a/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181326_g_project_management_issue_closed_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_closed
+  - g_project_management_issue_closed
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml b/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
index f6b3b824afdad7f18865b6d07d36f99976ff2ae4..22ca1ca1924e90781df95b6327c2a3a45978a50f 100644
--- a/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
+++ b/config/metrics/counts_28d/20210216181330_g_project_management_issue_reopened_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_reopened
+  - g_project_management_issue_reopened
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml b/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
index a84dcac22d9b0e0103d7df2df35069c0ae1f5fcd..3e2b3d4284d23b735cdd2e28f52a4efda65572a7 100644
--- a/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181334_g_project_management_issue_label_changed_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_label_changed
+  - g_project_management_issue_label_changed
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml b/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
index 12ea62b75f159f2c65f12947d5171c605f988c37..4e1c5413a76921ba65b68b2ca797f527fe0654ce 100644
--- a/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181337_g_project_management_issue_milestone_changed_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_milestone_changed
+  - g_project_management_issue_milestone_changed
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml b/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
index a7f631d66205f79887ab527262947ed1d2765fc6..dbe6daaacd684637ce29e045a098e4cf952af02a 100644
--- a/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
+++ b/config/metrics/counts_28d/20210216181348_g_project_management_issue_cross_referenced_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_cross_referenced
+  - g_project_management_issue_cross_referenced
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml b/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
index 1538b0cc75588bc23a5637e0d68174395255d650..b992d1e49b40410c6ebcbbb2820060a614df6256 100644
--- a/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
+++ b/config/metrics/counts_28d/20210216181352_g_project_management_issue_moved_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_moved
+  - g_project_management_issue_moved
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml b/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
index 02926948430576054ca99590d1773dc485057460..b919b92d60be7c7c430cbdeb7b7352e0af9b5a3d 100644
--- a/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
+++ b/config/metrics/counts_28d/20210216181356_g_project_management_issue_related_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_related
+  - g_project_management_issue_related
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml b/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
index 01c5c768674627aec016c1239af52f957be5558f..3ad909302e2abeb5da5f140b90ca015d5827eb86 100644
--- a/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
+++ b/config/metrics/counts_28d/20210216181400_g_project_management_issue_unrelated_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_unrelated
+  - g_project_management_issue_unrelated
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml b/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
index ca0573ba6183785b1a902a80b91cfd1d933f7fc6..a042e57d4135ab6794b28ece87027bd34c83ba3d 100644
--- a/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181403_g_project_management_issue_marked_as_duplicate_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_marked_as_duplicate
+  - g_project_management_issue_marked_as_duplicate
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml b/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
index 012eaeb5001329e7009ecc9ad1bd1577676dd734..c7922c71e8efd71c9f9221a8f7aa1fa4c68a9e4e 100644
--- a/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
+++ b/config/metrics/counts_28d/20210216181407_g_project_management_issue_locked_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_locked
+  - g_project_management_issue_locked
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml b/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
index a1b800b77cfda5b3edf14e5a072310dfbdeb6e28..f9d6fc1055297563368cd03f9688294826b2842a 100644
--- a/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
+++ b/config/metrics/counts_28d/20210216181411_g_project_management_issue_unlocked_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_unlocked
+  - g_project_management_issue_unlocked
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml b/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
index e94d56ad8b88591d004a31fc433062cbf8e24175..63c9b3ddcd88920605e4eb8d3f4dc3c465fa9fb7 100644
--- a/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216181424_g_project_management_issue_designs_added_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_designs_added
+  - g_project_management_issue_designs_added
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml b/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
index 0af03218ab00d9a6c668478ce81848244cf351cd..3ae5a8f77c682ffe7fc53ad666273675951cf2dc 100644
--- a/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
+++ b/config/metrics/counts_28d/20210216181427_g_project_management_issue_designs_modified_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_designs_modified
+  - g_project_management_issue_designs_modified
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml b/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
index c466a775050afecf05a3db127deb6c9ba613388b..918c2bf088890ce6c5eb61c489913289b5178814 100644
--- a/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181431_g_project_management_issue_designs_removed_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_designs_removed
+  - g_project_management_issue_designs_removed
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml b/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
index 29517a25739126019f97a72c863a45bc0eb44570..2a880ec0658ac772c8fcc0c4b1b81ba36ad211b1 100644
--- a/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181435_g_project_management_issue_due_date_changed_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_due_date_changed
+  - g_project_management_issue_due_date_changed
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml b/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
index 6f572b3a0c9a969bfdac252436f09e270e2fc1f6..2c51eed73efb13f0364e7f8edec54cc819f3e63a 100644
--- a/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181438_g_project_management_issue_time_estimate_changed_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_time_estimate_changed
+  - g_project_management_issue_time_estimate_changed
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml b/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
index 4c0717f699cb5613662806086031f1fda01b19ad..2bcecf80d97142ae61b9dec7bb7233b2c026e987 100644
--- a/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181442_g_project_management_issue_time_spent_changed_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_time_spent_changed
+  - g_project_management_issue_time_spent_changed
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml b/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
index dc7775542ddfb80a48936847fb1c7a2a78499725..8b1a3e71a15700e9f32e4a0438e0beb4ad2d71f1 100644
--- a/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216181446_g_project_management_issue_comment_added_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_comment_added
+  - g_project_management_issue_comment_added
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml b/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
index 27c18c21b3d438f2f74f90eef87b9820d17a1220..edb098f4171b01b5600a52a590e71090c1ca0cfe 100644
--- a/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
+++ b/config/metrics/counts_28d/20210216181450_g_project_management_issue_comment_edited_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_comment_edited
+  - g_project_management_issue_comment_edited
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml b/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
index ce0bfa86bcdf80b1019dc0cae3787b4d9c27da25..38729cba44ad105ca1807783c95651555f55e149 100644
--- a/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
+++ b/config/metrics/counts_28d/20210216181453_g_project_management_issue_comment_removed_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_comment_removed
+  - g_project_management_issue_comment_removed
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml b/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
index 2d785856ed85ba742aa44432bb63ddc6a5dc3671..3550a4a2d2461764d6d3370055dfe8b6a96b7ea5 100644
--- a/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
+++ b/config/metrics/counts_28d/20210216181501_g_project_management_issue_cloned_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_cloned
+  - g_project_management_issue_cloned
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
index 5da5997ad675901033f83a024f9983d482e9000a..5bffd21c4645c6b67df9b592976ef548d15fb080 100644
--- a/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216181504_issues_edit_total_unique_counts_monthly.yml
@@ -13,39 +13,39 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_project_management_issue_title_changed
-    - g_project_management_issue_description_changed
-    - g_project_management_issue_assignee_changed
-    - g_project_management_issue_made_confidential
-    - g_project_management_issue_made_visible
-    - g_project_management_issue_created
-    - g_project_management_issue_closed
-    - g_project_management_issue_reopened
-    - g_project_management_issue_label_changed
-    - g_project_management_issue_milestone_changed
-    - g_project_management_issue_iteration_changed
-    - g_project_management_issue_weight_changed
-    - g_project_management_issue_cross_referenced
-    - g_project_management_issue_moved
-    - g_project_management_issue_related
-    - g_project_management_issue_unrelated
-    - g_project_management_issue_marked_as_duplicate
-    - g_project_management_issue_locked
-    - g_project_management_issue_unlocked
-    - g_project_management_issue_added_to_epic
-    - g_project_management_issue_removed_from_epic
-    - g_project_management_issue_changed_epic
-    - g_project_management_issue_designs_added
-    - g_project_management_issue_designs_modified
-    - g_project_management_issue_designs_removed
-    - g_project_management_issue_due_date_changed
-    - g_project_management_issue_time_estimate_changed
-    - g_project_management_issue_time_spent_changed
-    - g_project_management_issue_comment_added
-    - g_project_management_issue_comment_edited
-    - g_project_management_issue_comment_removed
-    - g_project_management_issue_health_status_changed
-    - g_project_management_issue_cloned
+  - g_project_management_issue_title_changed
+  - g_project_management_issue_description_changed
+  - g_project_management_issue_assignee_changed
+  - g_project_management_issue_made_confidential
+  - g_project_management_issue_made_visible
+  - g_project_management_issue_created
+  - g_project_management_issue_closed
+  - g_project_management_issue_reopened
+  - g_project_management_issue_label_changed
+  - g_project_management_issue_milestone_changed
+  - g_project_management_issue_iteration_changed
+  - g_project_management_issue_weight_changed
+  - g_project_management_issue_cross_referenced
+  - g_project_management_issue_moved
+  - g_project_management_issue_related
+  - g_project_management_issue_unrelated
+  - g_project_management_issue_marked_as_duplicate
+  - g_project_management_issue_locked
+  - g_project_management_issue_unlocked
+  - g_project_management_issue_added_to_epic
+  - g_project_management_issue_removed_from_epic
+  - g_project_management_issue_changed_epic
+  - g_project_management_issue_designs_added
+  - g_project_management_issue_designs_modified
+  - g_project_management_issue_designs_removed
+  - g_project_management_issue_due_date_changed
+  - g_project_management_issue_time_estimate_changed
+  - g_project_management_issue_time_spent_changed
+  - g_project_management_issue_comment_added
+  - g_project_management_issue_comment_edited
+  - g_project_management_issue_comment_removed
+  - g_project_management_issue_health_status_changed
+  - g_project_management_issue_cloned
 distribution:
 - ce
 - ee
@@ -57,3 +57,4 @@ performance_indicator_type:
 - smau
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml b/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
index 452d83dec1b1b973d8012376141fd8bc422b631c..6cc4b21d5945f0e4b4d996ac2fe4962ff1dad834 100644
--- a/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
+++ b/config/metrics/counts_28d/20210216181508_i_quickactions_approve_monthly.yml
@@ -13,11 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_approve
-instrumentation_class: RedisHLLMetric
-options:
-  events:
-    - i_quickactions_approve
+  - i_quickactions_approve
 distribution:
 - ce
 - ee
@@ -25,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml b/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml
index 1e213eeb7784bfd6e8f639150ffe9a3923610cb4..5f5cd80ebece968695aedb501173fe35d4f798ec 100644
--- a/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml
+++ b/config/metrics/counts_28d/20210216181512_i_quickactions_assign_single_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_assign_single_monthly
-description: Count of MAU using the `/assign @user1` quick action to assign a single individual to an issuable 
+description: Count of MAU using the `/assign @user1` quick action to assign a single
+  individual to an issuable
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_assign_single
+  - i_quickactions_assign_single
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml b/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml
index 10f38fbcb9c0a23554abbfd246b7b819e5bff8ad..647edb7f79ef5dbfa7f6bef0830f1ffbc594a91e 100644
--- a/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml
+++ b/config/metrics/counts_28d/20210216181519_i_quickactions_assign_self_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_assign_self_monthly
-description: Count of MAU using the `/assign me` quick action to assign self to an issuable 
+description: Count of MAU using the `/assign me` quick action to assign self to an
+  issuable
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_assign_self
+  - i_quickactions_assign_self
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml b/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml
index f93512081728c0b30b93dbb2f1ed552ca4ae64fc..17b962509e00d097ba01971a046b10af0ee238a0 100644
--- a/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml
+++ b/config/metrics/counts_28d/20210216181523_i_quickactions_assign_reviewer_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_assign_reviewer_monthly
-description: Count of MAU using the `/assign_reviewer` or `request_reviewer` quick action
+description: Count of MAU using the `/assign_reviewer` or `request_reviewer` quick
+  action
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_assign_reviewer
+  - i_quickactions_assign_reviewer
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml b/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
index 90ea87a63cf7267fd0538e8d1ab4487876b0edb0..49e558159b22387c43cd88719337e36f327b1056 100644
--- a/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
+++ b/config/metrics/counts_28d/20210216181527_i_quickactions_award_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_award_monthly
-description: Count of MAU using the `/award` quick action to set an award emoji on an issuable 
+description: Count of MAU using the `/award` quick action to set an award emoji on
+  an issuable
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_award
+  - i_quickactions_award
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml b/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml
index cc86c66caf6f83d9082b3452b2a947b8749eb477..f001639e500a9755aa71072c395652ada19d50a7 100644
--- a/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml
+++ b/config/metrics/counts_28d/20210216181530_i_quickactions_board_move_monthly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_board_move
+  - i_quickactions_board_move
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml b/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
index 0f7ad1b15cc077ecd02e7314ee1ec8c78f2b4455..32de3dfdbac3a6372bb155e7b438f3d0fea46e97 100644
--- a/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181541_i_quickactions_clone_monthly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_clone
+  - i_quickactions_clone
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml b/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
index 4750bc1412e985bcb8d54aab3fd300833d4951b1..bb2152d92b10aa75fa4690a0b62627c387d081ee 100644
--- a/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
+++ b/config/metrics/counts_28d/20210216181545_i_quickactions_close_monthly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_close
+  - i_quickactions_close
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml b/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
index 843f00bda28069370a5261a7bed2ce65ce10d933..5260dfd1a3021a9bd0d6df45101b53e02cf422ae 100644
--- a/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
+++ b/config/metrics/counts_28d/20210216181549_i_quickactions_confidential_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_confidential_monthly
-description: Count of MAU using the `/confidential` quick action to set an issue as confidential
+description: Count of MAU using the `/confidential` quick action to set an issue as
+  confidential
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_confidential
+  - i_quickactions_confidential
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml b/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml
index 41e31b3031a64b04743066936b9bf2d19ab7dd50..30871aeb45f7c0a7fef33d536f579a025c924fd6 100644
--- a/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216181553_i_quickactions_copy_metadata_merge_request_monthly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_copy_metadata_merge_request
+  - i_quickactions_copy_metadata_merge_request
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml b/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml
index 861bb1ac02b3c28db9450339ae86ec32ad0d4241..48042d37988fad2426b46009e2b2e03106f9db0c 100644
--- a/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210216181556_i_quickactions_copy_metadata_issue_monthly.yml
@@ -5,7 +5,7 @@ description: Count of MAU using the `/copy_metadata` quick action on an issue
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_copy_metadata_issue
+  - i_quickactions_copy_metadata_issue
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml b/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml
index ec09f5a3269d11bab678580f7c82376c674ea9ef..538afb8ff966809a22252c7e0d489214405b5255 100644
--- a/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216181600_i_quickactions_create_merge_request_monthly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_create_merge_request_monthly
-description: Count of MAU using the `/create_merge_request` quick action 
+description: Count of MAU using the `/create_merge_request` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,12 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_create_merge_request
+  - i_quickactions_create_merge_request
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml b/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
index 84b7359359ad18afb542394240e34603d1f98d36..86a709dcbb6aebb8c6350c8c21e52a5cc3f0e5ac 100644
--- a/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
+++ b/config/metrics/counts_28d/20210216181604_i_quickactions_done_monthly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_done
+  - i_quickactions_done
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml b/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml
index d503f9c56b7673393dc8a383742731bf8b6392ba..1da63a62dbe8774eac96e11beaf5bc154229d224 100644
--- a/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml
+++ b/config/metrics/counts_28d/20210216181607_i_quickactions_draft_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_draft_monthly
 description: Count of MAU using the `/draft` quick action on a Merge Request
 product_section: dev
 product_stage: create
-product_group: group::source code 
+product_group: group::source code
 product_category: source_code_management
 value_type: number
 status: data_available
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_draft
+  - i_quickactions_draft
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml b/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
index d1e18f0e072668e428032a351e07c80fe4dc7416..d3c1f64cee505e056f49a12f87658fa818d2f9e4 100644
--- a/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
+++ b/config/metrics/counts_28d/20210216181611_i_quickactions_due_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_due_monthly
-description: Count of MAU using the `/due` quick action to change the due date on an issuable 
+description: Count of MAU using the `/due` quick action to change the due date on
+  an issuable
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_due
+  - i_quickactions_due
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml b/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
index eb8e1f504d95d45e736ede2a414bb54c6f5898b1..44f1f026349fcf49090c123a561c61ad02703ea4 100644
--- a/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181615_i_quickactions_duplicate_monthly.yml
@@ -1,11 +1,12 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_duplicate_monthly
-description: Count of MAU using the `/duplicate` quick action to mark an issue as a duplicate of another
+description: Count of MAU using the `/duplicate` quick action to mark an issue as
+  a duplicate of another
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_duplicate
+  - i_quickactions_duplicate
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml b/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
index 91c79aff0fe6f043ab87d90a5319e408b9eecafa..1e932d687960788aabd3b5abdd5bc5e3e0ad3e6b 100644
--- a/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181622_i_quickactions_estimate_monthly.yml
@@ -1,11 +1,12 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_estimate_monthly
-description: Count of MAU using the `/estimate` quick action to set a time estimate on an issue
+description: Count of MAU using the `/estimate` quick action to set a time estimate
+  on an issue
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: time_tracking 
+product_category: time_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_estimate
+  - i_quickactions_estimate
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml b/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
index 774bcc02bef64826bd3b19049ef4098a9ce763fa..475ebb932a99cdb26921f6c33c896474cb7341c5 100644
--- a/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
+++ b/config/metrics/counts_28d/20210216181629_i_quickactions_label_monthly.yml
@@ -5,7 +5,7 @@ description: Count of MAU using the `/label` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_label
+  - i_quickactions_label
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml b/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
index 13aeb663c87a3316a23e6249255eabd065d89f77..804d6507d892f3aec12a2e426704361e3cc00866 100644
--- a/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
+++ b/config/metrics/counts_28d/20210216181633_i_quickactions_lock_monthly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_lock_monthly
-description: Count of MAU using the `/lock` quick action 
+description: Count of MAU using the `/lock` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_lock
+  - i_quickactions_lock
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml b/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml
index 64f987ae88944aa598ef4b821c0daee241481cab..7d42072eaab8727815d21779cdfb5bf8958d1e1d 100644
--- a/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml
+++ b/config/metrics/counts_28d/20210216181637_i_quickactions_merge_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_merge_monthly
 description: Count of MAU using the `/merge` quick action
 product_section: dev
 product_stage: create
-product_group: group::source code 
+product_group: group::source code
 product_category: source_code_management
 value_type: number
 status: data_available
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_merge
+  - i_quickactions_merge
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml b/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
index 7865b63c6eaf013cf8d3bf27aa8ff2dc446da779..30d76be62b003e91db77081688cefe69dfe831e7 100644
--- a/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181641_i_quickactions_milestone_monthly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_milestone_monthly
-description: Count of MAU using the `/milestone` quick action 
-product_section: dev 
+description: Count of MAU using the `/milestone` quick action
+product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_milestone
+  - i_quickactions_milestone
 distribution:
 - ce
 - ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml b/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
index d57b4cb31af7552d39889eea735556e7e0e30a1b..e7a0f7c6eba2d8ca9cbd2062d1ec8c98c9166547 100644
--- a/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
+++ b/config/metrics/counts_28d/20210216181644_i_quickactions_move_monthly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_move
+  - i_quickactions_move
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml b/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
index 5b7a8a6a4c849a13c143b314e7bc5617643f96f4..d5b8ad343bf81a6694b77631a75fecc8f3843269 100644
--- a/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
+++ b/config/metrics/counts_28d/20210216181659_i_quickactions_reassign_monthly.yml
@@ -5,7 +5,7 @@ description: Count of MAU using the `/reassign @user1` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_reassign
+  - i_quickactions_reassign
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml b/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml
index 1da59b2b523853376ed6bc3244da2313d07ceb34..71ea51bfdadfd9bbf242926a8f5f6d775f11fc0a 100644
--- a/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml
+++ b/config/metrics/counts_28d/20210216181703_i_quickactions_reassign_reviewer_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_reassign_reviewer
+  - i_quickactions_reassign_reviewer
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml b/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml
index b49f8796179b969b7b0bd1297bc82959c48da9f1..2a0d4e5aac7da4e467558ee1910e96e03ebe9610 100644
--- a/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml
+++ b/config/metrics/counts_28d/20210216181707_i_quickactions_rebase_monthly.yml
@@ -3,8 +3,8 @@ data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_rebase_monthly
 description: Count of MAU using the `/rebase` quick action on a Merge Request
 product_section: dev
-product_stage: source_code 
-product_group: group::source code 
+product_stage: source_code
+product_group: group::source code
 product_category: source_code_management
 value_type: number
 status: data_available
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_rebase
+  - i_quickactions_rebase
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml b/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
index 287bb72a37f8ea914bb6f1dc9bd16c6a2dbe5529..240555a37df5710e332c4f187ac8f18c1a4587b5 100644
--- a/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
+++ b/config/metrics/counts_28d/20210216181710_i_quickactions_relabel_monthly.yml
@@ -5,7 +5,7 @@ description: Count of MAU using the `/relabel` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_relabel
+  - i_quickactions_relabel
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml b/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
index acaf337896634ed356f368906eceafb4140f0d85..d14f5c2e7010558882bbaa218e4ef4e5d648b830 100644
--- a/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181714_i_quickactions_relate_monthly.yml
@@ -5,7 +5,7 @@ description: Count of MAU using the `/relate` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_relate
+  - i_quickactions_relate
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml b/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml
index 1bf024eb356f71769c15c1225829005796902bd7..e12a4af803b01cf7a13b5eca38a5028521fae605 100644
--- a/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml
+++ b/config/metrics/counts_28d/20210216181721_i_quickactions_remove_due_date_monthly.yml
@@ -5,7 +5,7 @@ description: Count of MAU using the `/remove_due_date` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_remove_due_date
+  - i_quickactions_remove_due_date
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml b/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml
index 4e878c9c37c0f007b8b6c43ea325a53157dfb414..8ac469cbb143d03e218699f9187e8256277486af 100644
--- a/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml
+++ b/config/metrics/counts_28d/20210216181729_i_quickactions_remove_estimate_monthly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_estimate_monthly
-description: Count of MAU using the `/remove_estimate` quick action 
+description: Count of MAU using the `/remove_estimate` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: time_tracking 
+product_category: time_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_remove_estimate
+  - i_quickactions_remove_estimate
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml b/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml
index d2cd09a7d2b4d4443e3e77ed1653fe5b09f0512f..eb7616a06622e4a05ec0712c2fa6d4fbddb5c110 100644
--- a/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml
+++ b/config/metrics/counts_28d/20210216181736_i_quickactions_remove_milestone_monthly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_milestone_monthly
-description: Count of MAU using the `/remove_milestone` quick action 
+description: Count of MAU using the `/remove_milestone` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_remove_milestone
+  - i_quickactions_remove_milestone
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml b/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml
index 58f7ef809c4f80caaee361cffdd6bd591b2acbc7..cc9a951d8268a4d525cc9a8f51d8ca97b79b2061 100644
--- a/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml
+++ b/config/metrics/counts_28d/20210216181744_i_quickactions_remove_time_spent_monthly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_remove_time_spent
+  - i_quickactions_remove_time_spent
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml b/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml
index a9e53de5c8fdccd4768cb93bff754def20b56cad..864a173ba6b1f9984949c3a4a771a016a0bece83 100644
--- a/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml
+++ b/config/metrics/counts_28d/20210216181747_i_quickactions_remove_zoom_monthly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_zoom_monthly
-description: Count of MAU using the `/remove_zoom` quick action 
+description: Count of MAU using the `/remove_zoom` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_remove_zoom
+  - i_quickactions_remove_zoom
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
-- ultimate 
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml b/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
index 6a104d2e1cbc55c9859429ec3cf2ed544ce6114e..7407773b2d886dd194abee3050409b225ee339e7 100644
--- a/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
+++ b/config/metrics/counts_28d/20210216181751_i_quickactions_reopen_monthly.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_reopen_monthly
-description: Count of MAU using the `/reopen` quick action 
+description: Count of MAU using the `/reopen` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_reopen
+  - i_quickactions_reopen
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml b/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
index d4ebe27abec712eca83379e24dcbacec46e22d1b..3ab43d4f64a2e8fb82790b4561af080622d742e4 100644
--- a/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
+++ b/config/metrics/counts_28d/20210216181755_i_quickactions_shrug_monthly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_shrug_monthly
-description: Count of MAU using the `/shrug` quick action 
+description: Count of MAU using the `/shrug` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_shrug
+  - i_quickactions_shrug
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml b/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml
index fb0bfcb8f0166fd7ed056d686b8f97f15b3fff27..a32b05b09acc6ebbd24a59db52825fb3da282aa3 100644
--- a/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml
+++ b/config/metrics/counts_28d/20210216181758_i_quickactions_spend_subtract_monthly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_spend_subtract_monthly
-description: Count of MAU using the `/spend` quick action to subtract time spent 
+description: Count of MAU using the `/spend` quick action to subtract time spent
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: time_tracking 
+product_category: time_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_spend_subtract
+  - i_quickactions_spend_subtract
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
-- ultimate
\ No newline at end of file
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml b/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml
index dbd94c304888377d628c6bdc6c4a0f96bbed60dd..b1a1a6cba16e763831ebfbfe7688cc483924ac5f 100644
--- a/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml
+++ b/config/metrics/counts_28d/20210216181802_i_quickactions_spend_add_monthly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_spend_add_monthly
-description: Count of MAU using the `/spend` quick action to add time spent 
+description: Count of MAU using the `/spend` quick action to add time spent
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_spend_add
+  - i_quickactions_spend_add
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml b/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml
index 0058aa315c83229fb8a23ba0d3b667233ee06ef2..15b3cada1dee0896b9b9ff91a31c87a78899b972 100644
--- a/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml
+++ b/config/metrics/counts_28d/20210216181806_i_quickactions_submit_review_monthly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_submit_review
+  - i_quickactions_submit_review
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
-- ultimate 
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml b/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
index 7aa266017b46da2e0c76b228d11825b95a2ad685..11e02d96afcf26263951edd09ebe0689bba1e737 100644
--- a/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
+++ b/config/metrics/counts_28d/20210216181809_i_quickactions_subscribe_monthly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_subscribe_monthly
-description: Count of MAU using the `/subscribe` quick action 
+description: Count of MAU using the `/subscribe` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_subscribe
+  - i_quickactions_subscribe
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml b/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
index c8695b2776ec1c2ebe09bb55eeffb0a60d1f9e07..69def16931191749260d03c6a5341fc44be154e0 100644
--- a/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
+++ b/config/metrics/counts_28d/20210216181813_i_quickactions_tableflip_monthly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_tableflip_monthly
-description: Count of MAU using the `/tableflip` quick action 
+description: Count of MAU using the `/tableflip` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_tableflip
+  - i_quickactions_tableflip
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
-- ultimate
\ No newline at end of file
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml b/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml
index de74bb6f7b0a3412a599bbad11b7e65cb3ebe10d..b51f783842d6eb3db19d3906468f3a1018feba50 100644
--- a/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml
+++ b/config/metrics/counts_28d/20210216181817_i_quickactions_tag_monthly.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_tag_monthly
-description: Count of MAU using the `/tag` quick action 
+description: Count of MAU using the `/tag` quick action
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_tag
+  - i_quickactions_tag
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml b/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml
index 7de88a30689154049345855c66138205ce079c6a..0f815ecec4e14557f8c1397aef4fbe6ad419d207 100644
--- a/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml
+++ b/config/metrics/counts_28d/20210216181821_i_quickactions_target_branch_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_target_branch_monthly
 description: Count of MAU using the `/target_branch` quick action on Merge Requests
 product_section: dev
 product_stage: create
-product_group: group::source code 
+product_group: group::source code
 product_category: source_code_management
 value_type: number
 status: data_available
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_target_branch
+  - i_quickactions_target_branch
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml b/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
index fb94d9581f8eb8a99cec7621ce3ffcee5c53854b..44187db1e528fc46fc0f8c3d35e3acba945e0bd5 100644
--- a/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
+++ b/config/metrics/counts_28d/20210216181824_i_quickactions_title_monthly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_title_monthly
-description: Count of MAU using the `/title` quick action 
+description: Count of MAU using the `/title` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_title
+  - i_quickactions_title
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml b/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
index c101c389dfe570e7a3f5f75ef983171b4807df59..81e9f5368b63575e15ed061e42dff5f61485f771 100644
--- a/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
+++ b/config/metrics/counts_28d/20210216181828_i_quickactions_todo_monthly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_todo_monthly
-description: Count of MAU using the `/todo` quick action 
+description: Count of MAU using the `/todo` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_todo
+  - i_quickactions_todo
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml b/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml
index 98e0b1bdff38af3adebf481a13d4fa8cf3bf5005..6faa84138c7b6300b3c260ffd86b087a7235be4e 100644
--- a/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml
+++ b/config/metrics/counts_28d/20210216181832_i_quickactions_unassign_specific_monthly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_unassign_specific
+  - i_quickactions_unassign_specific
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml b/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml
index 502bc6bccfad4b4a103a680f9284fdf2968da038..4f1a3c6f0e4ca69ad2c2d6389fb44173c0f5b9c3 100644
--- a/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml
+++ b/config/metrics/counts_28d/20210216181835_i_quickactions_unassign_all_monthly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_unassign_all
+  - i_quickactions_unassign_all
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml b/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml
index 1e3ea5daac8950faecc3cda9990ce3645bcb4e53..e8ea81ea5a3e63171f4fd83e162d9b7b98d98f82 100644
--- a/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml
+++ b/config/metrics/counts_28d/20210216181839_i_quickactions_unassign_reviewer_monthly.yml
@@ -1,10 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_unassign_reviewer_monthly
-description: Count of MAU using the `/unassign_reviewer` or `/remove_reviewer` quick action on Merge Requests
+description: Count of MAU using the `/unassign_reviewer` or `/remove_reviewer` quick
+  action on Merge Requests
 product_section: dev
 product_stage: create
-product_group: group::code review 
+product_group: group::code review
 product_category: code_review
 value_type: number
 status: data_available
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_unassign_reviewer
+  - i_quickactions_unassign_reviewer
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml b/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml
index d8f3ece625fe4883462e5a9c26afb53436336146..28cb71fcb69b7f6537eb7cef49d855fb46afdae2 100644
--- a/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml
+++ b/config/metrics/counts_28d/20210216181843_i_quickactions_unlabel_specific_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_unlabel_specific_monthly
-description: Count of MAU using the `/unlabel` or `/remove_label` quick action to remove one or more specific labels
+description: Count of MAU using the `/unlabel` or `/remove_label` quick action to
+  remove one or more specific labels
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_unlabel_specific
+  - i_quickactions_unlabel_specific
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml b/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml
index df3403f9f0a0672b1a3627562f49ed56a95f84c5..2db43ebe3356064ce21b88bbdc2f7accf216d6e0 100644
--- a/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml
+++ b/config/metrics/counts_28d/20210216181846_i_quickactions_unlabel_all_monthly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_unlabel_all
+  - i_quickactions_unlabel_all
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml b/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
index 4fa69c643c95bf16a6d75352229170ab7884ac5b..d5674d0165c0a11d1d9b46fa68f49d90c402ee6d 100644
--- a/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
+++ b/config/metrics/counts_28d/20210216181850_i_quickactions_unlock_monthly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_unlock
+  - i_quickactions_unlock
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml b/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
index f3add38826d3dc24450e568df2dfc0a249d155d2..0e88fb566418c3495bfa1b6dc2cc66806d2ce56a 100644
--- a/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
+++ b/config/metrics/counts_28d/20210216181854_i_quickactions_unsubscribe_monthly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_unsubscribe
+  - i_quickactions_unsubscribe
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml b/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml
index 2aa277a0163e24537256351e976570676e7792c4..05b839247c2d2626b697c3c22636f0737e880e4e 100644
--- a/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml
+++ b/config/metrics/counts_28d/20210216181901_i_quickactions_wip_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_wip_monthly
 description: Count of MAU using the `/wip` quick action on Merge Requests
 product_section: dev
 product_stage: create
-product_group: group::source code 
+product_group: group::source code
 product_category: source_code_management
 value_type: number
 status: data_available
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_wip
+  - i_quickactions_wip
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml b/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
index b6ff94e5367ee406db3b01bb6ce0504ec985ff59..6efe8e2a01d9a2a73ce04b7457381b9e030af037 100644
--- a/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
+++ b/config/metrics/counts_28d/20210216181905_i_quickactions_zoom_monthly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_zoom_monthly
-description: Count of MAU using the `/zoom` quick action on Issues 
+description: Count of MAU using the `/zoom` quick action on Issues
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_zoom
+  - i_quickactions_zoom
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181923_successful_deployments.yml b/config/metrics/counts_28d/20210216181923_successful_deployments.yml
index 45b50f20720c20f8c528da1c70df2aeeabc8e11b..f5cb131f6dcf9ea3ee5a585d179b08aca6858ffd 100644
--- a/config/metrics/counts_28d/20210216181923_successful_deployments.yml
+++ b/config/metrics/counts_28d/20210216181923_successful_deployments.yml
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181924_failed_deployments.yml b/config/metrics/counts_28d/20210216181924_failed_deployments.yml
index a7f0d6e584778cd062838b637273423f86fcdade..1361106bfd4791694d268a0b1f675d44bf623ff1 100644
--- a/config/metrics/counts_28d/20210216181924_failed_deployments.yml
+++ b/config/metrics/counts_28d/20210216181924_failed_deployments.yml
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181935_deployments.yml b/config/metrics/counts_28d/20210216181935_deployments.yml
index 01978e14de0bae60eff7213cb25d6624b411b3a7..547922fe9fafdb1157b6e473adbefd4596f99504 100644
--- a/config/metrics/counts_28d/20210216181935_deployments.yml
+++ b/config/metrics/counts_28d/20210216181935_deployments.yml
@@ -19,3 +19,4 @@ tier:
 skip_validation: true
 performance_indicator_type:
 - smau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181937_failed_deployments.yml b/config/metrics/counts_28d/20210216181937_failed_deployments.yml
index 0bf293cef7227b63e8e963b25f25555c6318dba0..ae2771838b5ac7767e6391c4124c69fe7b58d4d5 100644
--- a/config/metrics/counts_28d/20210216181937_failed_deployments.yml
+++ b/config/metrics/counts_28d/20210216181937_failed_deployments.yml
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181939_releases.yml b/config/metrics/counts_28d/20210216181939_releases.yml
index 858b760e464a9843789c8c8a7264fa9a87ccc807..e0b49469ea66158a7a0958c904b0dcfd57da1722 100644
--- a/config/metrics/counts_28d/20210216181939_releases.yml
+++ b/config/metrics/counts_28d/20210216181939_releases.yml
@@ -21,3 +21,4 @@ skip_validation: true
 performance_indicator_type:
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181941_successful_deployments.yml b/config/metrics/counts_28d/20210216181941_successful_deployments.yml
index 1d3a5f23cfd29301be643654c384691c2bd7bfd6..0b02cb1a9fc0a2efad5da14068afe8137ef6c94e 100644
--- a/config/metrics/counts_28d/20210216181941_successful_deployments.yml
+++ b/config/metrics/counts_28d/20210216181941_successful_deployments.yml
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml b/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml
index e515792f124f20ab6aa737b4a2a885d29e183c94..d412ef85d5c3520b2fb5b0b8155ce81525a65cef 100644
--- a/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml
+++ b/config/metrics/counts_28d/20210216181951_clusters_applications_runner.yml
@@ -9,7 +9,7 @@ product_category: runner
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 - ee
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216181956_user_unique_users_all_secure_scanners.yml b/config/metrics/counts_28d/20210216181956_user_unique_users_all_secure_scanners.yml
index 8c659619dfcb14df389aa40af944ccd50c24c13f..3f9b12bb8f7f02c9520bb35ff9075f3c55390804 100644
--- a/config/metrics/counts_28d/20210216181956_user_unique_users_all_secure_scanners.yml
+++ b/config/metrics/counts_28d/20210216181956_user_unique_users_all_secure_scanners.yml
@@ -1,15 +1,15 @@
 ---
 data_category: operational
 key_path: usage_activity_by_stage_monthly.secure.user_unique_users_all_secure_scanners
-description: 
+description:
 product_section: sec
-product_stage: 
+product_stage:
 product_group: group::secure
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
-data_source: 
+data_source:
 distribution:
 - ce
 tier:
@@ -17,3 +17,4 @@ tier:
 skip_validation: true
 performance_indicator_type:
 - smau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216182034_deploy_keys.yml b/config/metrics/counts_28d/20210216182034_deploy_keys.yml
index f6949e85a5b95bd4e4b5b682a4e654bd12bfeda2..f076d4912baac8f9f2c9e03f2bf6281cf4bff2c2 100644
--- a/config/metrics/counts_28d/20210216182034_deploy_keys.yml
+++ b/config/metrics/counts_28d/20210216182034_deploy_keys.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216182036_keys.yml b/config/metrics/counts_28d/20210216182036_keys.yml
index ca77b038a1e235a9d0dd3ee38531ace890390e16..44aa4d871ebb58fed032ff94e3416e63c0feca54 100644
--- a/config/metrics/counts_28d/20210216182036_keys.yml
+++ b/config/metrics/counts_28d/20210216182036_keys.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216182038_remote_mirrors.yml b/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
index 340ce92ad800bd95e1f1cf00faf1960ad97c4850..87c4714a7ca519d6692801ff05b32e833eddf006 100644
--- a/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
+++ b/config/metrics/counts_28d/20210216182038_remote_mirrors.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.create.remote_mirrors
-description: Count of users creating projects with remote mirrors. Includes both push and pull mirrors.
+description: Count of users creating projects with remote mirrors. Includes both push
+  and pull mirrors.
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml b/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml
index cf40c69e2767baf4f570a7ac3e6c5728106fd642..e1a4788e27deb957224a5c35fc3d98e2075f374c 100644
--- a/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml
+++ b/config/metrics/counts_28d/20210216182040_action_monthly_active_users_project_repo.yml
@@ -21,3 +21,4 @@ performance_indicator_type:
 - smau
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml b/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml
index a37ec1225fff2dea322bc8148b555625ed2ed527..9ea3514702ce433cf29e5c7d18c0b14840cfa67e 100644
--- a/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml
+++ b/config/metrics/counts_28d/20210216182041_action_monthly_active_users_git_write.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216182051_protected_branches.yml b/config/metrics/counts_28d/20210216182051_protected_branches.yml
index 9e1afb8146cd4c106ce816ed74458fd621c1a26f..d4d4b59276a395c098d6bae7dbff7582422dc83f 100644
--- a/config/metrics/counts_28d/20210216182051_protected_branches.yml
+++ b/config/metrics/counts_28d/20210216182051_protected_branches.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.create.protected_branches
-description: Count of users creating projects with repositories making use of at least one protected branch in last 28 days.
+description: Count of users creating projects with repositories making use of at least
+  one protected branch in last 28 days.
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml b/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
index b34c2a44a8c6cea173f14117db7cdfa4a206637a..e923f8f500a76edaf6250600042f0846649bb89e 100644
--- a/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182102_wiki_action_monthly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216182106_design_action_monthly.yml b/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
index b08d1181b0a78d046f5d8838780bb501933a2ac0..0348e04eeb85b6746ac73e73a24f3bce997f46bc 100644
--- a/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182106_design_action_monthly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216182109_project_action_monthly.yml b/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
index c766eb7159655dbc63c8f68a61ba14d7f3e71220..0f79d080205cebd6bdbadcd51cffd1c1948c3f90 100644
--- a/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216182109_project_action_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.source_code.project_action_monthly
-description: Count of unique actions done on projects and related resources (create, edit, delete, comment)
+description: Count of unique actions done on projects and related resources (create,
+  edit, delete, comment)
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216182125_user_sast_jobs.yml b/config/metrics/counts_28d/20210216182125_user_sast_jobs.yml
index 7d1f7d333f29bfa0babea28e64acd912b1339801..6d63d5ffacd7f586f43af3b5ede1a137c3709122 100644
--- a/config/metrics/counts_28d/20210216182125_user_sast_jobs.yml
+++ b/config/metrics/counts_28d/20210216182125_user_sast_jobs.yml
@@ -20,3 +20,4 @@ tier:
 performance_indicator_type:
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216182127_user_secret_detection_jobs.yml b/config/metrics/counts_28d/20210216182127_user_secret_detection_jobs.yml
index e600c877c7bfdf475649ec69e369f58500ccbe6c..2f6b4c6c04bc89511ccae39fd63edcebbb678b24 100644
--- a/config/metrics/counts_28d/20210216182127_user_secret_detection_jobs.yml
+++ b/config/metrics/counts_28d/20210216182127_user_secret_detection_jobs.yml
@@ -20,3 +20,4 @@ tier:
 performance_indicator_type:
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216182129_sast_pipeline.yml b/config/metrics/counts_28d/20210216182129_sast_pipeline.yml
index 8d45c304779997610c6b3abbb691d646fe15956b..14e3cd5e3e66ff7cfcf3253e451e7d2ec59196a1 100644
--- a/config/metrics/counts_28d/20210216182129_sast_pipeline.yml
+++ b/config/metrics/counts_28d/20210216182129_sast_pipeline.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml b/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml
index ff1067285ded67e849825ab7fff88d9d6e3e90c5..cb2002851ff60ead3d6949b46e4e75b363adc50e 100644
--- a/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml
+++ b/config/metrics/counts_28d/20210216182131_secret_detection_pipeline.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml b/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml
index 396f9534393269dbf2848ad3235b5c41b31dedcc..e2835deaeae58960ddb09bcd3a8b15cef974ea0d 100644
--- a/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml
+++ b/config/metrics/counts_28d/20210216182136_i_testing_test_case_parsed_monthly.yml
@@ -14,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_testing_test_case_parsed
+  - i_testing_test_case_parsed
 distribution:
 - ce
 - ee
@@ -23,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml b/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
index 4d09eb0b3763376a37dfe2df1b2fa16e8a4c96a4..4f872e77b6176d34bcabd391a96c2bdc0788e478 100644
--- a/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
+++ b/config/metrics/counts_28d/20210216183159_projects_with_alerts_created.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts_monthly.projects_with_alerts_created
 description: Monthly count of unique projects with HTTP alerting enabled
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183627_omniauth_providers.yml b/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
index d059bcd80221449fd0022d8f6ebce4d2f76e54c9..16749f33b9ad922f6622607bfbfa284a8b1de188 100644
--- a/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
+++ b/config/metrics/counts_28d/20210216183627_omniauth_providers.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183629_two-factor.yml b/config/metrics/counts_28d/20210216183629_two-factor.yml
index 4d4603818eb10fb85f44aafc4529a37f02d19b84..b0c3a35e44af8518617c941a2cff748ea942086c 100644
--- a/config/metrics/counts_28d/20210216183629_two-factor.yml
+++ b/config/metrics/counts_28d/20210216183629_two-factor.yml
@@ -16,3 +16,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183631_two-factor-via-u2f-device.yml b/config/metrics/counts_28d/20210216183631_two-factor-via-u2f-device.yml
index fe24823cdd6ea6ed9280c32feb9322e2a5673292..faf8accfd67ea380e9b803eeff7872ae2fde2d62 100644
--- a/config/metrics/counts_28d/20210216183631_two-factor-via-u2f-device.yml
+++ b/config/metrics/counts_28d/20210216183631_two-factor-via-u2f-device.yml
@@ -16,3 +16,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183633_two-factor-via-webauthn-device.yml b/config/metrics/counts_28d/20210216183633_two-factor-via-webauthn-device.yml
index 95176ccabe54ee40efb6804a8ba3275531d83ca9..fc9cd55deaa685d7d8c2a80306e532c496627694 100644
--- a/config/metrics/counts_28d/20210216183633_two-factor-via-webauthn-device.yml
+++ b/config/metrics/counts_28d/20210216183633_two-factor-via-webauthn-device.yml
@@ -16,3 +16,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183634_standard.yml b/config/metrics/counts_28d/20210216183634_standard.yml
index 172fa780a6905a1b9e83d69e3b0d2db89bc5f758..646c6a14acc12565009b16099fd0fb7790a8df89 100644
--- a/config/metrics/counts_28d/20210216183634_standard.yml
+++ b/config/metrics/counts_28d/20210216183634_standard.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183636_google_oauth2.yml b/config/metrics/counts_28d/20210216183636_google_oauth2.yml
index 1fdccd1721785697857fa2a762d871cdc355b251..1abd4c17a6b38b2514521b4bd9076f802d9b9086 100644
--- a/config/metrics/counts_28d/20210216183636_google_oauth2.yml
+++ b/config/metrics/counts_28d/20210216183636_google_oauth2.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml b/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml
index 063c16fefef640349c045f0be8e658aa0be57538..ffebb3b62b104b2c058a4423fdabb4232bae241b 100644
--- a/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml
+++ b/config/metrics/counts_28d/20210216183638_unique_users_all_imports.yml
@@ -20,3 +20,4 @@ tier:
 performance_indicator_type:
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183640_gitlab.yml b/config/metrics/counts_28d/20210216183640_gitlab.yml
index 139184cc8ac4d20adbcec4ba2eb1395f61f7a4ba..6b074612937c4e822516dc36f9e5b38160797075 100644
--- a/config/metrics/counts_28d/20210216183640_gitlab.yml
+++ b/config/metrics/counts_28d/20210216183640_gitlab.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183642_gitlab_v1.yml b/config/metrics/counts_28d/20210216183642_gitlab_v1.yml
index dc8dec74ef38f55d377ebad5a7000454fddd55ae..82f48f168cc107a96b9122948877f5d24009a5ac 100644
--- a/config/metrics/counts_28d/20210216183642_gitlab_v1.yml
+++ b/config/metrics/counts_28d/20210216183642_gitlab_v1.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183644_gitlab_project.yml b/config/metrics/counts_28d/20210216183644_gitlab_project.yml
index 394d85b4863f9b93c17b295c866094e4098bb309..82c60d0091d025d834d454e3d8fd94e1c56e102a 100644
--- a/config/metrics/counts_28d/20210216183644_gitlab_project.yml
+++ b/config/metrics/counts_28d/20210216183644_gitlab_project.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183646_gitlab.yml b/config/metrics/counts_28d/20210216183646_gitlab.yml
index 84a6387fbf5cf3ff1dae63f1fab6df9ba4751dba..59d7247576c8d5666a844dee94bcba572ae60dd6 100644
--- a/config/metrics/counts_28d/20210216183646_gitlab.yml
+++ b/config/metrics/counts_28d/20210216183646_gitlab.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183648_github.yml b/config/metrics/counts_28d/20210216183648_github.yml
index d7ad93520a7ce59b2f38fc795aa981e19f3c9ccf..7e13997258333260a21709ae2c7435d2479ec9ea 100644
--- a/config/metrics/counts_28d/20210216183648_github.yml
+++ b/config/metrics/counts_28d/20210216183648_github.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183650_bitbucket.yml b/config/metrics/counts_28d/20210216183650_bitbucket.yml
index c702f1a065fc3d5157fd2ef7fecba59ad53feced..f19b9dbb410665dffdfd5db3462d2a7e7cb213d9 100644
--- a/config/metrics/counts_28d/20210216183650_bitbucket.yml
+++ b/config/metrics/counts_28d/20210216183650_bitbucket.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183652_bitbucket_server.yml b/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
index 0781ceca40fb095027989b40f0b91adcad4d46a8..57fc8ec66aea7621e00f917f3f07a16751866176 100644
--- a/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
+++ b/config/metrics/counts_28d/20210216183652_bitbucket_server.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183653_gitea.yml b/config/metrics/counts_28d/20210216183653_gitea.yml
index f5909eb7475a7bfcee63aa65e1c9cbc787b32089..d9729b1fa1fc0b8ebc812b87412a19bd2e71838f 100644
--- a/config/metrics/counts_28d/20210216183653_gitea.yml
+++ b/config/metrics/counts_28d/20210216183653_gitea.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183655_git.yml b/config/metrics/counts_28d/20210216183655_git.yml
index 68738e36ddd3a6f20d9e86d8e279494376a265b9..087ce7bc3d8c912ff4fe19ca801d5808e5c2e198 100644
--- a/config/metrics/counts_28d/20210216183655_git.yml
+++ b/config/metrics/counts_28d/20210216183655_git.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183657_manifest.yml b/config/metrics/counts_28d/20210216183657_manifest.yml
index d93467a39657c73a7b7470efc3e72f6886acecaa..83ddd8d1f4238e35fdc70ec9a1aa495ab3198e4f 100644
--- a/config/metrics/counts_28d/20210216183657_manifest.yml
+++ b/config/metrics/counts_28d/20210216183657_manifest.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183659_gitlab_migration.yml b/config/metrics/counts_28d/20210216183659_gitlab_migration.yml
index 40f4965f8a0413f37577fc67b19a633224bd7013..6408e490753ded2bd30ff3131a02ca8dd2f94b24 100644
--- a/config/metrics/counts_28d/20210216183659_gitlab_migration.yml
+++ b/config/metrics/counts_28d/20210216183659_gitlab_migration.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183701_jira.yml b/config/metrics/counts_28d/20210216183701_jira.yml
index cb6c808fb908c1efedfcb9299ff7f50d37008473..1df00f149c3f200d4304d02dc7f9d5651a72ea80 100644
--- a/config/metrics/counts_28d/20210216183701_jira.yml
+++ b/config/metrics/counts_28d/20210216183701_jira.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183703_fogbugz.yml b/config/metrics/counts_28d/20210216183703_fogbugz.yml
index e3369043e74162991d8b58540cd1406ea7217a58..460d47d5d03f0313f5362741f98c30ab487d8456 100644
--- a/config/metrics/counts_28d/20210216183703_fogbugz.yml
+++ b/config/metrics/counts_28d/20210216183703_fogbugz.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183705_phabricator.yml b/config/metrics/counts_28d/20210216183705_phabricator.yml
index 57bf3e5abf36d39c8d4b51e0034cc3133fe93082..889490dcd3143f5684345038072973a7acf1bdef 100644
--- a/config/metrics/counts_28d/20210216183705_phabricator.yml
+++ b/config/metrics/counts_28d/20210216183705_phabricator.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183707_csv.yml b/config/metrics/counts_28d/20210216183707_csv.yml
index 703edf02f76d91f9893116ea1d317ab35641e2be..8f8c70ac760b7287aa9bdb909261aa9a65406bf7 100644
--- a/config/metrics/counts_28d/20210216183707_csv.yml
+++ b/config/metrics/counts_28d/20210216183707_csv.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183709_group_import.yml b/config/metrics/counts_28d/20210216183709_group_import.yml
index bbe9da3175c39c241d0c84922c3c1bb3a1d7ff71..82472816524867526bb72cb8cc65a0babfb2baf5 100644
--- a/config/metrics/counts_28d/20210216183709_group_import.yml
+++ b/config/metrics/counts_28d/20210216183709_group_import.yml
@@ -11,9 +11,10 @@ status: data_available
 time_frame: 28d
 data_source: database
 distribution:
-  - ce
-  - ee
+- ce
+- ee
 tier:
-  - free
-  - premium
-  - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183711_gitlab_migration.yml b/config/metrics/counts_28d/20210216183711_gitlab_migration.yml
index 1a517169eeb06baf45927bf33021196183f8ccf9..114ba1d41fb022e3ce142128288bb0279b103e0e 100644
--- a/config/metrics/counts_28d/20210216183711_gitlab_migration.yml
+++ b/config/metrics/counts_28d/20210216183711_gitlab_migration.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183712_total.yml b/config/metrics/counts_28d/20210216183712_total.yml
index 8942de0f9b8aebdcaeeb64631abcae168ce94ebc..6df8278609777c68b5eaf8a2258d8f0076075c7d 100644
--- a/config/metrics/counts_28d/20210216183712_total.yml
+++ b/config/metrics/counts_28d/20210216183712_total.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183714_gitlab_project.yml b/config/metrics/counts_28d/20210216183714_gitlab_project.yml
index e8d1204d428fb6b45d50ab1220b9bc41cc30b4a0..65b7f08ee9b00989690abc6af51500811c7dec32 100644
--- a/config/metrics/counts_28d/20210216183714_gitlab_project.yml
+++ b/config/metrics/counts_28d/20210216183714_gitlab_project.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183716_gitlab.yml b/config/metrics/counts_28d/20210216183716_gitlab.yml
index b5ad788c6d0056a226cca7ad751d6fca251d7d50..78113f063ca698738a38abb447a932dceda13025 100644
--- a/config/metrics/counts_28d/20210216183716_gitlab.yml
+++ b/config/metrics/counts_28d/20210216183716_gitlab.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183718_github.yml b/config/metrics/counts_28d/20210216183718_github.yml
index a476a1034584a2d1c4be407082f6f066444b0852..caa2602d5fa8edcc2e6891e59de39568002d3556 100644
--- a/config/metrics/counts_28d/20210216183718_github.yml
+++ b/config/metrics/counts_28d/20210216183718_github.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183720_bitbucket.yml b/config/metrics/counts_28d/20210216183720_bitbucket.yml
index 4c3a0bd37214376159d8d89496d8b5befed1ada1..c9e54883e3f1be541d6b4947cbf6791a40c193ee 100644
--- a/config/metrics/counts_28d/20210216183720_bitbucket.yml
+++ b/config/metrics/counts_28d/20210216183720_bitbucket.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183722_bitbucket_server.yml b/config/metrics/counts_28d/20210216183722_bitbucket_server.yml
index 82bcde1b2eea86b274b8fc0d666f7a238633ab48..7b81f7bf2dd10a1cf42973fa6ce9b392195c34e7 100644
--- a/config/metrics/counts_28d/20210216183722_bitbucket_server.yml
+++ b/config/metrics/counts_28d/20210216183722_bitbucket_server.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183724_gitea.yml b/config/metrics/counts_28d/20210216183724_gitea.yml
index df1d3c5b0124943d11a1293499d8bbdac475a302..9a8c27cae3fb6d22a19a43fd51b112d8cb75a784 100644
--- a/config/metrics/counts_28d/20210216183724_gitea.yml
+++ b/config/metrics/counts_28d/20210216183724_gitea.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183726_git.yml b/config/metrics/counts_28d/20210216183726_git.yml
index 7e711694253b74218ce7c7a0dbb90204dff5f657..b044fd6f4938e5e6a667143f7e62ff6feb9d6e6f 100644
--- a/config/metrics/counts_28d/20210216183726_git.yml
+++ b/config/metrics/counts_28d/20210216183726_git.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183728_manifest.yml b/config/metrics/counts_28d/20210216183728_manifest.yml
index 3c935d604fa9c6b342d93936174638d8105d2570..56d47b288f31c1cd012a1fd4ea8ab3e37bbb5fc7 100644
--- a/config/metrics/counts_28d/20210216183728_manifest.yml
+++ b/config/metrics/counts_28d/20210216183728_manifest.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183730_jira.yml b/config/metrics/counts_28d/20210216183730_jira.yml
index 488b4b4c19e99c2cc7494c5bc377d1bc81a93f1a..1a51229d107a99d7be60d148a115b7b6307b4ea3 100644
--- a/config/metrics/counts_28d/20210216183730_jira.yml
+++ b/config/metrics/counts_28d/20210216183730_jira.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183731_fogbugz.yml b/config/metrics/counts_28d/20210216183731_fogbugz.yml
index 2239c83696d2d3d4e3fbb281912255468eb37bb7..53cfec950c2851654eadb3ae2963efa8854daf5b 100644
--- a/config/metrics/counts_28d/20210216183731_fogbugz.yml
+++ b/config/metrics/counts_28d/20210216183731_fogbugz.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183733_phabricator.yml b/config/metrics/counts_28d/20210216183733_phabricator.yml
index 903a06793e1f21400384722ebecf758a1e8feb82..07b95a6066ce4ae90e82f3278adc9f56dcd62a8d 100644
--- a/config/metrics/counts_28d/20210216183733_phabricator.yml
+++ b/config/metrics/counts_28d/20210216183733_phabricator.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183735_csv.yml b/config/metrics/counts_28d/20210216183735_csv.yml
index 2890302b24a184025d42abc0d199b9c149c0c3a7..afdafb3c50713cdb9b585dc1d5386fa1d8af31f8 100644
--- a/config/metrics/counts_28d/20210216183735_csv.yml
+++ b/config/metrics/counts_28d/20210216183735_csv.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183737_groups_imported.yml b/config/metrics/counts_28d/20210216183737_groups_imported.yml
index b2a53befda21ed9c04f098b2aa6a7210e2b97ccb..0de2e16e661a0cfa39a5cd74b83ec74c7e17fe13 100644
--- a/config/metrics/counts_28d/20210216183737_groups_imported.yml
+++ b/config/metrics/counts_28d/20210216183737_groups_imported.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml b/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml
index 3987df0e7eb6d6dba97ea7aa9d45e01999929115..91cbe6f1af5e353ee9e7021bcfa5002d06874bc7 100644
--- a/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml
+++ b/config/metrics/counts_28d/20210216183922_search_unique_visits_for_any_target_monthly.yml
@@ -1,7 +1,10 @@
 ---
 data_category: optional
 key_path: search_unique_visits.search_unique_visits_for_any_target_monthly
-description: Total unique users for i_search_total, i_search_advanced, i_search_paid for recent 28 days. This metric is redundant because advanced will be a subset of paid and paid will be a subset of total. i_search_total is more appropriate if you just want the total
+description: Total unique users for i_search_total, i_search_advanced, i_search_paid
+  for recent 28 days. This metric is redundant because advanced will be a subset of
+  paid and paid will be a subset of total. i_search_total is more appropriate if you
+  just want the total
 product_section: enablement
 product_stage: enablement
 product_group: group::global search
@@ -13,9 +16,9 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_search_total
-    - i_search_advanced
-    - i_search_paid
+  - i_search_total
+  - i_search_advanced
+  - i_search_paid
 distribution:
 - ce
 - ee
@@ -23,3 +26,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml b/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml
index fe05044105ad5a526d7f896a46546bf576c43b47..4726da80f2f8a5caaf367c6c40c0efc5939c8737 100644
--- a/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml
+++ b/config/metrics/counts_28d/20210216184024_g_edit_by_sse_monthly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml b/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
index e47c1d8b729934e6e29e74d63656cc1c49ea18e1..123d1009d2ae069866bf88b358e9c63b452b9523 100644
--- a/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
+++ b/config/metrics/counts_28d/20210216184047_git_write_action_monthly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml
index be9420ef8cdd5dbb14c4e69ec9d107f94140b51e..e8968722dd8be6c49988e968770ee8e8fd01bf14 100644
--- a/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184140_testing_total_unique_counts_monthly.yml
@@ -13,19 +13,20 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_testing_test_case_parsed
-    - i_testing_metrics_report_widget_total
-    - i_testing_group_code_coverage_visit_total
-    - i_testing_full_code_quality_report_total
-    - i_testing_web_performance_widget_total
-    - i_testing_group_code_coverage_project_click_total
-    - i_testing_load_performance_widget_total
-    - i_testing_metrics_report_artifact_uploaders
-    - i_testing_summary_widget_total
-    - users_expanding_testing_code_quality_report
-    - users_expanding_testing_accessibility_report
+  - i_testing_test_case_parsed
+  - i_testing_metrics_report_widget_total
+  - i_testing_group_code_coverage_visit_total
+  - i_testing_full_code_quality_report_total
+  - i_testing_web_performance_widget_total
+  - i_testing_group_code_coverage_project_click_total
+  - i_testing_load_performance_widget_total
+  - i_testing_metrics_report_artifact_uploaders
+  - i_testing_summary_widget_total
+  - users_expanding_testing_code_quality_report
+  - users_expanding_testing_accessibility_report
 distribution:
 - ce
 tier:
 - free
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml b/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml
index 7c0bcbb795b5b12db4da9e606bb514510ab6d54c..fd4ada20acb5623d6e53739a2dc4d185bf869948 100644
--- a/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml
+++ b/config/metrics/counts_28d/20210216184255_i_snippets_show_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_snippets_show
+  - i_snippets_show
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml b/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml
index b3b3c7b6749bfc33deff7dff163e02cf5e488673..cebe0f4fee0a5b583d5ba834a1a601094ab22fcb 100644
--- a/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml
+++ b/config/metrics/counts_28d/20210216184259_p_terraform_state_api_unique_users_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_terraform_state_api_unique_users
+  - p_terraform_state_api_unique_users
 distribution:
 - ce
 - ee
@@ -25,3 +25,4 @@ performance_indicator_type:
 - smau
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml b/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml
index ca852c74821c51fbad81ae87bcbc2fe67e1ac66c..298f974295a7d30ef38bad2424c2d890b9262f3a 100644
--- a/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml
+++ b/config/metrics/counts_28d/20210216184303_o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.pipeline_authoring.o_pipeline_authoring_unique_users_committing_ciconfigfile_monthly
-description: Monthly unique user count doing commits which contains the CI config file
+description: Monthly unique user count doing commits which contains the CI config
+  file
 product_section: ops
 product_stage: verify
 product_group: group::pipeline authoring
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - o_pipeline_authoring_unique_users_committing_ciconfigfile
+  - o_pipeline_authoring_unique_users_committing_ciconfigfile
 distribution:
 - ee
 - ce
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml b/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml
index 1307111cc3cb0ed64cb19deb18e3b258b795a802..22e1dc89ecf6fb71f2a512d3ec0f6aa01745209c 100644
--- a/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml
+++ b/config/metrics/counts_28d/20210216184312_i_code_review_user_toggled_task_item_status_monthly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_toggled_task_item_status
+  - i_code_review_user_toggled_task_item_status
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml b/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml
index a2e858cd88669a8bc07375d66a514cbd597131a1..06d07cd0a1f90a081f16913927505bd96b73b931 100644
--- a/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216184322_i_code_review_user_approve_mr_monthly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_approve_mr
+  - i_code_review_user_approve_mr
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml b/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml
index 583978e9bd6698d7d76eedb8ecb998e052ec5966..675942f8a3027932d60d79bac220ef8c93cc36c4 100644
--- a/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml
+++ b/config/metrics/counts_28d/20210216184326_i_code_review_user_unapprove_mr_monthly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_unapprove_mr
+  - i_code_review_user_unapprove_mr
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml b/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml
index 0828587051e00ed33b336ca563957235748a7f94..0f943b0eeec3434f922eac4bd15f3acee5c8d7e3 100644
--- a/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml
+++ b/config/metrics/counts_28d/20210216184330_i_code_review_user_resolve_thread_monthly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_resolve_thread
+  - i_code_review_user_resolve_thread
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml b/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml
index fe195544df4550ed015a0128714577395d06ee43..a39785eb250fc3fd70226bfc256ddcd24845d813 100644
--- a/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml
+++ b/config/metrics/counts_28d/20210216184334_i_code_review_user_unresolve_thread_monthly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_unresolve_thread
+  - i_code_review_user_unresolve_thread
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml b/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml
index 0bd8573477bc01d457bc6fc1f67f677185e0ea0c..750030701ca2dfe49b141eea7c11479bef3bdb38 100644
--- a/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml
+++ b/config/metrics/counts_28d/20210216184338_i_code_review_edit_mr_title_monthly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_edit_mr_title
+  - i_code_review_edit_mr_title
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml b/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml
index ba30f3aad308f839627d76fd047ee76edacbd307..545971519eb35e3923cc1577f6e25bf53e0043e9 100644
--- a/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml
+++ b/config/metrics/counts_28d/20210216184342_i_code_review_edit_mr_desc_monthly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_edit_mr_desc
+  - i_code_review_edit_mr_desc
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml b/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml
index f948c01170f41b3a7e7a959db594e88ee73e8aec..aab964e0ad3eb6dd46a0a2c09b0e7c1ad61408c6 100644
--- a/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml
+++ b/config/metrics/counts_28d/20210216184353_i_code_review_user_create_review_note_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_create_review_note_monthly
-description: Count of unique users per month who create a note as part of a merge request review
+description: Count of unique users per month who create a note as part of a merge
+  request review
 product_stage: create
 product_group: group::code review
 product_category: code_review
@@ -12,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_create_review_note
+  - i_code_review_user_create_review_note
 distribution:
 - ce
 - ee
@@ -21,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml b/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml
index 478ae4bef09d8b251be3f2776563818f3a517822..57d0a40be566bba558f7c7cfefb520394efbda2c 100644
--- a/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml
+++ b/config/metrics/counts_28d/20210216184357_i_code_review_user_publish_review_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_publish_review_monthly
-description: Count of unique users per month who publish their review as part of a merge request review
+description: Count of unique users per month who publish their review as part of a
+  merge request review
 product_stage: create
 product_group: group::code review
 product_category: code_review
@@ -12,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_publish_review
+  - i_code_review_user_publish_review
 distribution:
 - ce
 - ee
@@ -21,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml
index 7e5ccc54f67ae4f4a47ca14bd32a70e3a5c6a56e..3669febc3b6580e96f8bda846b088f4e2c21a652 100644
--- a/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216184401_i_code_review_user_create_multiline_mr_comment_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_create_multiline_mr_comment_monthly
-description: Count of unique users per month who create a multiline comment in a merge request
+description: Count of unique users per month who create a multiline comment in a merge
+  request
 product_stage: create
 product_group: group::code review
 product_category: code_review
@@ -12,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_create_multiline_mr_comment
+  - i_code_review_user_create_multiline_mr_comment
 distribution:
 - ce
 - ee
@@ -21,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml
index 59def107ab6c1a93727a6c727c01c22a65b90854..841b684c90163821925de11a405128c916346453 100644
--- a/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216184405_i_code_review_user_edit_multiline_mr_comment_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_edit_multiline_mr_comment_monthly
-description: Count of unique users per week who edit a multiline comment in a merge request
+description: Count of unique users per week who edit a multiline comment in a merge
+  request
 product_stage: create
 product_group: group::code review
 product_category: code_review
@@ -12,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_edit_multiline_mr_comment
+  - i_code_review_user_edit_multiline_mr_comment
 distribution:
 - ce
 - ee
@@ -21,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml b/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml
index ec940edea178f63dcfed21a87dd3a0e3ed5fe3cf..ae50ab0a27f020c4fc4eb75c20fddd04a7870f87 100644
--- a/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml
+++ b/config/metrics/counts_28d/20210216184409_i_code_review_user_remove_multiline_mr_comment_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_remove_multiline_mr_comment_monthly
-description: Count of unique users per month who remove a multiline comment in a merge request
+description: Count of unique users per month who remove a multiline comment in a merge
+  request
 product_stage: create
 product_group: group::code review
 product_category: code_review
@@ -12,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_remove_multiline_mr_comment
+  - i_code_review_user_remove_multiline_mr_comment
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml b/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml
index 2e4b9bffb9fc024d04967ed4c484e478bd57cdbd..9497033db45e2dc20b6083afae844bd1c2148471 100644
--- a/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml
+++ b/config/metrics/counts_28d/20210216184418_i_code_review_user_assigned_monthly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_assigned
+  - i_code_review_user_assigned
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml b/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml
index bf49cac8446a89faa7e3825ebd3c8a863d31a886..2cb3ab242694d93776912fc34a752dc66cc089c1 100644
--- a/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml
+++ b/config/metrics/counts_28d/20210216184422_i_code_review_user_marked_as_draft_monthly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_marked_as_draft
+  - i_code_review_user_marked_as_draft
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml b/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml
index 746e9ed6f2f07c61f0f105c29a6b3f86bf213484..3d0b22eff1b882c314ff17ec5f1b3990c5f9193f 100644
--- a/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml
+++ b/config/metrics/counts_28d/20210216184426_i_code_review_user_unmarked_as_draft_monthly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_unmarked_as_draft
+  - i_code_review_user_unmarked_as_draft
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml b/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml
index a93b38a14ec37d11f5a66189f10ea1d61567569a..5be14acc358e8edd390601cb2dd71254ed6512dd 100644
--- a/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml
+++ b/config/metrics/counts_28d/20210216184430_i_code_review_user_review_requested_monthly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_review_requested
+  - i_code_review_user_review_requested
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml b/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml
index fec8c67a6e7f7f70975427e375ca02b02394a350..e38b274195419e2b4174afff3c2c5556b06f3830 100644
--- a/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml
+++ b/config/metrics/counts_28d/20210216184434_i_code_review_user_approval_rule_added_monthly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_approval_rule_added
+  - i_code_review_user_approval_rule_added
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml b/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml
index c33697d8925376f393b683de0206d366b282aa77..0fd568681c8b3cb7e2188ec808b9d198d3a6274d 100644
--- a/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml
+++ b/config/metrics/counts_28d/20210216184438_i_code_review_user_approval_rule_deleted_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_deleted_monthly
-description: Count of unique users per month who delete an approval rule to a merge request
+description: Count of unique users per month who delete an approval rule to a merge
+  request
 product_stage: create
 product_group: group::code review
 product_category: code_review
@@ -12,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_approval_rule_deleted
+  - i_code_review_user_approval_rule_deleted
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml b/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml
index c46191814feca9ee1efcfda588a56a946d4f6cbd..e159663d14c750c9185f21ef68ab76327aa8acb8 100644
--- a/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml
+++ b/config/metrics/counts_28d/20210216184442_i_code_review_user_approval_rule_edited_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_edited_monthly
-description: Count of unique users per month who delete an approval rule to a merge request
+description: Count of unique users per month who delete an approval rule to a merge
+  request
 product_stage: create
 product_group: group::code review
 product_category: code_review
@@ -12,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_approval_rule_edited
+  - i_code_review_user_approval_rule_edited
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml b/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml
index d4f72aab3eb04c5eb2d6dbf8531cff2de0511368..d8ac193b822601f56378b38eebc4f8c787853239 100644
--- a/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml
+++ b/config/metrics/counts_28d/20210216184446_i_code_review_user_vs_code_api_request_monthly.yml
@@ -12,7 +12,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_vs_code_api_request
+  - i_code_review_user_vs_code_api_request
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml b/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml
index 3a672ceb92faa47d85d5a09f164c40a52151480a..6f9ef7d5a670c5bd1c5916fa1efd89c971f4416f 100644
--- a/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210216184450_i_code_review_user_create_mr_from_issue_monthly.yml
@@ -12,15 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_create_mr_from_issue
-instrumentation_class: RedisHLLMetric
-options:
-  events:
-    - i_code_review_user_create_mr
+  - i_code_review_user_create_mr
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
index 2b6e1c978d7c0a34b4ac4042a1d80695f0e1975d..46e7eb0bb9b22914feadef7818d22895158b7c0d 100644
--- a/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184454_code_review_total_unique_counts_monthly.yml
@@ -12,62 +12,62 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_mr_diffs
-    - i_code_review_user_single_file_diffs
-    - i_code_review_mr_single_file_diffs
-    - i_code_review_user_toggled_task_item_status
-    - i_code_review_user_create_mr
-    - i_code_review_user_close_mr
-    - i_code_review_user_reopen_mr
-    - i_code_review_user_approve_mr
-    - i_code_review_user_unapprove_mr
-    - i_code_review_user_resolve_thread
-    - i_code_review_user_unresolve_thread
-    - i_code_review_edit_mr_title
-    - i_code_review_edit_mr_desc
-    - i_code_review_user_merge_mr
-    - i_code_review_user_create_mr_comment
-    - i_code_review_user_edit_mr_comment
-    - i_code_review_user_remove_mr_comment
-    - i_code_review_user_create_review_note
-    - i_code_review_user_publish_review
-    - i_code_review_user_create_multiline_mr_comment
-    - i_code_review_user_edit_multiline_mr_comment
-    - i_code_review_user_remove_multiline_mr_comment
-    - i_code_review_user_add_suggestion
-    - i_code_review_user_apply_suggestion
-    - i_code_review_user_assigned
-    - i_code_review_user_marked_as_draft
-    - i_code_review_user_unmarked_as_draft
-    - i_code_review_user_review_requested
-    - i_code_review_user_approval_rule_added
-    - i_code_review_user_approval_rule_deleted
-    - i_code_review_user_approval_rule_edited
-    - i_code_review_user_vs_code_api_request
-    - i_code_review_user_create_mr_from_issue
-    - i_code_review_user_mr_discussion_locked
-    - i_code_review_user_mr_discussion_unlocked
-    - i_code_review_user_time_estimate_changed
-    - i_code_review_user_time_spent_changed
-    - i_code_review_user_assignees_changed
-    - i_code_review_user_reviewers_changed
-    - i_code_review_user_milestone_changed
-    - i_code_review_user_labels_changed
-    - i_code_review_click_diff_view_setting
-    - i_code_review_click_single_file_mode_setting
-    - i_code_review_click_file_browser_setting
-    - i_code_review_click_whitespace_setting
-    - i_code_review_diff_view_inline
-    - i_code_review_diff_view_parallel
-    - i_code_review_file_browser_tree_view
-    - i_code_review_file_browser_list_view
-    - i_code_review_diff_show_whitespace
-    - i_code_review_diff_hide_whitespace
-    - i_code_review_diff_single_file
-    - i_code_review_diff_multiple_files
-    - i_code_review_user_load_conflict_ui
-    - i_code_review_user_resolve_conflict
-    - i_code_review_user_searches_diff
+  - i_code_review_mr_diffs
+  - i_code_review_user_single_file_diffs
+  - i_code_review_mr_single_file_diffs
+  - i_code_review_user_toggled_task_item_status
+  - i_code_review_user_create_mr
+  - i_code_review_user_close_mr
+  - i_code_review_user_reopen_mr
+  - i_code_review_user_approve_mr
+  - i_code_review_user_unapprove_mr
+  - i_code_review_user_resolve_thread
+  - i_code_review_user_unresolve_thread
+  - i_code_review_edit_mr_title
+  - i_code_review_edit_mr_desc
+  - i_code_review_user_merge_mr
+  - i_code_review_user_create_mr_comment
+  - i_code_review_user_edit_mr_comment
+  - i_code_review_user_remove_mr_comment
+  - i_code_review_user_create_review_note
+  - i_code_review_user_publish_review
+  - i_code_review_user_create_multiline_mr_comment
+  - i_code_review_user_edit_multiline_mr_comment
+  - i_code_review_user_remove_multiline_mr_comment
+  - i_code_review_user_add_suggestion
+  - i_code_review_user_apply_suggestion
+  - i_code_review_user_assigned
+  - i_code_review_user_marked_as_draft
+  - i_code_review_user_unmarked_as_draft
+  - i_code_review_user_review_requested
+  - i_code_review_user_approval_rule_added
+  - i_code_review_user_approval_rule_deleted
+  - i_code_review_user_approval_rule_edited
+  - i_code_review_user_vs_code_api_request
+  - i_code_review_user_create_mr_from_issue
+  - i_code_review_user_mr_discussion_locked
+  - i_code_review_user_mr_discussion_unlocked
+  - i_code_review_user_time_estimate_changed
+  - i_code_review_user_time_spent_changed
+  - i_code_review_user_assignees_changed
+  - i_code_review_user_reviewers_changed
+  - i_code_review_user_milestone_changed
+  - i_code_review_user_labels_changed
+  - i_code_review_click_diff_view_setting
+  - i_code_review_click_single_file_mode_setting
+  - i_code_review_click_file_browser_setting
+  - i_code_review_click_whitespace_setting
+  - i_code_review_diff_view_inline
+  - i_code_review_diff_view_parallel
+  - i_code_review_file_browser_tree_view
+  - i_code_review_file_browser_list_view
+  - i_code_review_diff_show_whitespace
+  - i_code_review_diff_hide_whitespace
+  - i_code_review_diff_single_file
+  - i_code_review_diff_multiple_files
+  - i_code_review_user_load_conflict_ui
+  - i_code_review_user_resolve_conflict
+  - i_code_review_user_searches_diff
 distribution:
 - ce
 - ee
@@ -76,3 +76,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml b/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
index 0f31fe683c6d5c855706372f0b93831fef7d32db..400542cfffe89ff8cb28aced11d9d9577a93ede6 100644
--- a/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
+++ b/config/metrics/counts_28d/20210216184458_p_ci_templates_implicit_auto_devops_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_implicit_auto_devops
+  - p_ci_templates_implicit_auto_devops
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml b/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml
index 3ac9b6f4ddcb432ac6b9fd3cf691cc30fdf3427d..9c5bf3d9d5045e978426b2de951b71f51f0a7d98 100644
--- a/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml
+++ b/config/metrics/counts_28d/20210216184502_p_ci_templates_implicit_auto_devops_build_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_implicit_auto_devops_build
+  - p_ci_templates_implicit_auto_devops_build
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml b/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml
index ab0fabca342bc348421e2b48e2b3370939282865..367e5b8900ee228d19b6f90d4cc01f43a4d940db 100644
--- a/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210216184506_p_ci_templates_implicit_auto_devops_deploy_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_implicit_auto_devops_deploy
+  - p_ci_templates_implicit_auto_devops_deploy
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184510_p_ci_templates_implicit_security_sast_monthly.yml b/config/metrics/counts_28d/20210216184510_p_ci_templates_implicit_security_sast_monthly.yml
index 5ad9c37ea8d0a729b25634083dfe9832dde9f456..84d998cfc6463169b49d5cce352663ef2e73aee4 100644
--- a/config/metrics/counts_28d/20210216184510_p_ci_templates_implicit_security_sast_monthly.yml
+++ b/config/metrics/counts_28d/20210216184510_p_ci_templates_implicit_security_sast_monthly.yml
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_implicit_security_sast
+  - p_ci_templates_implicit_security_sast
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184513_p_ci_templates_implicit_security_secret_detection_monthly.yml b/config/metrics/counts_28d/20210216184513_p_ci_templates_implicit_security_secret_detection_monthly.yml
index 31ff83c08fadcb739d8b3f433b70ae884465f89d..855a74cdd9100a6941b66210ad397b6d9c826f0d 100644
--- a/config/metrics/counts_28d/20210216184513_p_ci_templates_implicit_security_secret_detection_monthly.yml
+++ b/config/metrics/counts_28d/20210216184513_p_ci_templates_implicit_security_secret_detection_monthly.yml
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_implicit_security_secret_detection
+  - p_ci_templates_implicit_security_secret_detection
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml b/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
index 2a0041f589bfc4844f61fd377a020bbf18ad9048..21811eec3e73497b473b7e4edd14ec3c51cc88d2 100644
--- a/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
+++ b/config/metrics/counts_28d/20210216184517_p_ci_templates_5_min_production_app_monthly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_5_min_production_app_mo
 description: Number of projects using 5 min production app CI template in last 7 days.
 product_section: seg
 product_stage: deploy
-product_group: "group::5-min-app"
+product_group: group::5-min-app
 product_category: five_minute_production_app
 value_type: number
 status: data_available
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_5_min_production_app
+  - p_ci_templates_5_min_production_app
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml b/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml
index feb29888b98fdda0d389ddf92c111bdb905f7c37..19c73df2fcd6257a2d76aaf28e7faeb0ef8a494e 100644
--- a/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml
+++ b/config/metrics/counts_28d/20210216184523_p_ci_templates_auto_devops_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_auto_devops
+  - p_ci_templates_auto_devops
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml b/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml
index 479ae0b65e7895386335ca10505729e72cad4384..41ec8a7cfc32e0036d0fbe0119f0b7005a772349 100644
--- a/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml
+++ b/config/metrics/counts_28d/20210216184526_p_ci_templates_aws_cf_deploy_ec2_monthly.yml
@@ -1,10 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_aws_cf_deploy_ec2_monthly
-description: "Count of projects using `AWS/CF-Provision-and-Deploy-EC2.gitlab-ci.yml` template in last 28 days."
+description: Count of projects using `AWS/CF-Provision-and-Deploy-EC2.gitlab-ci.yml`
+  template in last 28 days.
 product_section: ops
 product_stage: release
-product_group: "group::release"
+product_group: group::release
 product_category: continuous_delivery
 value_type: number
 status: data_available
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_aws_cf_deploy_ec2
+  - p_ci_templates_aws_cf_deploy_ec2
 distribution:
 - ce
 - ee
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml b/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml
index d6e8edfc8f9aa6cfca89306a4a4c4211b28c6abd..9771f969aaf94fc3b67f86b2a13198dcf62404db 100644
--- a/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml
+++ b/config/metrics/counts_28d/20210216184530_p_ci_templates_aws_deploy_ecs_monthly.yml
@@ -1,10 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_aws_deploy_ecs_monthly
-description: "Count of projects using `AWS/Deploy-ECS.gitlab-ci.yml` template in last 28 days."
+description: Count of projects using `AWS/Deploy-ECS.gitlab-ci.yml` template in last
+  28 days.
 product_section: ops
 product_stage: release
-product_group: "group::release"
+product_group: group::release
 product_category: continuous_delivery
 value_type: number
 status: data_available
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_aws_deploy_ecs
+  - p_ci_templates_aws_deploy_ecs
 distribution:
 - ce
 - ee
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml b/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml
index 04b087c2b632e81dbc77cac83aa6ece5006cd8e7..555a9a3cdd1b4da7e5db862acbade07bfbc16f14 100644
--- a/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml
+++ b/config/metrics/counts_28d/20210216184534_p_ci_templates_auto_devops_build_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_auto_devops_build
+  - p_ci_templates_auto_devops_build
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml b/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml
index c5f24824bde30b4a04d8be42a642b2a154793244..0571f374494ff225156176400933e3d5aedd5b8a 100644
--- a/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml
+++ b/config/metrics/counts_28d/20210216184538_p_ci_templates_auto_devops_deploy_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_auto_devops_deploy
+  - p_ci_templates_auto_devops_deploy
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml b/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml
index baac103aae1b1c3d629131d12102a54bfecffd08..bed203b73e13aa3b17767d39cba2b9666de370f5 100644
--- a/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210216184542_p_ci_templates_auto_devops_deploy_latest_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_auto_devops_deploy_latest
+  - p_ci_templates_auto_devops_deploy_latest
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184546_p_ci_templates_security_sast_monthly.yml b/config/metrics/counts_28d/20210216184546_p_ci_templates_security_sast_monthly.yml
index 0e072188e2a140f837fd7622630907cf53839bb6..b55d971bea55e9685c092cf8be534bb901443ffe 100644
--- a/config/metrics/counts_28d/20210216184546_p_ci_templates_security_sast_monthly.yml
+++ b/config/metrics/counts_28d/20210216184546_p_ci_templates_security_sast_monthly.yml
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_security_sast
+  - p_ci_templates_security_sast
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184551_p_ci_templates_security_secret_detection_monthly.yml b/config/metrics/counts_28d/20210216184551_p_ci_templates_security_secret_detection_monthly.yml
index 7e9f5151a2362a43ad6f3f8542c4c9cea2a2e7af..922e85d2686130493db1ad2c23088a92a09939e4 100644
--- a/config/metrics/counts_28d/20210216184551_p_ci_templates_security_secret_detection_monthly.yml
+++ b/config/metrics/counts_28d/20210216184551_p_ci_templates_security_secret_detection_monthly.yml
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_security_secret_detection
+  - p_ci_templates_security_secret_detection
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml b/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml
index 063b9e7c58251432cb34d6639f4487476a96c976..c8966b080d600f27271f8ac5cb5103c34c3c224e 100644
--- a/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml
+++ b/config/metrics/counts_28d/20210216184555_p_ci_templates_terraform_base_latest_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_terraform_base_latest
+  - p_ci_templates_terraform_base_latest
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
index c036b506ac53b43c991308be546c6b3ccdbce134..8260b53734ea6a72a9ed4f65242b6a8f55e797fb 100644
--- a/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184559_ci_templates_total_unique_counts_monthly.yml
@@ -14,21 +14,21 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_implicit_auto_devops
-    - p_ci_templates_implicit_auto_devops_build
-    - p_ci_templates_implicit_auto_devops_deploy
-    - p_ci_templates_implicit_security_sast
-    - p_ci_templates_implicit_security_secret_detection
-    - p_ci_templates_5_min_production_app
-    - p_ci_templates_auto_devops
-    - p_ci_templates_aws_cf_deploy_ec2
-    - p_ci_templates_aws_deploy_ecs
-    - p_ci_templates_auto_devops_build
-    - p_ci_templates_auto_devops_deploy
-    - p_ci_templates_auto_devops_deploy_latest
-    - p_ci_templates_security_sast
-    - p_ci_templates_security_secret_detection
-    - p_ci_templates_terraform_base_latest
+  - p_ci_templates_implicit_auto_devops
+  - p_ci_templates_implicit_auto_devops_build
+  - p_ci_templates_implicit_auto_devops_deploy
+  - p_ci_templates_implicit_security_sast
+  - p_ci_templates_implicit_security_secret_detection
+  - p_ci_templates_5_min_production_app
+  - p_ci_templates_auto_devops
+  - p_ci_templates_aws_cf_deploy_ec2
+  - p_ci_templates_aws_deploy_ecs
+  - p_ci_templates_auto_devops_build
+  - p_ci_templates_auto_devops_deploy
+  - p_ci_templates_auto_devops_deploy_latest
+  - p_ci_templates_security_sast
+  - p_ci_templates_security_secret_detection
+  - p_ci_templates_terraform_base_latest
 distribution:
 - ce
 - ee
@@ -37,3 +37,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
index de5acc6a60c759ca5bf1c2018abcb6e3298d70d8..5768df2725cf976201ca4ff0986d8f7dd0f91f08 100644
--- a/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184803_quickactions_total_unique_counts_monthly.yml
@@ -3,9 +3,9 @@ data_category: optional
 key_path: redis_hll_counters.quickactions.quickactions_total_unique_counts_monthly
 description: Count of MAU using one or more quick actions
 product_section: dev
-product_stage: plan 
-product_group: group::project management 
-product_category: issue_tracking 
+product_stage: plan
+product_group: group::project management
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,78 +13,79 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_approve
-    - i_quickactions_assign_single
-    - i_quickactions_assign_multiple
-    - i_quickactions_assign_self
-    - i_quickactions_assign_reviewer
-    - i_quickactions_award
-    - i_quickactions_board_move
-    - i_quickactions_child_epic
-    - i_quickactions_clear_weight
-    - i_quickactions_clone
-    - i_quickactions_close
-    - i_quickactions_confidential
-    - i_quickactions_copy_metadata_merge_request
-    - i_quickactions_copy_metadata_issue
-    - i_quickactions_create_merge_request
-    - i_quickactions_done
-    - i_quickactions_draft
-    - i_quickactions_due
-    - i_quickactions_duplicate
-    - i_quickactions_epic
-    - i_quickactions_estimate
-    - i_quickactions_iteration
-    - i_quickactions_label
-    - i_quickactions_lock
-    - i_quickactions_merge
-    - i_quickactions_milestone
-    - i_quickactions_move
-    - i_quickactions_parent_epic
-    - i_quickactions_promote
-    - i_quickactions_publish
-    - i_quickactions_reassign
-    - i_quickactions_reassign_reviewer
-    - i_quickactions_rebase
-    - i_quickactions_relabel
-    - i_quickactions_relate
-    - i_quickactions_remove_child_epic
-    - i_quickactions_remove_due_date
-    - i_quickactions_remove_epic
-    - i_quickactions_remove_estimate
-    - i_quickactions_remove_iteration
-    - i_quickactions_remove_milestone
-    - i_quickactions_remove_parent_epic
-    - i_quickactions_remove_time_spent
-    - i_quickactions_remove_zoom
-    - i_quickactions_reopen
-    - i_quickactions_severity
-    - i_quickactions_shrug
-    - i_quickactions_spend_subtract
-    - i_quickactions_spend_add
-    - i_quickactions_submit_review
-    - i_quickactions_subscribe
-    - i_quickactions_tableflip
-    - i_quickactions_tag
-    - i_quickactions_target_branch
-    - i_quickactions_title
-    - i_quickactions_todo
-    - i_quickactions_unassign_specific
-    - i_quickactions_unassign_all
-    - i_quickactions_unassign_reviewer
-    - i_quickactions_unlabel_specific
-    - i_quickactions_unlabel_all
-    - i_quickactions_unlock
-    - i_quickactions_unsubscribe
-    - i_quickactions_weight
-    - i_quickactions_wip
-    - i_quickactions_zoom
-    - i_quickactions_invite_email_single
-    - i_quickactions_invite_email_multiple
+  - i_quickactions_approve
+  - i_quickactions_assign_single
+  - i_quickactions_assign_multiple
+  - i_quickactions_assign_self
+  - i_quickactions_assign_reviewer
+  - i_quickactions_award
+  - i_quickactions_board_move
+  - i_quickactions_child_epic
+  - i_quickactions_clear_weight
+  - i_quickactions_clone
+  - i_quickactions_close
+  - i_quickactions_confidential
+  - i_quickactions_copy_metadata_merge_request
+  - i_quickactions_copy_metadata_issue
+  - i_quickactions_create_merge_request
+  - i_quickactions_done
+  - i_quickactions_draft
+  - i_quickactions_due
+  - i_quickactions_duplicate
+  - i_quickactions_epic
+  - i_quickactions_estimate
+  - i_quickactions_iteration
+  - i_quickactions_label
+  - i_quickactions_lock
+  - i_quickactions_merge
+  - i_quickactions_milestone
+  - i_quickactions_move
+  - i_quickactions_parent_epic
+  - i_quickactions_promote
+  - i_quickactions_publish
+  - i_quickactions_reassign
+  - i_quickactions_reassign_reviewer
+  - i_quickactions_rebase
+  - i_quickactions_relabel
+  - i_quickactions_relate
+  - i_quickactions_remove_child_epic
+  - i_quickactions_remove_due_date
+  - i_quickactions_remove_epic
+  - i_quickactions_remove_estimate
+  - i_quickactions_remove_iteration
+  - i_quickactions_remove_milestone
+  - i_quickactions_remove_parent_epic
+  - i_quickactions_remove_time_spent
+  - i_quickactions_remove_zoom
+  - i_quickactions_reopen
+  - i_quickactions_severity
+  - i_quickactions_shrug
+  - i_quickactions_spend_subtract
+  - i_quickactions_spend_add
+  - i_quickactions_submit_review
+  - i_quickactions_subscribe
+  - i_quickactions_tableflip
+  - i_quickactions_tag
+  - i_quickactions_target_branch
+  - i_quickactions_title
+  - i_quickactions_todo
+  - i_quickactions_unassign_specific
+  - i_quickactions_unassign_all
+  - i_quickactions_unassign_reviewer
+  - i_quickactions_unlabel_specific
+  - i_quickactions_unlabel_all
+  - i_quickactions_unlock
+  - i_quickactions_unsubscribe
+  - i_quickactions_weight
+  - i_quickactions_wip
+  - i_quickactions_zoom
+  - i_quickactions_invite_email_single
+  - i_quickactions_invite_email_multiple
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
-- ultimate 
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184806_i_package_composer_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184806_i_package_composer_deploy_token_monthly.yml
index 27893e9a72c4af45a09d6eca3754679db916c96f..8a74677d8f26db0b3bf3b89acc10712483507b6f 100644
--- a/config/metrics/counts_28d/20210216184806_i_package_composer_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184806_i_package_composer_deploy_token_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_composer_deploy_token_monthly
-description: A monthly count of Composer packages published to the registry using a deploy token
+description: A monthly count of Composer packages published to the registry using
+  a deploy token
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_composer_deploy_token
+  - i_package_composer_deploy_token
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184810_i_package_conan_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184810_i_package_conan_deploy_token_monthly.yml
index f5b4a753ca32b6c98dba28c2dacd432cdd8f8d7d..d7d45f39f0c5acffdd0dfa74a87d78bc589037d2 100644
--- a/config/metrics/counts_28d/20210216184810_i_package_conan_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184810_i_package_conan_deploy_token_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_conan_deploy_token_monthly
-description: A monthly count of Conan packages published to the registry using a deploy token
+description: A monthly count of Conan packages published to the registry using a deploy
+  token
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_conan_deploy_token
+  - i_package_conan_deploy_token
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml
index 3da9fd8a073bc57b9f115196dd0ea8c30766714e..dc08e248c4fbb02e630f2812e60635af6d852a57 100644
--- a/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184814_i_package_container_deploy_token_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_container_deploy_token_monthly
-description: A monthly count of container images published to the registry using a deploy token
+description: A monthly count of container images published to the registry using a
+  deploy token
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_container_deploy_token
+  - i_package_container_deploy_token
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml
index 5bddca4b70e9d0b0742f5ce3f88adb7d6839a5af..edb282fd1a1f1a262358335f8f7ea4e110595750 100644
--- a/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184818_i_package_debian_deploy_token_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_debian_deploy_token_monthly
-description: A monthly count of Debian packages published to the registry using a deploy token
+description: A monthly count of Debian packages published to the registry using a
+  deploy token
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_debian_deploy_token
+  - i_package_debian_deploy_token
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml
index 4bf549b26534671830fcacc22f4dece1258d8f5c..84da476edb5634518c4464fed4324fb42783ead3 100644
--- a/config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184822_i_package_generic_deploy_token_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_generic_deploy_token_monthly
-description: A monthly count of generic packages published to the registry using a deploy token
+description: A monthly count of generic packages published to the registry using a
+  deploy token
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -14,7 +15,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_generic_deploy_token
+  - i_package_generic_deploy_token
 distribution:
 - ee
 - ce
@@ -22,3 +23,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml
index 61bc69c172ab0bae47cbe96fea915e3c20d9a581..1e3247a7109b72ec4dac50f6b2d2522108bc3dc8 100644
--- a/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184826_i_package_golang_deploy_token_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_golang_deploy_token_monthly
-description: A monthly count of Go modules published to the registry using a deploy token
+description: A monthly count of Go modules published to the registry using a deploy
+  token
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_golang_deploy_token
+  - i_package_golang_deploy_token
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184830_i_package_maven_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184830_i_package_maven_deploy_token_monthly.yml
index d231688f191733765e1e5885a3af244906167f0e..f113e099d9745cfdb19c158e539afc055b57be65 100644
--- a/config/metrics/counts_28d/20210216184830_i_package_maven_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184830_i_package_maven_deploy_token_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_maven_deploy_token_monthly
-description: A monthly count of Maven packages published to the registry using a deploy token
+description: A monthly count of Maven packages published to the registry using a deploy
+  token
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_maven_deploy_token
+  - i_package_maven_deploy_token
 distribution:
 - ee
 - ce
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184834_i_package_npm_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184834_i_package_npm_deploy_token_monthly.yml
index df745333d7194122bfe2d97c489bf7bbd917c3b5..25f4f42b7066c1ce2f0ef680180ac6b3affb7823 100644
--- a/config/metrics/counts_28d/20210216184834_i_package_npm_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184834_i_package_npm_deploy_token_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_npm_deploy_token_monthly
-description: A monthly count of npm packages published to the registry using a deploy token
+description: A monthly count of npm packages published to the registry using a deploy
+  token
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_npm_deploy_token
+  - i_package_npm_deploy_token
 distribution:
 - ee
 - ce
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184838_i_package_nuget_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184838_i_package_nuget_deploy_token_monthly.yml
index 063530e82acf88370e07ea1ceb3d1242e2a56df0..cd8a418506fb443365b9def3b5832afa9b166416 100644
--- a/config/metrics/counts_28d/20210216184838_i_package_nuget_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184838_i_package_nuget_deploy_token_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_nuget_deploy_token_monthly
-description: A monthly count of NuGet packages published to the registry using a deploy token
+description: A monthly count of NuGet packages published to the registry using a deploy
+  token
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_nuget_deploy_token
+  - i_package_nuget_deploy_token
 distribution:
 - ee
 - ce
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184842_i_package_pypi_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184842_i_package_pypi_deploy_token_monthly.yml
index 256689b29a8fcd9737b207fd0412a3d3d05e6ffd..51a7de1277d6de1650980bb04423d059a5e15eea 100644
--- a/config/metrics/counts_28d/20210216184842_i_package_pypi_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184842_i_package_pypi_deploy_token_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_pypi_deploy_token_monthly
-description: A monthly count of PyPI packages published to the registry using a deploy token
+description: A monthly count of PyPI packages published to the registry using a deploy
+  token
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_pypi_deploy_token
+  - i_package_pypi_deploy_token
 distribution:
 - ee
 - ce
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml b/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml
index 52be708f79460aa1261f5642f28cd14d91134dfa..d465a6aff4b4b0200cbb647359b2c27e55772ba3 100644
--- a/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml
+++ b/config/metrics/counts_28d/20210216184846_i_package_tag_deploy_token_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_tag_deploy_token_monthly
-description: A monthly count of package tags published to the registry using a deploy token
+description: A monthly count of package tags published to the registry using a deploy
+  token
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_tag_deploy_token
+  - i_package_tag_deploy_token
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml
index 5452e4399d558a5e634f22822b99d2aba5464cf1..c1b9ad3b64bd1320ebe88b391665de65a682d152 100644
--- a/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184850_deploy_token_packages_total_unique_counts_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.deploy_token_packages_total_unique_counts_monthly
-description: A monthly count of packages published to the registry using a deploy token
+description: A monthly count of packages published to the registry using a deploy
+  token
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -13,20 +14,20 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_composer_deploy_token
-    - i_package_conan_deploy_token
-    - i_package_container_deploy_token
-    - i_package_debian_deploy_token
-    - i_package_generic_deploy_token
-    - i_package_golang_deploy_token
-    - i_package_helm_deploy_token
-    - i_package_maven_deploy_token
-    - i_package_npm_deploy_token
-    - i_package_nuget_deploy_token
-    - i_package_pypi_deploy_token
-    - i_package_rubygems_deploy_token
-    - i_package_tag_deploy_token
-    - i_package_terraform_module_deploy_token
+  - i_package_composer_deploy_token
+  - i_package_conan_deploy_token
+  - i_package_container_deploy_token
+  - i_package_debian_deploy_token
+  - i_package_generic_deploy_token
+  - i_package_golang_deploy_token
+  - i_package_helm_deploy_token
+  - i_package_maven_deploy_token
+  - i_package_npm_deploy_token
+  - i_package_nuget_deploy_token
+  - i_package_pypi_deploy_token
+  - i_package_rubygems_deploy_token
+  - i_package_tag_deploy_token
+  - i_package_terraform_module_deploy_token
 distribution:
 - ee
 - ce
@@ -35,3 +36,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml b/config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml
index 4d0c59d2568ebffa6f8682917757e13a7711ead6..0fcc456c85327d034f08f2124574b75ded0a1e72 100644
--- a/config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184854_i_package_composer_user_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_composer_user_monthly
-description: A monthly count of users that have published a Composer package to the registry
+description: A monthly count of users that have published a Composer package to the
+  registry
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_composer_user
+  - i_package_composer_user
 distribution:
 - ee
 - ce
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml b/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml
index 83adab11d091aa3bed2eab4b22a4bef9108bf0d9..e327c81af552120eca077b78ffa746cfc73959a9 100644
--- a/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184858_i_package_conan_user_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_conan_user
+  - i_package_conan_user
 distribution:
 - ee
 - ce
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml b/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml
index a0072e6531498ff96b7cbdbfc3530c65ea5dab35..50df5df1b2583b8dcb1a2bb387bb999ef4adf141 100644
--- a/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184902_i_package_container_user_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_container_user_monthly
-description: A monthly count of users that have published a container image to the registry
+description: A monthly count of users that have published a container image to the
+  registry
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_container_user
+  - i_package_container_user
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml b/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml
index 22e7a1f432ae1a36a7c1e3c557b526ca95b2dc2a..cb716aae070324595556f7164ce3ade7aab654a9 100644
--- a/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184906_i_package_debian_user_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_debian_user_monthly
-description: A monthly count of users that have published a Debian package to the registry
+description: A monthly count of users that have published a Debian package to the
+  registry
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_debian_user
+  - i_package_debian_user
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml b/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml
index 7072e6542b8a40c3384cf2b53f0eab7a27b01490..f028719bfe1158434d2c7dac7755d732c3faa41e 100644
--- a/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184910_i_package_generic_user_monthly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_generic_user_monthly
-description: A monthly count of users that have published a generic package to the registry
+description: A monthly count of users that have published a generic package to the
+  registry
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -14,7 +15,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_generic_user
+  - i_package_generic_user
 distribution:
 - ee
 - ce
@@ -22,3 +23,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml b/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml
index 7303436fe3fcab4bc42ba9803a0836f0b448d7a7..c1fcfd38e63d2d7eeda80a2fe0a188f3cf3aeb2d 100644
--- a/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184913_i_package_golang_user_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_golang_user
+  - i_package_golang_user
 distribution:
 - ee
 - ce
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml b/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml
index c4f13984dc9e9827d9ee9d641340814e1c8b2c50..d24e48428af0d9a613310ff1b22d873e6e843036 100644
--- a/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184917_i_package_maven_user_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_maven_user
+  - i_package_maven_user
 distribution:
 - ee
 - ce
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml b/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml
index 637de10004e6134f2a992959a66964e8e6b67bb5..4ad5a3d45c50f6bfc2fb496c82b04af26ab11fbc 100644
--- a/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184921_i_package_npm_user_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_npm_user
+  - i_package_npm_user
 distribution:
 - ee
 - ce
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml b/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml
index 5a2f03a7b31e7be060f135f4855120ea503ed32c..dcfdccce7fe5d36fdc7b3ad4fcb56337ee4df20f 100644
--- a/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184925_i_package_nuget_user_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_nuget_user
+  - i_package_nuget_user
 distribution:
 - ee
 - ce
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml b/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml
index fefa5363e25ac6186826c8dfbda020ce9334eaa2..c09f51d3e19e18a01872b12d381d02561eb13e9a 100644
--- a/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184929_i_package_pypi_user_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_pypi_user
+  - i_package_pypi_user
 distribution:
 - ee
 - ce
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml b/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml
index 9c339dae78eedf4842453c83aa8a79ff383c62ed..f8d411c03481343cf5f9c58058058fbf02028eef 100644
--- a/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml
+++ b/config/metrics/counts_28d/20210216184933_i_package_tag_user_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_tag_user
+  - i_package_tag_user
 distribution:
 - ee
 - ce
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml
index 59d588c543f26c5719bd64215aae99ae1f66e586..c96e1d2f5dcc6a08f8a7e6f34074104aae20622d 100644
--- a/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184937_user_packages_total_unique_counts_monthly.yml
@@ -13,20 +13,20 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_composer_user
-    - i_package_conan_user
-    - i_package_container_user
-    - i_package_debian_user
-    - i_package_generic_user
-    - i_package_golang_user
-    - i_package_helm_user
-    - i_package_maven_user
-    - i_package_npm_user
-    - i_package_nuget_user
-    - i_package_pypi_user
-    - i_package_rubygems_user
-    - i_package_tag_user
-    - i_package_terraform_module_user
+  - i_package_composer_user
+  - i_package_conan_user
+  - i_package_container_user
+  - i_package_debian_user
+  - i_package_generic_user
+  - i_package_golang_user
+  - i_package_helm_user
+  - i_package_maven_user
+  - i_package_npm_user
+  - i_package_nuget_user
+  - i_package_pypi_user
+  - i_package_rubygems_user
+  - i_package_tag_user
+  - i_package_terraform_module_user
 distribution:
 - ee
 - ce
@@ -37,3 +37,4 @@ tier:
 performance_indicator_type:
 - smau
 - gmau
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml b/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml
index 070a2cd71c3b9838524d925348f6adcfd433db7a..9aa85bc0f28509ae7749e4ca5869ddc511741b68 100644
--- a/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml
+++ b/config/metrics/counts_28d/20210216184941_i_ecosystem_jira_service_close_issue_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_ecosystem_jira_service_close_issue
+  - i_ecosystem_jira_service_close_issue
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml b/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml
index dd977ce2f4d48aa304e3f3547bd4c55a4a8ceca6..48a85607a05fe39a2206c61d8ce4993509f66e74 100644
--- a/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml
+++ b/config/metrics/counts_28d/20210216184945_i_ecosystem_jira_service_cross_reference_monthly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_ecosystem_jira_service_cross_reference
+  - i_ecosystem_jira_service_cross_reference
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml b/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
index b36761e255d3c61a1e29ed1fb7b28b550f10aa35..7a024872b25bcf0f5310a5f335af845b60a979a9 100644
--- a/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
+++ b/config/metrics/counts_28d/20210216184957_ecosystem_total_unique_counts_monthly.yml
@@ -13,19 +13,19 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_ecosystem_jira_service_close_issue
-    - i_ecosystem_jira_service_cross_reference
-    - i_ecosystem_jira_service_list_issues
-    - i_ecosystem_jira_service_create_issue
-    - i_ecosystem_slack_service_issue_notification
-    - i_ecosystem_slack_service_push_notification
-    - i_ecosystem_slack_service_deployment_notification
-    - i_ecosystem_slack_service_wiki_page_notification
-    - i_ecosystem_slack_service_merge_request_notification
-    - i_ecosystem_slack_service_note_notification
-    - i_ecosystem_slack_service_tag_push_notification
-    - i_ecosystem_slack_service_confidential_note_notification
-    - i_ecosystem_slack_service_confidential_issue_notification
+  - i_ecosystem_jira_service_close_issue
+  - i_ecosystem_jira_service_cross_reference
+  - i_ecosystem_jira_service_list_issues
+  - i_ecosystem_jira_service_create_issue
+  - i_ecosystem_slack_service_issue_notification
+  - i_ecosystem_slack_service_push_notification
+  - i_ecosystem_slack_service_deployment_notification
+  - i_ecosystem_slack_service_wiki_page_notification
+  - i_ecosystem_slack_service_merge_request_notification
+  - i_ecosystem_slack_service_note_notification
+  - i_ecosystem_slack_service_tag_push_notification
+  - i_ecosystem_slack_service_confidential_note_notification
+  - i_ecosystem_slack_service_confidential_issue_notification
 distribution:
 - ce
 - ee
@@ -37,3 +37,4 @@ performance_indicator_type:
 - gmau
 - paid_gmau
 - smau
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml b/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml
index fbce567f299034446f071a763d32b7127761ff0d..7c7cffaaf4abc792e9b93264484e7466c2b9ecf1 100644
--- a/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml
+++ b/config/metrics/counts_7d/20210216175010_i_analytics_instance_statistics_weekly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /admin/usage_trends by week
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_analytics_instance_statistics
+  - i_analytics_instance_statistics
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
index d35ea4076d783213b65516ebc16d52e202436534..ca278d7a030f1e02f1db1224e0bfae923bc9ed0e 100644
--- a/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216175014_analytics_total_unique_counts_weekly.yml
@@ -5,7 +5,7 @@ description: The number of unique users who visited any analytics feature by wee
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,25 +13,26 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - users_viewing_analytics_group_devops_adoption
-    - i_analytics_dev_ops_adoption
-    - i_analytics_dev_ops_score
-    - p_analytics_merge_request
-    - i_analytics_instance_statistics
-    - g_analytics_contribution
-    - g_analytics_insights
-    - g_analytics_issues
-    - g_analytics_productivity
-    - g_analytics_valuestream
-    - p_analytics_pipelines
-    - p_analytics_code_reviews
-    - p_analytics_valuestream
-    - p_analytics_insights
-    - p_analytics_issues
-    - p_analytics_repo
-    - i_analytics_cohorts
+  - users_viewing_analytics_group_devops_adoption
+  - i_analytics_dev_ops_adoption
+  - i_analytics_dev_ops_score
+  - p_analytics_merge_request
+  - i_analytics_instance_statistics
+  - g_analytics_contribution
+  - g_analytics_insights
+  - g_analytics_issues
+  - g_analytics_productivity
+  - g_analytics_valuestream
+  - p_analytics_pipelines
+  - p_analytics_code_reviews
+  - p_analytics_valuestream
+  - p_analytics_insights
+  - p_analytics_issues
+  - p_analytics_repo
+  - i_analytics_cohorts
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml b/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml
index 004b24b0d0e0a29c34901ff0fef4e5a9a3973307..1647550a1005067961703b1604685d955c73ae6b 100644
--- a/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216175111_merge_request_action_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml b/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml
index e712a02c27d18e01410b7afbc14f795f361fe031..c4be5fac401ba09ca52c4c8503c21e97293057f2 100644
--- a/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml
+++ b/config/metrics/counts_7d/20210216175114_i_source_code_code_intelligence_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml b/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml
index 7c27eff7b7595e0974666cd5ef77180efb2853fb..ed72cf704786a9a741f5624cb72783d91ab3eb0c 100644
--- a/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml
+++ b/config/metrics/counts_7d/20210216175118_i_code_review_mr_diffs_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_mr_diffs
+  - i_code_review_mr_diffs
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml b/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml
index 8430bb9c1adef6419e0025a3843f0ec9d0a5cf39..a9549fbeadd1b9a40926c9507357487a9d4e94cd 100644
--- a/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml
+++ b/config/metrics/counts_7d/20210216175122_i_code_review_user_single_file_diffs_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_single_file_diffs
+  - i_code_review_user_single_file_diffs
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml b/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml
index c6d312cac70dab0088e8311d35187fa5de2dfa34..ae3b66c096272811dbe8ebb2500777d78399141f 100644
--- a/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml
+++ b/config/metrics/counts_7d/20210216175126_i_code_review_mr_single_file_diffs_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_mr_single_file_diffs
+  - i_code_review_mr_single_file_diffs
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml b/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml
index 92a7035b685e748cd9e0bd113bb1a801d9557b5e..ac6039cd971b65b608c966d801149e88e4a96ba2 100644
--- a/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216175130_i_code_review_user_create_mr_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_create_mr
+  - i_code_review_user_create_mr
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml b/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml
index c336a950746f3f6b69b7479879c96457cbade688..5245cd4995085659dc5d727c0ca1111d86b76c9a 100644
--- a/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216175134_i_code_review_user_close_mr_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_close_mr
+  - i_code_review_user_close_mr
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml b/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml
index c4e59d2dcdbe97727f05dc19c4933c170a4f579e..984385a2b9a2f66eb3210d1702515e4d3ab74834 100644
--- a/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216175138_i_code_review_user_reopen_mr_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_reopen_mr
+  - i_code_review_user_reopen_mr
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml b/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml
index 635681cc47c2c7b951667aa0f431adaabd20b9c6..f47a9c490bff0f9c058eb850269f496863772c16 100644
--- a/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216175142_i_code_review_user_merge_mr_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_merge_mr
+  - i_code_review_user_merge_mr
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml
index 064367405c8b5dfe7d907eb917300fa83b36ca0a..96b77fd1b8be84d549f1f5459081454ee20d7db0 100644
--- a/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216175146_i_code_review_user_create_mr_comment_weekly.yml
@@ -13,11 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_create_mr_comment
-instrumentation_class: RedisHLLMetric
-options:
-  events:
-    - i_code_review_user_create_mr
+  - i_code_review_user_create_mr
 distribution:
 - ce
 - ee
@@ -26,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml
index 783c456c379f9be8ce043701cacf533cfcbcf4f0..b07f7072363f81911712f287101cf5ed93b25a75 100644
--- a/config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216175150_i_code_review_user_edit_mr_comment_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_edit_mr_comment
+  - i_code_review_user_edit_mr_comment
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml
index 8e0dc5b31a60a16aff07e342689da8595b811d72..2d43720e07e71685a2a0d218101d3589701ec196 100644
--- a/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216175154_i_code_review_user_remove_mr_comment_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_remove_mr_comment
+  - i_code_review_user_remove_mr_comment
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175158_i_code_review_user_add_suggestion_weekly.yml b/config/metrics/counts_7d/20210216175158_i_code_review_user_add_suggestion_weekly.yml
index 57fd33f2e2219aa3d4222001677b02289b30cc36..206a17e1444e3abf709da14c6b3c00125d1546b4 100644
--- a/config/metrics/counts_7d/20210216175158_i_code_review_user_add_suggestion_weekly.yml
+++ b/config/metrics/counts_7d/20210216175158_i_code_review_user_add_suggestion_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_add_suggestion
+  - i_code_review_user_add_suggestion
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216175201_i_code_review_user_apply_suggestion_weekly.yml b/config/metrics/counts_7d/20210216175201_i_code_review_user_apply_suggestion_weekly.yml
index 4e34212e9cbe201fbf23429f3ac688cf9981dceb..0769a04074103b7cd0b3a0c220971d11992917eb 100644
--- a/config/metrics/counts_7d/20210216175201_i_code_review_user_apply_suggestion_weekly.yml
+++ b/config/metrics/counts_7d/20210216175201_i_code_review_user_apply_suggestion_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_apply_suggestion
+  - i_code_review_user_apply_suggestion
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml b/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
index 90840faf43d2482da56247f91c68982992b8df60..abeb4443096b2c070513ab5ec500df08e1baea0b 100644
--- a/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
+++ b/config/metrics/counts_7d/20210216180328_g_edit_by_web_ide_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml b/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
index 0e7720ee8b31aee577b699545de9a6e2e0aa06df..fa18652e01eff574d88a4951f46d30ce8e418b95 100644
--- a/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
+++ b/config/metrics/counts_7d/20210216180332_g_edit_by_sfe_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml b/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
index 3bd141fbfcc0dd0aecce6f14d7f4a0a6ab238833..b3e2a500d1ff2b50133c4a23721fcb8fbfff37ef 100644
--- a/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
+++ b/config/metrics/counts_7d/20210216180336_g_edit_by_snippet_ide_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
index 6b5b8d8914e4d0a685c4acb98a31203adf33d46f..9e4c633950ab88f3101cfd35d0c356d3d70678df 100644
--- a/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216180339_ide_edit_total_unique_counts_weekly.yml
@@ -25,3 +25,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml b/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml
index e7146cf81580ea75552a754cc3caa4ce2db4b2e9..ae8011b12852f82da3378a9b64e5696ced4c773a 100644
--- a/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml
+++ b/config/metrics/counts_7d/20210216180422_i_search_total_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml
index c27b8be56ee6c1e8771c71eacaf3a581f2412901..c34da9c09d620f9b1cd0ed1b87d2091ade35132f 100644
--- a/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216180429_search_total_unique_counts_weekly.yml
@@ -24,3 +24,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml b/config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml
index 628956629fc1a55038758a7133f7e863b0252e97..aedf400c95c5ddcee0fbce9440231a6622042603 100644
--- a/config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml
+++ b/config/metrics/counts_7d/20210216180513_incident_management_alerts_total_unique_counts.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml b/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml
index bfdc0410d2b55117523e11594bc30a61b1932d77..612d5636529296d6bc83774f14dbf8330707743d 100644
--- a/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml
+++ b/config/metrics/counts_7d/20210216180515_incident_management_incidents_total_unique_counts.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180528_incident_management_alert_status_changed_weekly.yml b/config/metrics/counts_7d/20210216180528_incident_management_alert_status_changed_weekly.yml
index 903a1da1f1f67ed9f03192f534a3c7c618fe44ea..791cf955e625b473bd71140081edf204f8fc91ed 100644
--- a/config/metrics/counts_7d/20210216180528_incident_management_alert_status_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216180528_incident_management_alert_status_changed_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users changing alert's status per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180532_incident_management_alert_assigned_weekly.yml b/config/metrics/counts_7d/20210216180532_incident_management_alert_assigned_weekly.yml
index 98546cb7a8414103116e70be70f075c775789816..56cdf24222291f57944ae47207ab9e26ceb2a904 100644
--- a/config/metrics/counts_7d/20210216180532_incident_management_alert_assigned_weekly.yml
+++ b/config/metrics/counts_7d/20210216180532_incident_management_alert_assigned_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users assigning an alert per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180535_incident_management_alert_todo_weekly.yml b/config/metrics/counts_7d/20210216180535_incident_management_alert_todo_weekly.yml
index 25c54267179ff7e3bddc28383bd992e5815d8fd9..831e40774dfc9ff8fcba62ebf7cb650f63815c47 100644
--- a/config/metrics/counts_7d/20210216180535_incident_management_alert_todo_weekly.yml
+++ b/config/metrics/counts_7d/20210216180535_incident_management_alert_todo_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users adding alerts to the TODO list per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180539_incident_management_incident_created_weekly.yml b/config/metrics/counts_7d/20210216180539_incident_management_incident_created_weekly.yml
index 79abe8e945951809dbcd445f0b54bd54bdc30db5..5e188ec02398339dac4258ab7a4c8e22c567b269 100644
--- a/config/metrics/counts_7d/20210216180539_incident_management_incident_created_weekly.yml
+++ b/config/metrics/counts_7d/20210216180539_incident_management_incident_created_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users creating incidents  per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180543_incident_management_incident_reopened_weekly.yml b/config/metrics/counts_7d/20210216180543_incident_management_incident_reopened_weekly.yml
index 718faa29b4af12f53694dbd4b7631ec2c2cea913..c9722dc0061b0e2b4e7f1473c10bbef7dd3422f9 100644
--- a/config/metrics/counts_7d/20210216180543_incident_management_incident_reopened_weekly.yml
+++ b/config/metrics/counts_7d/20210216180543_incident_management_incident_reopened_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users reopening incidents per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180546_incident_management_incident_closed_weekly.yml b/config/metrics/counts_7d/20210216180546_incident_management_incident_closed_weekly.yml
index e04baa14a93e985e673dbe7590d8f9955ef37546..51bfdf4a582eb11dbc383ce3639058832cd731e2 100644
--- a/config/metrics/counts_7d/20210216180546_incident_management_incident_closed_weekly.yml
+++ b/config/metrics/counts_7d/20210216180546_incident_management_incident_closed_weekly.yml
@@ -5,7 +5,7 @@ description: Count of users closing incidents per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180550_incident_management_incident_assigned_weekly.yml b/config/metrics/counts_7d/20210216180550_incident_management_incident_assigned_weekly.yml
index 479190529378786b49f762aefa60917125d7378f..046537ccbbd0ed67b15b18cc821a31164e35ba4f 100644
--- a/config/metrics/counts_7d/20210216180550_incident_management_incident_assigned_weekly.yml
+++ b/config/metrics/counts_7d/20210216180550_incident_management_incident_assigned_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users assiging incidents per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180554_incident_management_incident_todo_weekly.yml b/config/metrics/counts_7d/20210216180554_incident_management_incident_todo_weekly.yml
index 6bb7e389b864b6e86a509c0a52f9989b9c65972a..9cd0d7a589c355e9f3deb690e714266c58a68ebd 100644
--- a/config/metrics/counts_7d/20210216180554_incident_management_incident_todo_weekly.yml
+++ b/config/metrics/counts_7d/20210216180554_incident_management_incident_todo_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users adding incidents to the TODO list per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180558_incident_management_incident_comment_weekly.yml b/config/metrics/counts_7d/20210216180558_incident_management_incident_comment_weekly.yml
index cfc02a494fd329719583f1e88a04d5add3ac1c06..50879658e0959b675064f9c5445269652159c91e 100644
--- a/config/metrics/counts_7d/20210216180558_incident_management_incident_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216180558_incident_management_incident_comment_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users adding comments on incidents per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180601_incident_management_incident_zoom_meeting_weekly.yml b/config/metrics/counts_7d/20210216180601_incident_management_incident_zoom_meeting_weekly.yml
index 9e3f16ea2dbce1e800406aa3bab53decec587f76..777c1e9ff5a904bc61a4032e1702c194184601f2 100644
--- a/config/metrics/counts_7d/20210216180601_incident_management_incident_zoom_meeting_weekly.yml
+++ b/config/metrics/counts_7d/20210216180601_incident_management_incident_zoom_meeting_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users creating Zoom meetings about incidents per we
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180609_incident_management_incident_relate_weekly.yml b/config/metrics/counts_7d/20210216180609_incident_management_incident_relate_weekly.yml
index 8b4e93fe938432597eaeffc2da9a92215a0a2de2..fb74b260b9171a1fed876775235d6c9cbfa2602c 100644
--- a/config/metrics/counts_7d/20210216180609_incident_management_incident_relate_weekly.yml
+++ b/config/metrics/counts_7d/20210216180609_incident_management_incident_relate_weekly.yml
@@ -1,11 +1,12 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_incident_relate_weekly
-description: Count of unique users adding issues per that are related to an incident week
+description: Count of unique users adding issues per that are related to an incident
+  week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180612_incident_management_incident_unrelate_weekly.yml b/config/metrics/counts_7d/20210216180612_incident_management_incident_unrelate_weekly.yml
index dab3f0a561114b5be072f5523e80761ab74babfd..2550a0ac39c77a89cf9a6d5cc6c9fc2cf581b59e 100644
--- a/config/metrics/counts_7d/20210216180612_incident_management_incident_unrelate_weekly.yml
+++ b/config/metrics/counts_7d/20210216180612_incident_management_incident_unrelate_weekly.yml
@@ -1,11 +1,12 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.incident_management.incident_management_incident_unrelate_weekly
-description: Count of unique users removing issue that are related to an incident per week
+description: Count of unique users removing issue that are related to an incident
+  per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180616_incident_management_incident_change_confidential_weekly.yml b/config/metrics/counts_7d/20210216180616_incident_management_incident_change_confidential_weekly.yml
index 5ef90c0269a06c0091ff245f31fbff2097f71621..46450fbb24fe816be1b5dedf8c957358f20e0fa5 100644
--- a/config/metrics/counts_7d/20210216180616_incident_management_incident_change_confidential_weekly.yml
+++ b/config/metrics/counts_7d/20210216180616_incident_management_incident_change_confidential_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users changing incidents to confidential per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml
index f8b657e27b7d41e124ebe245dec30e957756a0e3..7699dc412a8ff46d3f3bfd93adbc72a0734e35c2 100644
--- a/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216180620_incident_management_total_unique_counts_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users performing events related to the incident man
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -35,3 +35,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216180623_incident_management_alert_create_incident_weekly.yml b/config/metrics/counts_7d/20210216180623_incident_management_alert_create_incident_weekly.yml
index fc6dbd18b32e61af1aa97e68091611a0be89d9b6..97c755b084d41ea3ee167f716ca0e49680e86cd9 100644
--- a/config/metrics/counts_7d/20210216180623_incident_management_alert_create_incident_weekly.yml
+++ b/config/metrics/counts_7d/20210216180623_incident_management_alert_create_incident_weekly.yml
@@ -23,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml b/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
index 67721c0f0818ed4e85eb19386ff932c9c6710bd9..7792296ede1acd05a5cd7974078c3ef8121d2fd1 100644
--- a/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181306_g_project_management_issue_description_changed_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml b/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
index 3b24f3d43ee508cf607ccaf1037102cefa09c506..9b7b0aff5aaafac780b3c711580878bb1f1574ad 100644
--- a/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181310_g_project_management_issue_assignee_changed_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml b/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
index a1d3ebb27709b276c617f163d6780ea60a92c865..9546d229dc51a03bace93b696ece698bd157910a 100644
--- a/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
+++ b/config/metrics/counts_7d/20210216181313_g_project_management_issue_made_confidential_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml b/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
index eda1f51f2a164d8ce6346fed0192f0bc79970368..cca084385eb53739807ef60d6fc384ff7b74ed66 100644
--- a/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
+++ b/config/metrics/counts_7d/20210216181317_g_project_management_issue_made_visible_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml b/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
index 8c4037fd1db286133e8f6dc732c1989e77ce30d2..314f68e1ffd6e3e0614f31e0ce7868550022ce36 100644
--- a/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
+++ b/config/metrics/counts_7d/20210216181321_g_project_management_issue_created_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml b/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
index 41dca2aac8dba4a3a2d318df8fff68ccfb5d61d2..9a213878ac42422cf9d00cb31a409d4e6c66a201 100644
--- a/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181324_g_project_management_issue_closed_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml b/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
index 5ceedd15a2faa6ccc3ff37587fd34347920e2ddd..82bade1fedb3ee1c4a6f9f2156d622e9aa0d51b7 100644
--- a/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
+++ b/config/metrics/counts_7d/20210216181328_g_project_management_issue_reopened_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml b/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
index 8df9757fc1edc7f806848246dd5a58fb9128d852..507bbe001fb0b59e4a58c27322d21be3ef1f0d34 100644
--- a/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181332_g_project_management_issue_label_changed_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml b/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
index 6ce7c5fa822cf233bed9f2613511ffc4764f54a7..eeedf266af4469f11766c546725941be8395ba81 100644
--- a/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181336_g_project_management_issue_milestone_changed_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml b/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
index 0cd55b58aa0fc6529405c331c1424bf430a12e8d..eaf3330514c6b447d3d90a3b25245f722e28e0f6 100644
--- a/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
+++ b/config/metrics/counts_7d/20210216181347_g_project_management_issue_cross_referenced_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml b/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
index 5ce80d42f335d5b4eeebf14627beb68c92a5053f..67e067e743d343a63278be48f368244e5f8e1b02 100644
--- a/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
+++ b/config/metrics/counts_7d/20210216181350_g_project_management_issue_moved_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml b/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
index 7291567e17f93c57d019925f6cacfde3279679fe..2f35258190561a91d1f632cdc4540cb260494cfe 100644
--- a/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
+++ b/config/metrics/counts_7d/20210216181354_g_project_management_issue_related_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml b/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
index b7abc40eb9f427e9793870c5da8adb3beb2c9de1..fa3532ffffc08f303f64e677db2d0e30b67e81b0 100644
--- a/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
+++ b/config/metrics/counts_7d/20210216181358_g_project_management_issue_unrelated_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml b/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
index c661beb585fd347cb94dd134e9a12c3dfa92b59a..ee5b10f73da346397a42e74dc63b283f50580d04 100644
--- a/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181401_g_project_management_issue_marked_as_duplicate_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml b/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
index 99cfc654a6372daff023b7f25460a787e637d666..a2a7fa469d8aa2e79c7d2b4d4d11981471586ce3 100644
--- a/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
+++ b/config/metrics/counts_7d/20210216181405_g_project_management_issue_locked_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml b/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
index 17754a930fb2d6cc4f995da375c87095265ee337..da6c077355c5e62827b34a685eae2062406dc2ea 100644
--- a/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
+++ b/config/metrics/counts_7d/20210216181409_g_project_management_issue_unlocked_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml b/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
index 2bc0b0014820d1a0777c496f5494748c136440dc..f1e65fca1f347ea37a50b9681c11167904a30c17 100644
--- a/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
+++ b/config/metrics/counts_7d/20210216181422_g_project_management_issue_designs_added_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml b/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
index 162e8e91c7bcdf8c9c8fb8dcff06f5b54fa77b31..80de76e2ef41588d6b79541c2b73b70536867ff9 100644
--- a/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
+++ b/config/metrics/counts_7d/20210216181425_g_project_management_issue_designs_modified_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml b/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
index 829f76100019cb1a20b5b1675b5baa2b5172ab0e..b52d274706000548921cd72b4adbecd3cdf2a1ba 100644
--- a/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181429_g_project_management_issue_designs_removed_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml b/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
index b5fa673f35a27f753b24eefb4de9cb825ed74bbc..126b74499e41179a5122ff6d88404bd820fc8d34 100644
--- a/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181433_g_project_management_issue_due_date_changed_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml b/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
index e855dec21e88e19ba2298ab3dfe84d42144468ee..f0559566c4d3df23e82049078f03c6b16e1edce8 100644
--- a/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181437_g_project_management_issue_time_estimate_changed_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml b/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
index e7d071731db25145d0eacac644aa2176fed1c9b8..ad6316b484e0e97fa9f295c8ea1c4777529de77e 100644
--- a/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181440_g_project_management_issue_time_spent_changed_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml b/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
index 76d6004087911e9b82c476be6b2eec5e20a1c6ba..53213c0aee0567a36dc335233d886e6efd632b3e 100644
--- a/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
+++ b/config/metrics/counts_7d/20210216181444_g_project_management_issue_comment_added_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml b/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
index d0c8fd5c863189a6c7a56338e565da9d05475dcf..7e53b2658df3a1ac35e63f92fea3a7a15bc898fa 100644
--- a/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
+++ b/config/metrics/counts_7d/20210216181448_g_project_management_issue_comment_edited_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml b/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
index 8dace3f5ed45351ebd2d729131db5f60d373b45c..996ed40d47433de9fc928b0609e6816e43dcd5a1 100644
--- a/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
+++ b/config/metrics/counts_7d/20210216181451_g_project_management_issue_comment_removed_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml b/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
index 3a5a3b6c3b634f92eafcf557eabd985bcd6a33d3..bf95aab5c2270f8c2bd1289032f47bb7c50b3f21 100644
--- a/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
+++ b/config/metrics/counts_7d/20210216181459_g_project_management_issue_cloned_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
index 6e016fabbba7aae92547f0b7271653370baef84b..012e8cd7364570f2f605e526e1ab834c40d764c6 100644
--- a/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216181503_issues_edit_total_unique_counts_weekly.yml
@@ -54,3 +54,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml b/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
index 0ed6dc80f0b0cfd53d7cca23591dedc6c22b2fa2..1f915d188407a2e48fa312901ca0f787796e5e51 100644
--- a/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
+++ b/config/metrics/counts_7d/20210216181506_i_quickactions_approve_weekly.yml
@@ -13,11 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_approve
-instrumentation_class: RedisHLLMetric
-options:
-  events:
-    - i_quickactions_approve
+  - i_quickactions_approve
 distribution:
 - ce
 - ee
@@ -25,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml b/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml
index a7a3ec1ad95660d5c5e4340968945a38ee1b6213..ed1ac1fc5a01a267b25327cce50ea8995986fb5c 100644
--- a/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml
+++ b/config/metrics/counts_7d/20210216181510_i_quickactions_assign_single_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_assign_single_weekly
-description: Count of WAU using the `/assign @user1` quick action to assign a single individual to an issuable 
+description: Count of WAU using the `/assign @user1` quick action to assign a single
+  individual to an issuable
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -13,12 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_assign_single
+  - i_quickactions_assign_single
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml b/config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml
index a5115aff30f7bcc75d5e43eaace0596c206923de..e336ccd48456d1493760939c14a338e40d792e44 100644
--- a/config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml
+++ b/config/metrics/counts_7d/20210216181517_i_quickactions_assign_self_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_assign_self_weekly
-description: Count of WAU using the `/assign me` quick action to assign self to an issuable 
+description: Count of WAU using the `/assign me` quick action to assign self to an
+  issuable
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_assign_self
+  - i_quickactions_assign_self
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
-- ultimate
\ No newline at end of file
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181521_i_quickactions_assign_reviewer_weekly.yml b/config/metrics/counts_7d/20210216181521_i_quickactions_assign_reviewer_weekly.yml
index c38a8df55d848e78f85e51759126266d54e13a95..d17f01ba74d76b25af01ebc2ea2ddae40de68d3b 100644
--- a/config/metrics/counts_7d/20210216181521_i_quickactions_assign_reviewer_weekly.yml
+++ b/config/metrics/counts_7d/20210216181521_i_quickactions_assign_reviewer_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_assign_reviewer_weekly
-description: Count of WAU using the `/assign_reviewer` or `request_reviewer` quick action
+description: Count of WAU using the `/assign_reviewer` or `request_reviewer` quick
+  action
 product_section: dev
 product_stage: create
 product_group: group::code review
@@ -13,12 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_assign_reviewer
+  - i_quickactions_assign_reviewer
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml b/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml
index 38bf53b85c70930d84eff42ef09d9d41859f3f8e..bbf92d15732118aedaae34d86e0933ce6d0dbfd7 100644
--- a/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml
+++ b/config/metrics/counts_7d/20210216181525_i_quickactions_award_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_award_weekly
-description: Count of WAU using the `/award` quick action to set an award emoji on an issuable 
+description: Count of WAU using the `/award` quick action to set an award emoji on
+  an issuable
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -13,12 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_award
+  - i_quickactions_award
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml b/config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml
index 8f250a3f9d604099ce691e2478a515f9bf54f5dc..58cdfb3d26bfa2ea3b2e3544d556179eabf390b8 100644
--- a/config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml
+++ b/config/metrics/counts_7d/20210216181529_i_quickactions_board_move_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_board_move
+  - i_quickactions_board_move
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml b/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml
index 4c7e9a6564086c0e589b37c607e976a23d20b9b7..33017355699cd5dbe114043685a718bc7221c7bb 100644
--- a/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml
+++ b/config/metrics/counts_7d/20210216181540_i_quickactions_clone_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_clone
+  - i_quickactions_clone
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml b/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml
index 0abd261a955f0600c79006b94b3b89ca34f669a6..1a79c56d6e8d1ac26a629e12061e950a907602bd 100644
--- a/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml
+++ b/config/metrics/counts_7d/20210216181543_i_quickactions_close_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_close
+  - i_quickactions_close
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml b/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml
index 923c8acdb388562db0ebaf106c719c2ce0535afa..e45ac092719401bb10d318b7d0b17bf1124524ef 100644
--- a/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml
+++ b/config/metrics/counts_7d/20210216181547_i_quickactions_confidential_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_confidential_weekly
-description: Count of WAU using the `/confidential` quick action to set an issue as confidential
+description: Count of WAU using the `/confidential` quick action to set an issue as
+  confidential
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_confidential
+  - i_quickactions_confidential
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181551_i_quickactions_copy_metadata_merge_request_weekly.yml b/config/metrics/counts_7d/20210216181551_i_quickactions_copy_metadata_merge_request_weekly.yml
index 38ed29c54d0855b65947583efb134811036fe7e2..8ec03c43d6b7678fcd77a93b145c31ac2f7f0ef4 100644
--- a/config/metrics/counts_7d/20210216181551_i_quickactions_copy_metadata_merge_request_weekly.yml
+++ b/config/metrics/counts_7d/20210216181551_i_quickactions_copy_metadata_merge_request_weekly.yml
@@ -13,12 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_copy_metadata_merge_request
+  - i_quickactions_copy_metadata_merge_request
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml b/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml
index 2358d4409b93040da92e5079d9d38652fe8eb722..3e1767854c97e61fe4255242db481575ec953919 100644
--- a/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml
+++ b/config/metrics/counts_7d/20210216181554_i_quickactions_copy_metadata_issue_weekly.yml
@@ -5,7 +5,7 @@ description: Count of WAU using the `/copy_metadata` quick action on an issue
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_copy_metadata_issue
+  - i_quickactions_copy_metadata_issue
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml b/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml
index 35eecec2be21cf253a7f7862991f27eb83a2aeda..e030179038c0771c0ad677e5a59e0de8393f0cf6 100644
--- a/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml
+++ b/config/metrics/counts_7d/20210216181558_i_quickactions_create_merge_request_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_create_merge_request_weekly
-description: Count of WAU using the `/create_merge_request` quick action 
+description: Count of WAU using the `/create_merge_request` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,12 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_create_merge_request
+  - i_quickactions_create_merge_request
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml b/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml
index 575992ebb5642230b3e53e8edf10f2446ce08497..96ae0f4bdded1c52c2476d1952190fb0122f86ef 100644
--- a/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml
+++ b/config/metrics/counts_7d/20210216181602_i_quickactions_done_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_done
+  - i_quickactions_done
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml b/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml
index dff8845d13ea912420e5793b4962c02828401793..6a94f46055c43690fb0aea83581674ed4b07d4b6 100644
--- a/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml
+++ b/config/metrics/counts_7d/20210216181605_i_quickactions_draft_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_draft_weekly
 description: Count of WAU using the `/draft` quick action on a Merge Request
 product_section: dev
 product_stage: create
-product_group: group::source code 
+product_group: group::source code
 product_category: source_code_management
 value_type: number
 status: data_available
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_draft
+  - i_quickactions_draft
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml b/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml
index 269b20a85f48f42a19632c0fd8d808a41abd991a..ad8ecd954cb1d44140c2e3074b0c4c2ede829751 100644
--- a/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml
+++ b/config/metrics/counts_7d/20210216181609_i_quickactions_due_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_due_weekly
-description: Count of WAU using the `/due` quick action to change the due date on an issuable 
+description: Count of WAU using the `/due` quick action to change the due date on
+  an issuable
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -13,12 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_due
+  - i_quickactions_due
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml b/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml
index 0b4d121e7f12418e074537247f8bad76489f3e8e..b19f6c4e9c5d4edf3531a9819ad9fe3c32f8c601 100644
--- a/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181613_i_quickactions_duplicate_weekly.yml
@@ -1,11 +1,12 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_duplicate_weekly
-description: Count of WAU using the `/duplicate` quick action to mark an issue as a duplicate of another
+description: Count of WAU using the `/duplicate` quick action to mark an issue as
+  a duplicate of another
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_duplicate
+  - i_quickactions_duplicate
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml b/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml
index 7a48efa232fa1e622e5768c6e0a53e33708e5c83..c2b1deca9754dc14db12853760f9d9b1c3d7b1d7 100644
--- a/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181620_i_quickactions_estimate_weekly.yml
@@ -1,11 +1,12 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_estimate_weekly
-description: Count of WAU using the `/estimate` quick action to set a time estimate on an issue
+description: Count of WAU using the `/estimate` quick action to set a time estimate
+  on an issue
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: time_tracking 
+product_category: time_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_estimate
+  - i_quickactions_estimate
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
-- ultimate
\ No newline at end of file
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml b/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml
index 0106fe73fb722b9ff045da2fea598039e272a189..33928740ec4e9c5be9d037db9cffe4a9da2648c8 100644
--- a/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml
+++ b/config/metrics/counts_7d/20210216181628_i_quickactions_label_weekly.yml
@@ -5,7 +5,7 @@ description: Count of WAU using the `/label` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_label
+  - i_quickactions_label
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml b/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml
index 05baed740836486be6cab33e9d94c5d771627bb8..8413b19c2eca8fd6fc2a9c5979295598329c08a7 100644
--- a/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml
+++ b/config/metrics/counts_7d/20210216181631_i_quickactions_lock_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_lock_weekly
-description: Count of WAU using the `/lock` quick action 
+description: Count of WAU using the `/lock` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_lock
+  - i_quickactions_lock
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
-- ultimate
\ No newline at end of file
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml b/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml
index 4f71a2b34a210bf6e9e6f85cfd69bd7e7a4de88e..df13bddbd8e03d70329df0cc8a8e762616e98a2d 100644
--- a/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml
+++ b/config/metrics/counts_7d/20210216181635_i_quickactions_merge_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_merge_weekly
 description: Count of WAU using the `/merge` quick action
 product_section: dev
 product_stage: create
-product_group: group::source code 
+product_group: group::source code
 product_category: source_code_management
 value_type: number
 status: data_available
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_merge
+  - i_quickactions_merge
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml b/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml
index 070b1a8fcead345e6bd228dd9e43cf814b46e937..0137107ab43d3359bb1cb625ab4f631f9ad6fbc6 100644
--- a/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml
+++ b/config/metrics/counts_7d/20210216181639_i_quickactions_milestone_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_milestone_weekly
-description: Count of WAU using the `/milestone` quick action 
-product_section: dev 
+description: Count of WAU using the `/milestone` quick action
+product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_milestone
+  - i_quickactions_milestone
 distribution:
 - ce
 - ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml b/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml
index 2523ac9d6bc860b9e6da9ff31f42f02e10a95473..810818ffc702f20c34d783f305bc1b8fbbd30a21 100644
--- a/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml
+++ b/config/metrics/counts_7d/20210216181642_i_quickactions_move_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_move
+  - i_quickactions_move
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml b/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml
index abc657df3c24e9356637e35c62ab2e2228332aae..a80048aed6219a1706817eb6952a01ebe6cafc0f 100644
--- a/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml
+++ b/config/metrics/counts_7d/20210216181657_i_quickactions_reassign_weekly.yml
@@ -5,7 +5,7 @@ description: Count of WAU using the `/reassign @user1` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_reassign
+  - i_quickactions_reassign
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181701_i_quickactions_reassign_reviewer_weekly.yml b/config/metrics/counts_7d/20210216181701_i_quickactions_reassign_reviewer_weekly.yml
index 951e97973cf17cdc981fd32046cfa8afb504ef5b..7e09271ddf3de5ae0ab46abfb70c4d4494a6fe58 100644
--- a/config/metrics/counts_7d/20210216181701_i_quickactions_reassign_reviewer_weekly.yml
+++ b/config/metrics/counts_7d/20210216181701_i_quickactions_reassign_reviewer_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_reassign_reviewer
+  - i_quickactions_reassign_reviewer
 distribution:
 - ce
 - ee
@@ -21,4 +21,4 @@ tier:
 - free
 - premium
 - ultimate
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml b/config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml
index d43e975f9000b5c63ef27837c7a254e8e34a71b0..bf596027a02da78b4472ffa3460bdbc1bf6a3c2f 100644
--- a/config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml
+++ b/config/metrics/counts_7d/20210216181705_i_quickactions_rebase_weekly.yml
@@ -3,8 +3,8 @@ data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_rebase_weekly
 description: Count of WAU using the `/rebase` quick action on a Merge Request
 product_section: dev
-product_stage: source_code 
-product_group: group::source code 
+product_stage: source_code
+product_group: group::source code
 product_category: source_code_management
 value_type: number
 status: data_available
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_rebase
+  - i_quickactions_rebase
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml b/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml
index cd0ef13cf14d08d83b3e3de229cbaadb1f8efd94..de85db7cb392e65533b41d7b93ba0b0d953e592a 100644
--- a/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml
+++ b/config/metrics/counts_7d/20210216181708_i_quickactions_relabel_weekly.yml
@@ -5,7 +5,7 @@ description: Count of WAU using the `/relabel` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_relabel
+  - i_quickactions_relabel
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml b/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml
index f6076e328a8c06d624c6a6c24f659f0685656f58..e80b23ea8debe334655c9fd987fb8f1485459e34 100644
--- a/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181712_i_quickactions_relate_weekly.yml
@@ -5,7 +5,7 @@ description: Count of WAU using the `/relate` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_relate
+  - i_quickactions_relate
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml b/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml
index 2111cb5f388f3f582745a25900bf62c2ccf3472c..59b7e03fa13375d2c716c292373ae7f0b2f838de 100644
--- a/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml
+++ b/config/metrics/counts_7d/20210216181719_i_quickactions_remove_due_date_weekly.yml
@@ -5,7 +5,7 @@ description: Count of WAU using the `/remove_due_date` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_remove_due_date
+  - i_quickactions_remove_due_date
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml b/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml
index 69035a5cd2f6bad5ae6153c35bd7418da95abe77..8d9f7b59755d4d62f8d037796817bf36b9845239 100644
--- a/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml
+++ b/config/metrics/counts_7d/20210216181727_i_quickactions_remove_estimate_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_estimate_weekly
-description: Count of WAU using the `/remove_estimate` quick action 
+description: Count of WAU using the `/remove_estimate` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: time_tracking 
+product_category: time_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_remove_estimate
+  - i_quickactions_remove_estimate
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
-- ultimate
\ No newline at end of file
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml b/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml
index 4dffc94c7824fbd283a06ec9472662ea9bf75cc3..5ffdd8b8975a4c019b35b2e98fd5db3b46e2c1f0 100644
--- a/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml
+++ b/config/metrics/counts_7d/20210216181734_i_quickactions_remove_milestone_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_milestone_weekly
-description: Count of WAU using the `/remove_milestone` quick action 
+description: Count of WAU using the `/remove_milestone` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,12 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_remove_milestone
+  - i_quickactions_remove_milestone
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml b/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml
index 83ade2edb86b692ddac89fd5051d07e524fa7e2c..d8212779775324327e8fedfae2e5d181e8f2e4be 100644
--- a/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml
+++ b/config/metrics/counts_7d/20210216181742_i_quickactions_remove_time_spent_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_remove_time_spent
+  - i_quickactions_remove_time_spent
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml b/config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml
index bd3beb71a6354fe53abbd0fd3ac9c1d61a257b0d..a2b3f2f86fa5ad15ee15132057d5c8282293e149 100644
--- a/config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml
+++ b/config/metrics/counts_7d/20210216181745_i_quickactions_remove_zoom_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_remove_zoom_weekly
-description: Count of WAU using the `/remove_zoom` quick action 
+description: Count of WAU using the `/remove_zoom` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_remove_zoom
+  - i_quickactions_remove_zoom
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
-- ultimate 
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml b/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml
index 4b861cf276773776f3510fd28db2796853e0b9ab..8c1d5bfa60086dea8ba8f04c69aeccda950a9d70 100644
--- a/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml
+++ b/config/metrics/counts_7d/20210216181749_i_quickactions_reopen_weekly.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_reopen_weekly
-description: Count of WAU using the `/reopen` quick action 
+description: Count of WAU using the `/reopen` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_reopen
+  - i_quickactions_reopen
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml b/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml
index b9f858890dac6a10e5efa9dff2b98b54ac6f33ec..c7883a9ea2e2edbc93ce3b509f80872429310d62 100644
--- a/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml
+++ b/config/metrics/counts_7d/20210216181753_i_quickactions_shrug_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_shrug_weekly
-description: Count of WAU using the `/shrug` quick action 
+description: Count of WAU using the `/shrug` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,12 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_shrug
+  - i_quickactions_shrug
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml b/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml
index 95ca954f425886c7ca50e08c72d15b199df8b98b..bff255cb0176264367203ed933f4268f17254f08 100644
--- a/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml
+++ b/config/metrics/counts_7d/20210216181756_i_quickactions_spend_subtract_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_spend_subtract_weekly
-description: Count of WAU using the `/spend` quick action to subtract time spent 
+description: Count of WAU using the `/spend` quick action to subtract time spent
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: time_tracking 
+product_category: time_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_spend_subtract
+  - i_quickactions_spend_subtract
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml b/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml
index 5b96c328208a713e6cfca4cc5327a27ddcc591d3..92f73c81547b5bd0cc0b1c84faf2b3882dfcccb7 100644
--- a/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml
+++ b/config/metrics/counts_7d/20210216181800_i_quickactions_spend_add_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_spend_add_weekly
-description: Count of WAU using the `/spend` quick action to add time spent 
+description: Count of WAU using the `/spend` quick action to add time spent
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,12 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_spend_add
+  - i_quickactions_spend_add
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181804_i_quickactions_submit_review_weekly.yml b/config/metrics/counts_7d/20210216181804_i_quickactions_submit_review_weekly.yml
index 61738f625060c5a1c476204f77a68ab495761d40..55f71f96d0062479eb57f60ca95bf863426ba4df 100644
--- a/config/metrics/counts_7d/20210216181804_i_quickactions_submit_review_weekly.yml
+++ b/config/metrics/counts_7d/20210216181804_i_quickactions_submit_review_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_submit_review
+  - i_quickactions_submit_review
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
-- ultimate 
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml b/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml
index 819b314862d7b4ec30083a585235a1efa5fdd828..4e9a79304aef8614f076d7408255cbafae470ad6 100644
--- a/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml
+++ b/config/metrics/counts_7d/20210216181808_i_quickactions_subscribe_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_subscribe_weekly
-description: Count of WAU using the `/subscribe` quick action 
+description: Count of WAU using the `/subscribe` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,12 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_subscribe
+  - i_quickactions_subscribe
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml b/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml
index 490dd5f3dce6e4834fb945a4f4995c79a1bc3925..ad11e7956b34f65780f84424352465ca15206be5 100644
--- a/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml
+++ b/config/metrics/counts_7d/20210216181811_i_quickactions_tableflip_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_tableflip_weekly
-description: Count of WAU using the `/tableflip` quick action 
+description: Count of WAU using the `/tableflip` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_tableflip
+  - i_quickactions_tableflip
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml b/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml
index 52ffe59604e71bd05da267232eb854bc15e7e842..4b5c11b0c72f3c568b501841587f612271ee7ae1 100644
--- a/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml
+++ b/config/metrics/counts_7d/20210216181815_i_quickactions_tag_weekly.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_tag_weekly
-description: Count of WAU using the `/tag` quick action 
+description: Count of WAU using the `/tag` quick action
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_tag
+  - i_quickactions_tag
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181819_i_quickactions_target_branch_weekly.yml b/config/metrics/counts_7d/20210216181819_i_quickactions_target_branch_weekly.yml
index 8a7a20e016880e90f43c605d026c1678f961825a..de097f7d2f9d6d8631b34b15d80fff83102c41a7 100644
--- a/config/metrics/counts_7d/20210216181819_i_quickactions_target_branch_weekly.yml
+++ b/config/metrics/counts_7d/20210216181819_i_quickactions_target_branch_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_target_branch_weekly
 description: Count of WAU using the `/target_branch` quick action on Merge Requests
 product_section: dev
 product_stage: create
-product_group: group::source code 
+product_group: group::source code
 product_category: source_code_management
 value_type: number
 status: data_available
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_target_branch
+  - i_quickactions_target_branch
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
-- ultimate
\ No newline at end of file
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml b/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml
index 5d390130bcf73b849179c9a9b63ca4405675099c..775a8ee2d02113bc837e23260b9bbe941ed36b23 100644
--- a/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml
+++ b/config/metrics/counts_7d/20210216181822_i_quickactions_title_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_title_weekly
-description: Count of WAU using the `/title` quick action 
+description: Count of WAU using the `/title` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_title
+  - i_quickactions_title
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml b/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml
index 62c2ecadc3912c9edd30e097317c4e95027d4e3c..7116cf18e89c7cf792bd4672ee1c0e0b9adb57c7 100644
--- a/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml
+++ b/config/metrics/counts_7d/20210216181826_i_quickactions_todo_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_todo_weekly
-description: Count of WAU using the `/todo` quick action 
+description: Count of WAU using the `/todo` quick action
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_todo
+  - i_quickactions_todo
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181830_i_quickactions_unassign_specific_weekly.yml b/config/metrics/counts_7d/20210216181830_i_quickactions_unassign_specific_weekly.yml
index a3bed5449c9e05076032811048a22633916cfc03..8eccbb4b8238f7f5ef18e394a2c2f3fa17099dbf 100644
--- a/config/metrics/counts_7d/20210216181830_i_quickactions_unassign_specific_weekly.yml
+++ b/config/metrics/counts_7d/20210216181830_i_quickactions_unassign_specific_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_unassign_specific
+  - i_quickactions_unassign_specific
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181833_i_quickactions_unassign_all_weekly.yml b/config/metrics/counts_7d/20210216181833_i_quickactions_unassign_all_weekly.yml
index 41b6b77e73b25edd72640700df4b42c9f185e851..5d63011692c72d4c5482a4bac0a36a1372adafdf 100644
--- a/config/metrics/counts_7d/20210216181833_i_quickactions_unassign_all_weekly.yml
+++ b/config/metrics/counts_7d/20210216181833_i_quickactions_unassign_all_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_unassign_all
+  - i_quickactions_unassign_all
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
 - premium
-- ultimate
\ No newline at end of file
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181837_i_quickactions_unassign_reviewer_weekly.yml b/config/metrics/counts_7d/20210216181837_i_quickactions_unassign_reviewer_weekly.yml
index ffcd580673e7c4165cb876b1e580e184f6de74dc..b40e84af96990cb50622bcd8b9d0309e120a7ffa 100644
--- a/config/metrics/counts_7d/20210216181837_i_quickactions_unassign_reviewer_weekly.yml
+++ b/config/metrics/counts_7d/20210216181837_i_quickactions_unassign_reviewer_weekly.yml
@@ -1,10 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_unassign_reviewer_weekly
-description: Count of WAU using the `/unassign_reviewer` or `/remove_reviewer` quick action on Merge Requests
+description: Count of WAU using the `/unassign_reviewer` or `/remove_reviewer` quick
+  action on Merge Requests
 product_section: dev
 product_stage: create
-product_group: group::code review 
+product_group: group::code review
 product_category: code_review
 value_type: number
 status: data_available
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_unassign_reviewer
+  - i_quickactions_unassign_reviewer
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml b/config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml
index 5ce812bd6ecbd49df180e11d54b82bd50321160e..bc6869715d3cce6cd5604df24bd386f1fff7be39 100644
--- a/config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml
+++ b/config/metrics/counts_7d/20210216181841_i_quickactions_unlabel_specific_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_unlabel_specific_weekly
-description: Count of WAU using the `/unlabel` or `/remove_label` quick action to remove one or more specific labels
+description: Count of WAU using the `/unlabel` or `/remove_label` quick action to
+  remove one or more specific labels
 product_section: dev
 product_stage: plan
 product_group: group::project management
@@ -13,11 +14,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_unlabel_specific
+  - i_quickactions_unlabel_specific
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml b/config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml
index b78f9ca8ef9c3c03a74f92b5d92ccd23f851cab1..bda75ebe100fe4178b751dceede4648e60404f95 100644
--- a/config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml
+++ b/config/metrics/counts_7d/20210216181845_i_quickactions_unlabel_all_weekly.yml
@@ -13,12 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_unlabel_all
+  - i_quickactions_unlabel_all
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml b/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml
index 57b310903f36a14eec6dfa545162a6851e615a17..7a25822cbc1ca0e4b72d380ad80131f40ff32da2 100644
--- a/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml
+++ b/config/metrics/counts_7d/20210216181848_i_quickactions_unlock_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_unlock
+  - i_quickactions_unlock
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml b/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml
index a105958e4a1f74fc7478ff76da5024ef5dc4a3cf..8c0e0cb8d80068efebb659e5e535ae16371b69eb 100644
--- a/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml
+++ b/config/metrics/counts_7d/20210216181852_i_quickactions_unsubscribe_weekly.yml
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_unsubscribe
+  - i_quickactions_unsubscribe
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml b/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml
index 25e8f4be9ea2dc55d9b580b99b2543f0d9cb4e39..bbfba240a9e42429c3daa2ed5b5952c5c58ae02a 100644
--- a/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml
+++ b/config/metrics/counts_7d/20210216181859_i_quickactions_wip_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.quickactions.i_quickactions_wip_weekly
 description: Count of WAU using the `/wip` quick action on Merge Requests
 product_section: dev
 product_stage: create
-product_group: group::source code 
+product_group: group::source code
 product_category: source_code_management
 value_type: number
 status: data_available
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_wip
+  - i_quickactions_wip
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
+- premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml b/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml
index 5a39c45b49bcfc6eb24651b85df581c77b12f937..3955f88e9b8c32ba6bbf0749329b862c949a3972 100644
--- a/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml
+++ b/config/metrics/counts_7d/20210216181903_i_quickactions_zoom_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.quickactions.i_quickactions_zoom_weekly
-description: Count of WAU using the `/zoom` quick action on Issues 
+description: Count of WAU using the `/zoom` quick action on Issues
 product_section: dev
 product_stage: plan
 product_group: group::project management
-product_category: issue_tracking 
+product_category: issue_tracking
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_quickactions_zoom
+  - i_quickactions_zoom
 distribution:
 - ce
-- ee 
+- ee
 tier:
 - free
-- premium 
-- ultimate
\ No newline at end of file
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml b/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
index e82cd9f475becf08c76e8f6f47b95dfb779f1a5f..3f0da3b37b47fd41c78eba9aa01042a83b4010ee 100644
--- a/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216182100_wiki_action_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216182104_design_action_weekly.yml b/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
index 476ec4048223ed163b6621a6d51e29c91d0c8270..f2431232de70426855cd6c4ab0f7f21ccfef4e08 100644
--- a/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216182104_design_action_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216182107_project_action_weekly.yml b/config/metrics/counts_7d/20210216182107_project_action_weekly.yml
index db7052b12ef568f8f636ffe75363b253112ef222..f8156a1d8933f02b39a53ab9e5a21bbb751c96e5 100644
--- a/config/metrics/counts_7d/20210216182107_project_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216182107_project_action_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.source_code.project_action_weekly
-description: Count of unique actions done on projects and related resources (create, edit, delete, comment)
+description: Count of unique actions done on projects and related resources (create,
+  edit, delete, comment)
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml b/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
index d03fd57da15e30c6705121020f1b8c277ef7a31c..99ffc84ebefb1fc1db5b70785af69afe6ba5ea0b 100644
--- a/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
+++ b/config/metrics/counts_7d/20210216182134_i_testing_test_case_parsed_weekly.yml
@@ -23,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml b/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml
index abde6514c0d7d81f97635a8056182f82d7d03b93..f9e751ba88f25ac08e406a28bdd4765bd78153a8 100644
--- a/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml
+++ b/config/metrics/counts_7d/20210216184022_g_edit_by_sse_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml b/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml
index 3e2c55c64a532b98697729ae1faabcf678f44295..7942c3827e23b362783ed5bddabfc8463d0f4a0e 100644
--- a/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml
+++ b/config/metrics/counts_7d/20210216184045_git_write_action_weekly.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml b/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml
index ad3c78880b67bcd4ac91248b45e3cc8d02123bd0..7464bb5363a5e32447c0669500e7f1c1773491fb 100644
--- a/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml
+++ b/config/metrics/counts_7d/20210216184253_i_snippets_show_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_snippets_show
+  - i_snippets_show
 distribution:
 - ce
 - ee
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml b/config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml
index 34c7a54c61a1a76f92cdee8c46992fd0009fd37f..7384cb6f3d0d5fa0adc5ff6b0e8c5a18c5b5bcb1 100644
--- a/config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml
+++ b/config/metrics/counts_7d/20210216184301_o_pipeline_authoring_unique_users_committing_ciconfigfile_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - o_pipeline_authoring_unique_users_committing_ciconfigfile
+  - o_pipeline_authoring_unique_users_committing_ciconfigfile
 distribution:
 - ee
 - ce
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml b/config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml
index 8d67335f0d2b8ee1076a7bfc0ed9071a9ac301ba..ace60e321d0d086b86bc2ae612015391daa1a4a7 100644
--- a/config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml
+++ b/config/metrics/counts_7d/20210216184310_i_code_review_user_toggled_task_item_status_weekly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_toggled_task_item_status
+  - i_code_review_user_toggled_task_item_status
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml b/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml
index 14eb2ace2fb240503da8252e992c885553b9a009..627bd8b1c43052ce4430eb2eb8021a18264d6129 100644
--- a/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216184320_i_code_review_user_approve_mr_weekly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_approve_mr
+  - i_code_review_user_approve_mr
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml b/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml
index ba26fdb3d6f76c98c8e456bf1e2d4cc638d03849..927cfaa6455a721e7df139dafd689ca51e2c4fec 100644
--- a/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml
+++ b/config/metrics/counts_7d/20210216184324_i_code_review_user_unapprove_mr_weekly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_unapprove_mr
+  - i_code_review_user_unapprove_mr
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml b/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml
index 7aed369c9b02308d7aecb351a5d67431523ebe2d..a11d060c9ebadf2b542156c355b054c191c34bc8 100644
--- a/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml
+++ b/config/metrics/counts_7d/20210216184328_i_code_review_user_resolve_thread_weekly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_resolve_thread
+  - i_code_review_user_resolve_thread
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml b/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml
index 77e7b6a2ffd65d9ad4fd275199f2c142da9de3fb..da806241cf2306ccd65bdf3b960a1c360deae68a 100644
--- a/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml
+++ b/config/metrics/counts_7d/20210216184332_i_code_review_user_unresolve_thread_weekly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_unresolve_thread
+  - i_code_review_user_unresolve_thread
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml b/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml
index 2676804eab83517defde8ef5dda68082bd034bb7..4fcbf64ca4017d4477b4bf5edbeb990dd2eb5f44 100644
--- a/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml
+++ b/config/metrics/counts_7d/20210216184336_i_code_review_edit_mr_title_weekly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_edit_mr_title
+  - i_code_review_edit_mr_title
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml b/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml
index 7195b41324ce89ad1620004966f3239d332133a3..d60e13e81e42c1e5e73c5cbc01f394d0388f9469 100644
--- a/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml
+++ b/config/metrics/counts_7d/20210216184340_i_code_review_edit_mr_desc_weekly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_edit_mr_desc
+  - i_code_review_edit_mr_desc
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml b/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml
index 0f1b9370ac8959335adb60a41951d7992567768d..37a0c331d7d1b5a4e968a1f34efd4737a8c03cd9 100644
--- a/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml
+++ b/config/metrics/counts_7d/20210216184351_i_code_review_user_create_review_note_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_create_review_note_weekly
-description: Count of unique users per week who create a note as part of a merge request review
+description: Count of unique users per week who create a note as part of a merge request
+  review
 product_stage: create
 product_group: group::code review
 product_category: code_review
@@ -12,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_create_review_note
+  - i_code_review_user_create_review_note
 distribution:
 - ce
 - ee
@@ -21,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml b/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml
index 2228aacdfac6bcd826431d9faac2372a6cfc1f10..aea4044fb8e4ceb17de3dbf21fd3bc9dc2dc8034 100644
--- a/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml
+++ b/config/metrics/counts_7d/20210216184355_i_code_review_user_publish_review_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_publish_review_weekly
-description: Count of unique users per week who publish their review as part of a merge request review
+description: Count of unique users per week who publish their review as part of a
+  merge request review
 product_stage: create
 product_group: group::code review
 product_category: code_review
@@ -12,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_publish_review
+  - i_code_review_user_publish_review
 distribution:
 - ce
 - ee
@@ -21,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml
index 5874320eaa685bbc14bd6d30d251a5f6e6fd873c..501f9312a890bcca7e452549889961f0820a5f5f 100644
--- a/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216184359_i_code_review_user_create_multiline_mr_comment_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_create_multiline_mr_comment_weekly
-description: Count of unique users per week who create a multiline comment in a merge request
+description: Count of unique users per week who create a multiline comment in a merge
+  request
 product_stage: create
 product_group: group::code review
 product_category: code_review
@@ -12,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_create_multiline_mr_comment
+  - i_code_review_user_create_multiline_mr_comment
 distribution:
 - ce
 - ee
@@ -21,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml
index 77da5c512dd877bec629e3ce83a73dd5c93eaec6..28f343965f4a6e7ce8a998a39b2cd25830209c7a 100644
--- a/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216184403_i_code_review_user_edit_multiline_mr_comment_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_edit_multiline_mr_comment_weekly
-description: Count of unique users per week who edit a multiline comment in a merge request
+description: Count of unique users per week who edit a multiline comment in a merge
+  request
 product_stage: create
 product_group: group::code review
 product_category: code_review
@@ -12,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_edit_multiline_mr_comment
+  - i_code_review_user_edit_multiline_mr_comment
 distribution:
 - ce
 - ee
@@ -21,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml b/config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml
index a84bf25dc3b1778190730e2fd20fc275a3b1fa6a..4e288fb4985518d47e72dffe5e95c322c66977f9 100644
--- a/config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml
+++ b/config/metrics/counts_7d/20210216184407_i_code_review_user_remove_multiline_mr_comment_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_remove_multiline_mr_comment_weekly
-description: Count of unique users per week who remove a multiline comment in a merge request
+description: Count of unique users per week who remove a multiline comment in a merge
+  request
 product_stage: create
 product_group: group::code review
 product_category: code_review
@@ -12,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_remove_multiline_mr_comment
+  - i_code_review_user_remove_multiline_mr_comment
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml b/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml
index 8dcb7355259cde509a6c2cc3f08beaff46df82f6..f7ec20756786bf3f506f3fac428e2a798c205a0f 100644
--- a/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml
+++ b/config/metrics/counts_7d/20210216184416_i_code_review_user_assigned_weekly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_assigned
+  - i_code_review_user_assigned
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml b/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml
index d629ff47e6acf3dd65267308a7350a932ec4d178..dd37cefc18d6daf9e511a375e2966ec10c11bcac 100644
--- a/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml
+++ b/config/metrics/counts_7d/20210216184420_i_code_review_user_marked_as_draft_weekly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_marked_as_draft
+  - i_code_review_user_marked_as_draft
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml b/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml
index a9ca86c9c8911d54db1ad382c25c67ddae48a993..eb7abf2d1b7da712466d8cb8b29f092b7b2c83d8 100644
--- a/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml
+++ b/config/metrics/counts_7d/20210216184424_i_code_review_user_unmarked_as_draft_weekly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_unmarked_as_draft
+  - i_code_review_user_unmarked_as_draft
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml b/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml
index 1f048cc0ab557e1ff6d69cbe7a1bc438ec2eea34..d0423ec2cb02cb0ad51d6346cf56a29122dab13c 100644
--- a/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml
+++ b/config/metrics/counts_7d/20210216184428_i_code_review_user_review_requested_weekly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_review_requested
+  - i_code_review_user_review_requested
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml b/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml
index 3880ed061b031a6862c9935d26c9ab42f863f5b4..eecd6f8a8bffe5c4097277d549f111b7e865438d 100644
--- a/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml
+++ b/config/metrics/counts_7d/20210216184432_i_code_review_user_approval_rule_added_weekly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_approval_rule_added
+  - i_code_review_user_approval_rule_added
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml b/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml
index d11f0e03d576530fb8545422193f46620ca0735a..9e103b54f2ca5b5e752140adf4f09fca102221ec 100644
--- a/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml
+++ b/config/metrics/counts_7d/20210216184436_i_code_review_user_approval_rule_deleted_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.code_review.i_code_review_user_approval_rule_deleted_weekly
-description: Count of unique users per week who delete an approval rule to a merge request
+description: Count of unique users per week who delete an approval rule to a merge
+  request
 product_stage: create
 product_group: group::code review
 product_category: code_review
@@ -12,11 +13,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_approval_rule_deleted
+  - i_code_review_user_approval_rule_deleted
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml b/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml
index f07a6b8084fb7c78e9f2067151c3212061ee4347..7c07dc5aa9bc0fc5dd5ca0f165e33b43de79ab73 100644
--- a/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml
+++ b/config/metrics/counts_7d/20210216184440_i_code_review_user_approval_rule_edited_weekly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_approval_rule_edited
+  - i_code_review_user_approval_rule_edited
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml b/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml
index a583b1a1ad7e8f741881a93fc85e2f5e7522b4e3..9c4f70f94ff4d052dee32f975fb059d34fdcd0e1 100644
--- a/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml
+++ b/config/metrics/counts_7d/20210216184444_i_code_review_user_vs_code_api_request_weekly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_vs_code_api_request
+  - i_code_review_user_vs_code_api_request
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml b/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml
index 3147fe6d7a6943d257b0631b726ef48688db3b36..ff94cbe89e7c94448059e65f1959d1335744172f 100644
--- a/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml
+++ b/config/metrics/counts_7d/20210216184448_i_code_review_user_create_mr_from_issue_weekly.yml
@@ -12,11 +12,12 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_user_create_mr_from_issue
+  - i_code_review_user_create_mr_from_issue
 distribution:
 - ce
 - ee
 tier:
- - free
- - premium
- - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
index ddd40581db4d9f1cd0b16f612aab9a3c8864f973..79d205695b557c8149311b359d710eab05d81f33 100644
--- a/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184452_code_review_total_unique_counts_weekly.yml
@@ -12,62 +12,62 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_code_review_mr_diffs
-    - i_code_review_user_single_file_diffs
-    - i_code_review_mr_single_file_diffs
-    - i_code_review_user_toggled_task_item_status
-    - i_code_review_user_create_mr
-    - i_code_review_user_close_mr
-    - i_code_review_user_reopen_mr
-    - i_code_review_user_approve_mr
-    - i_code_review_user_unapprove_mr
-    - i_code_review_user_resolve_thread
-    - i_code_review_user_unresolve_thread
-    - i_code_review_edit_mr_title
-    - i_code_review_edit_mr_desc
-    - i_code_review_user_merge_mr
-    - i_code_review_user_create_mr_comment
-    - i_code_review_user_edit_mr_comment
-    - i_code_review_user_remove_mr_comment
-    - i_code_review_user_create_review_note
-    - i_code_review_user_publish_review
-    - i_code_review_user_create_multiline_mr_comment
-    - i_code_review_user_edit_multiline_mr_comment
-    - i_code_review_user_remove_multiline_mr_comment
-    - i_code_review_user_add_suggestion
-    - i_code_review_user_apply_suggestion
-    - i_code_review_user_assigned
-    - i_code_review_user_marked_as_draft
-    - i_code_review_user_unmarked_as_draft
-    - i_code_review_user_review_requested
-    - i_code_review_user_approval_rule_added
-    - i_code_review_user_approval_rule_deleted
-    - i_code_review_user_approval_rule_edited
-    - i_code_review_user_vs_code_api_request
-    - i_code_review_user_create_mr_from_issue
-    - i_code_review_user_mr_discussion_locked
-    - i_code_review_user_mr_discussion_unlocked
-    - i_code_review_user_time_estimate_changed
-    - i_code_review_user_time_spent_changed
-    - i_code_review_user_assignees_changed
-    - i_code_review_user_reviewers_changed
-    - i_code_review_user_milestone_changed
-    - i_code_review_user_labels_changed
-    - i_code_review_click_diff_view_setting
-    - i_code_review_click_single_file_mode_setting
-    - i_code_review_click_file_browser_setting
-    - i_code_review_click_whitespace_setting
-    - i_code_review_diff_view_inline
-    - i_code_review_diff_view_parallel
-    - i_code_review_file_browser_tree_view
-    - i_code_review_file_browser_list_view
-    - i_code_review_diff_show_whitespace
-    - i_code_review_diff_hide_whitespace
-    - i_code_review_diff_single_file
-    - i_code_review_diff_multiple_files
-    - i_code_review_user_load_conflict_ui
-    - i_code_review_user_resolve_conflict
-    - i_code_review_user_searches_diff
+  - i_code_review_mr_diffs
+  - i_code_review_user_single_file_diffs
+  - i_code_review_mr_single_file_diffs
+  - i_code_review_user_toggled_task_item_status
+  - i_code_review_user_create_mr
+  - i_code_review_user_close_mr
+  - i_code_review_user_reopen_mr
+  - i_code_review_user_approve_mr
+  - i_code_review_user_unapprove_mr
+  - i_code_review_user_resolve_thread
+  - i_code_review_user_unresolve_thread
+  - i_code_review_edit_mr_title
+  - i_code_review_edit_mr_desc
+  - i_code_review_user_merge_mr
+  - i_code_review_user_create_mr_comment
+  - i_code_review_user_edit_mr_comment
+  - i_code_review_user_remove_mr_comment
+  - i_code_review_user_create_review_note
+  - i_code_review_user_publish_review
+  - i_code_review_user_create_multiline_mr_comment
+  - i_code_review_user_edit_multiline_mr_comment
+  - i_code_review_user_remove_multiline_mr_comment
+  - i_code_review_user_add_suggestion
+  - i_code_review_user_apply_suggestion
+  - i_code_review_user_assigned
+  - i_code_review_user_marked_as_draft
+  - i_code_review_user_unmarked_as_draft
+  - i_code_review_user_review_requested
+  - i_code_review_user_approval_rule_added
+  - i_code_review_user_approval_rule_deleted
+  - i_code_review_user_approval_rule_edited
+  - i_code_review_user_vs_code_api_request
+  - i_code_review_user_create_mr_from_issue
+  - i_code_review_user_mr_discussion_locked
+  - i_code_review_user_mr_discussion_unlocked
+  - i_code_review_user_time_estimate_changed
+  - i_code_review_user_time_spent_changed
+  - i_code_review_user_assignees_changed
+  - i_code_review_user_reviewers_changed
+  - i_code_review_user_milestone_changed
+  - i_code_review_user_labels_changed
+  - i_code_review_click_diff_view_setting
+  - i_code_review_click_single_file_mode_setting
+  - i_code_review_click_file_browser_setting
+  - i_code_review_click_whitespace_setting
+  - i_code_review_diff_view_inline
+  - i_code_review_diff_view_parallel
+  - i_code_review_file_browser_tree_view
+  - i_code_review_file_browser_list_view
+  - i_code_review_diff_show_whitespace
+  - i_code_review_diff_hide_whitespace
+  - i_code_review_diff_single_file
+  - i_code_review_diff_multiple_files
+  - i_code_review_user_load_conflict_ui
+  - i_code_review_user_resolve_conflict
+  - i_code_review_user_searches_diff
 distribution:
 - ce
 - ee
@@ -76,3 +76,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml b/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
index 01155a1c0e07065dcd71750f2c87782e6fbbff6f..54aa24ca548925d08f59ff6e9d404640414e4231 100644
--- a/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
+++ b/config/metrics/counts_7d/20210216184515_p_ci_templates_5_min_production_app_weekly.yml
@@ -4,7 +4,7 @@ key_path: redis_hll_counters.ci_templates.p_ci_templates_5_min_production_app_we
 description: Number of projects using 5 min production app CI template in last 7 days.
 product_section: seg
 product_stage: deploy
-product_group: "group::5-min-app"
+product_group: group::5-min-app
 product_category: five_minute_production_app
 value_type: number
 status: data_available
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_5_min_production_app
+  - p_ci_templates_5_min_production_app
 distribution:
 - ce
 - ee
@@ -21,4 +21,4 @@ tier:
 - free
 - premium
 - ultimate
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml b/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml
index 822006bc84d23494176d9d7f3981c3fbd4249083..de19f9d176cc092d1b64403705feb542f9c424ff 100644
--- a/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml
+++ b/config/metrics/counts_7d/20210216184524_p_ci_templates_aws_cf_deploy_ec2_weekly.yml
@@ -1,10 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_aws_cf_deploy_ec2_weekly
-description: "Count of projects using `AWS/CF-Provision-and-Deploy-EC2.gitlab-ci.yml` template in last 7 days."
+description: Count of projects using `AWS/CF-Provision-and-Deploy-EC2.gitlab-ci.yml`
+  template in last 7 days.
 product_section: ops
 product_stage: release
-product_group: "group::release"
+product_group: group::release
 product_category: continuous_delivery
 value_type: number
 status: data_available
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_aws_cf_deploy_ec2
+  - p_ci_templates_aws_cf_deploy_ec2
 distribution:
 - ce
 - ee
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml b/config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml
index 5c027842d63981bd64dfd0ba7a00bad1f45238e6..ac3725c642515e83471a4fae71095cf446c7dfb2 100644
--- a/config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml
+++ b/config/metrics/counts_7d/20210216184528_p_ci_templates_aws_deploy_ecs_weekly.yml
@@ -1,10 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.ci_templates.p_ci_templates_aws_deploy_ecs_weekly
-description: "Count of projects using `AWS/Deploy-ECS.gitlab-ci.yml` template in last 7 days."
+description: Count of projects using `AWS/Deploy-ECS.gitlab-ci.yml` template in last
+  7 days.
 product_section: ops
 product_stage: release
-product_group: "group::release"
+product_group: group::release
 product_category: continuous_delivery
 value_type: number
 status: data_available
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_aws_deploy_ecs
+  - p_ci_templates_aws_deploy_ecs
 distribution:
 - ce
 - ee
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
index 9edb43b3aee34673562544dd3df52dccf75f3c1b..19fc88278d209f4c1a5c923486d6a214b5f1df2f 100644
--- a/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184557_ci_templates_total_unique_counts_weekly.yml
@@ -14,21 +14,21 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_implicit_auto_devops
-    - p_ci_templates_implicit_auto_devops_build
-    - p_ci_templates_implicit_auto_devops_deploy
-    - p_ci_templates_implicit_security_sast
-    - p_ci_templates_implicit_security_secret_detection
-    - p_ci_templates_5_min_production_app
-    - p_ci_templates_auto_devops
-    - p_ci_templates_aws_cf_deploy_ec2
-    - p_ci_templates_aws_deploy_ecs
-    - p_ci_templates_auto_devops_build
-    - p_ci_templates_auto_devops_deploy
-    - p_ci_templates_auto_devops_deploy_latest
-    - p_ci_templates_security_sast
-    - p_ci_templates_security_secret_detection
-    - p_ci_templates_terraform_base_latest
+  - p_ci_templates_implicit_auto_devops
+  - p_ci_templates_implicit_auto_devops_build
+  - p_ci_templates_implicit_auto_devops_deploy
+  - p_ci_templates_implicit_security_sast
+  - p_ci_templates_implicit_security_secret_detection
+  - p_ci_templates_5_min_production_app
+  - p_ci_templates_auto_devops
+  - p_ci_templates_aws_cf_deploy_ec2
+  - p_ci_templates_aws_deploy_ecs
+  - p_ci_templates_auto_devops_build
+  - p_ci_templates_auto_devops_deploy
+  - p_ci_templates_auto_devops_deploy_latest
+  - p_ci_templates_security_sast
+  - p_ci_templates_security_secret_detection
+  - p_ci_templates_terraform_base_latest
 distribution:
 - ce
 - ee
@@ -37,3 +37,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml
index 7d918a5a496ad8b8fc1e0b2dcb075a1797e34beb..627138b5082edef7c84651e25d795924cbbd7bf5 100644
--- a/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184805_i_package_composer_deploy_token_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_composer_deploy_token_weekly
-description: A weekly count of Composer packages published to the registry using a deploy token
+description: A weekly count of Composer packages published to the registry using a
+  deploy token
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_composer_deploy_token
+  - i_package_composer_deploy_token
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml
index 13e5875fc49792eb63b213c92993d155a80babc9..b4935dfe4741ec485e2acd52a165af3e24a4da52 100644
--- a/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184808_i_package_conan_deploy_token_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_conan_deploy_token_weekly
-description: A weekly count of Conan packages published to the registry using a deploy token
+description: A weekly count of Conan packages published to the registry using a deploy
+  token
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_conan_deploy_token
+  - i_package_conan_deploy_token
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml
index 1b930e244eda46b27e8d0f79b6cee91bba06971b..9fc146d3c8616c6f21b725764e19650c7a68529a 100644
--- a/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184812_i_package_container_deploy_token_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_container_deploy_token_weekly
-description: A weekly count of container images published to the registry using a deploy token
+description: A weekly count of container images published to the registry using a
+  deploy token
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_container_deploy_token
+  - i_package_container_deploy_token
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml
index daf1268d0215e697408c9b1e84c69bb72153a7f0..40b86d27bcaebb3bd407cf06de527ae4973ac68a 100644
--- a/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184816_i_package_debian_deploy_token_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_debian_deploy_token_weekly
-description: A weekly count of Debian packages published to the registry using a deploy token
+description: A weekly count of Debian packages published to the registry using a deploy
+  token
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_debian_deploy_token
+  - i_package_debian_deploy_token
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml
index 82900f13262e7f5221ea5616f6ef896acc355517..ffee733e5b8f91252025e6d9b1e39e490b6a1b65 100644
--- a/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184820_i_package_generic_deploy_token_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_generic_deploy_token_weekly
-description: A weekly count of generic packages published to the registry using a deploy token
+description: A weekly count of generic packages published to the registry using a
+  deploy token
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_generic_deploy_token
+  - i_package_generic_deploy_token
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml
index 73993965b140ce0dbdf11d16bab8f96baccd7e21..59b1aef3cb6b5162428500d2468a7ea03c117a06 100644
--- a/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184824_i_package_golang_deploy_token_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_golang_deploy_token_weekly
-description: A weekly count of Go modules published to the registry using a deploy token
+description: A weekly count of Go modules published to the registry using a deploy
+  token
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_golang_deploy_token
+  - i_package_golang_deploy_token
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml
index 33ccf6b94c246e96cb261826a0b7b6e43a4dc8a1..496c431a57f0563a3047e2345e1825ca0a3f15b6 100644
--- a/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184828_i_package_maven_deploy_token_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_maven_deploy_token_weekly
-description: A weekly count of Maven packages published to the registry using a deploy token
+description: A weekly count of Maven packages published to the registry using a deploy
+  token
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_maven_deploy_token
+  - i_package_maven_deploy_token
 distribution:
 - ee
 - ce
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml
index 295258be202c40f90a8c942e4f1cfbf17741802c..8f3f42d6de9578d176486b65cc29cf7f8b58ab97 100644
--- a/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184832_i_package_npm_deploy_token_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_npm_deploy_token_weekly
-description: A weekly count of npm packages published to the registry using a deploy token
+description: A weekly count of npm packages published to the registry using a deploy
+  token
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_npm_deploy_token
+  - i_package_npm_deploy_token
 distribution:
 - ee
 - ce
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml
index 849f1541c78622235690147fcb454cb8d6f0ff94..9538977994841ca0256f197a937d0fe6c7fd1130 100644
--- a/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184836_i_package_nuget_deploy_token_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_nuget_deploy_token_weekly
-description: A weekly count of NuGet packages published to the registry using a deploy token
+description: A weekly count of NuGet packages published to the registry using a deploy
+  token
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_nuget_deploy_token
+  - i_package_nuget_deploy_token
 distribution:
 - ee
 - ce
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml
index 4e74098a20c7119c559c6761e0a9d9f7539df1d0..b949da1246bb8cb68bb115f92c12cf01168a2b84 100644
--- a/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184840_i_package_pypi_deploy_token_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_pypi_deploy_token_weekly
-description: A weekly count of Python packages published to the registry using a deploy token
+description: A weekly count of Python packages published to the registry using a deploy
+  token
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_pypi_deploy_token
+  - i_package_pypi_deploy_token
 distribution:
 - ee
 - ce
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml b/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml
index 35cb4ed18cd375dcbafa61de25b14b16eee2b8b2..e28f423b108536a47f1063a3f97ecfa38247464d 100644
--- a/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml
+++ b/config/metrics/counts_7d/20210216184844_i_package_tag_deploy_token_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.deploy_token_packages.i_package_tag_deploy_token_weekly
-description: A weekly count of users that have published a package tag to the registry using a deploy token
+description: A weekly count of users that have published a package tag to the registry
+  using a deploy token
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_tag_deploy_token
+  - i_package_tag_deploy_token
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
index 584e56510e96fbf39daefa346d1eeedbd5c8a59d..2f7b4bbcd5644f03839696e3c44d715bc08c2988 100644
--- a/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184848_deploy_token_packages_total_unique_counts_weekly.yml
@@ -13,20 +13,20 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_composer_deploy_token
-    - i_package_conan_deploy_token
-    - i_package_container_deploy_token
-    - i_package_debian_deploy_token
-    - i_package_generic_deploy_token
-    - i_package_golang_deploy_token
-    - i_package_helm_deploy_token
-    - i_package_maven_deploy_token
-    - i_package_npm_deploy_token
-    - i_package_nuget_deploy_token
-    - i_package_pypi_deploy_token
-    - i_package_rubygems_deploy_token
-    - i_package_tag_deploy_token
-    - i_package_terraform_module_deploy_token
+  - i_package_composer_deploy_token
+  - i_package_conan_deploy_token
+  - i_package_container_deploy_token
+  - i_package_debian_deploy_token
+  - i_package_generic_deploy_token
+  - i_package_golang_deploy_token
+  - i_package_helm_deploy_token
+  - i_package_maven_deploy_token
+  - i_package_npm_deploy_token
+  - i_package_nuget_deploy_token
+  - i_package_pypi_deploy_token
+  - i_package_rubygems_deploy_token
+  - i_package_tag_deploy_token
+  - i_package_terraform_module_deploy_token
 distribution:
 - ee
 - ce
@@ -35,3 +35,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml b/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml
index 09514b747fabbcadeef0047316ea4987da66d453..4f3e5272af009117114fd20e58729475da1519a4 100644
--- a/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184852_i_package_composer_user_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_composer_user_weekly
-description: A weekly count of users that have published a Composer package to the registry
+description: A weekly count of users that have published a Composer package to the
+  registry
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_composer_user
+  - i_package_composer_user
 distribution:
 - ee
 - ce
@@ -22,3 +23,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml b/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml
index 6038b6a7460d1bbce9766fe8bd899baed6b028d1..1a9376cda804768dc1403024b2826f2074aa2c51 100644
--- a/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184856_i_package_conan_user_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_conan_user
+  - i_package_conan_user
 distribution:
 - ee
 - ce
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml b/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml
index 795982a8c63c9fce4eaf9a8f308e87a03bc590eb..313b9b9a68e5adf496d63d7116935470f39fe3a5 100644
--- a/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184900_i_package_container_user_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_container_user_weekly
-description: A weekly count of users that have published a container image to the registry
+description: A weekly count of users that have published a container image to the
+  registry
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_container_user
+  - i_package_container_user
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml b/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml
index 9cc704c46fd777cf0b41328414013a6d736cdff9..2d61d3fa9924c63d26b5134e27953ab1759438a9 100644
--- a/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184904_i_package_debian_user_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_debian_user
+  - i_package_debian_user
 distribution:
 - ee
 - ce
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml b/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml
index 8e8198a5fcd858f70d1992530ca51cebbfb3c591..63278bcfbd82dc5fd067f1195a508c91e6dfffff 100644
--- a/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184908_i_package_generic_user_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_generic_user_weekly
-description: A weekly count of users that have published a generic package to the registry
+description: A weekly count of users that have published a generic package to the
+  registry
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -14,7 +15,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_generic_user
+  - i_package_generic_user
 distribution:
 - ee
 - ce
@@ -22,3 +23,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml b/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml
index f331fccc17829915b6c6a94166c8ad313005152e..1ccd4d89b5baf7ccce8477e1fffeea4d09ade361 100644
--- a/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184911_i_package_golang_user_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_golang_user
+  - i_package_golang_user
 distribution:
 - ee
 - ce
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml b/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml
index a79ce0401c5d0916373b69429bd898d1769e7433..2d2e9b135d33505464974caffa5f36fb06323c67 100644
--- a/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184916_i_package_maven_user_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_maven_user
+  - i_package_maven_user
 distribution:
 - ee
 - ce
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml b/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml
index 5eb7c85ad1bd7bb6c518ca412e2aac8515a9404d..e0ceebc835f18fd42249246a9383cbc6d45d93b3 100644
--- a/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184919_i_package_npm_user_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_npm_user
+  - i_package_npm_user
 distribution:
 - ee
 - ce
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml b/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml
index e8ead65cf925bc86f59327489d231ba73cea4322..f71ac914e7fb5becdec5b006efabb81f3a952a0f 100644
--- a/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184923_i_package_nuget_user_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_nuget_user
+  - i_package_nuget_user
 distribution:
 - ee
 - ce
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml b/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml
index 19d099eb6778363d7494a58df57351cc6da5ac45..9a0e63ec183732dbd90925297dcf24436e48aeeb 100644
--- a/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184927_i_package_pypi_user_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_pypi_user
+  - i_package_pypi_user
 distribution:
 - ee
 - ce
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml b/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml
index aa65fc12daafaa339e720171372ef99b7f85f770..5169e2d55195fa59e41cb7c101dc855bab76585f 100644
--- a/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml
+++ b/config/metrics/counts_7d/20210216184931_i_package_tag_user_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.user_packages.i_package_tag_user_weekly
-description: A weekly count of users that have published a package with a tag to the registry
+description: A weekly count of users that have published a package with a tag to the
+  registry
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -13,7 +14,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_tag_user
+  - i_package_tag_user
 distribution:
 - ee
 - ce
@@ -21,3 +22,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
index d7e35fb52eb7d9fd224778cbf0ebae0edecdb150..8d2dbc3e4f8f360e0fc4eab7e717996bed0ad984 100644
--- a/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184935_user_packages_total_unique_counts_weekly.yml
@@ -13,20 +13,20 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_package_composer_user
-    - i_package_conan_user
-    - i_package_container_user
-    - i_package_debian_user
-    - i_package_generic_user
-    - i_package_golang_user
-    - i_package_helm_user
-    - i_package_maven_user
-    - i_package_npm_user
-    - i_package_nuget_user
-    - i_package_pypi_user
-    - i_package_rubygems_user
-    - i_package_tag_user
-    - i_package_terraform_module_user
+  - i_package_composer_user
+  - i_package_conan_user
+  - i_package_container_user
+  - i_package_debian_user
+  - i_package_generic_user
+  - i_package_golang_user
+  - i_package_helm_user
+  - i_package_maven_user
+  - i_package_npm_user
+  - i_package_nuget_user
+  - i_package_pypi_user
+  - i_package_rubygems_user
+  - i_package_tag_user
+  - i_package_terraform_module_user
 distribution:
 - ee
 - ce
@@ -35,3 +35,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml b/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml
index 45b42df9a58b2a9f7a21ff3fe5474429308e1cc2..3d3d04efae2e48e0c3b9d8280571db5879e0ca7b 100644
--- a/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml
+++ b/config/metrics/counts_7d/20210216184939_i_ecosystem_jira_service_close_issue_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_ecosystem_jira_service_close_issue
+  - i_ecosystem_jira_service_close_issue
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml b/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml
index bcd142629ecd9dae83506176d306f2b631168f3c..2c9de3b6509f53fc072ef1b163a8000ee9ae48ee 100644
--- a/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml
+++ b/config/metrics/counts_7d/20210216184943_i_ecosystem_jira_service_cross_reference_weekly.yml
@@ -13,7 +13,7 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_ecosystem_jira_service_cross_reference
+  - i_ecosystem_jira_service_cross_reference
 distribution:
 - ce
 - ee
@@ -21,3 +21,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml b/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
index 109e4b0ac0af03137c7eb9a858f009b7f0c85883..e5c32cb611a5d7456f164496f24b6edcc9446af8 100644
--- a/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
+++ b/config/metrics/counts_7d/20210216184955_ecosystem_total_unique_counts_weekly.yml
@@ -13,19 +13,19 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_ecosystem_jira_service_close_issue
-    - i_ecosystem_jira_service_cross_reference
-    - i_ecosystem_jira_service_list_issues
-    - i_ecosystem_jira_service_create_issue
-    - i_ecosystem_slack_service_issue_notification
-    - i_ecosystem_slack_service_push_notification
-    - i_ecosystem_slack_service_deployment_notification
-    - i_ecosystem_slack_service_wiki_page_notification
-    - i_ecosystem_slack_service_merge_request_notification
-    - i_ecosystem_slack_service_note_notification
-    - i_ecosystem_slack_service_tag_push_notification
-    - i_ecosystem_slack_service_confidential_note_notification
-    - i_ecosystem_slack_service_confidential_issue_notification
+  - i_ecosystem_jira_service_close_issue
+  - i_ecosystem_jira_service_cross_reference
+  - i_ecosystem_jira_service_list_issues
+  - i_ecosystem_jira_service_create_issue
+  - i_ecosystem_slack_service_issue_notification
+  - i_ecosystem_slack_service_push_notification
+  - i_ecosystem_slack_service_deployment_notification
+  - i_ecosystem_slack_service_wiki_page_notification
+  - i_ecosystem_slack_service_merge_request_notification
+  - i_ecosystem_slack_service_note_notification
+  - i_ecosystem_slack_service_tag_push_notification
+  - i_ecosystem_slack_service_confidential_note_notification
+  - i_ecosystem_slack_service_confidential_issue_notification
 distribution:
 - ce
 - ee
@@ -33,3 +33,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210204124930_servers.yml b/config/metrics/counts_all/20210204124930_servers.yml
index 8012b83b2518ba408e42b6de88f1f559fcc410bb..0bf9cc6438055b2332a1a050a3955ada0479aa1e 100644
--- a/config/metrics/counts_all/20210204124930_servers.yml
+++ b/config/metrics/counts_all/20210204124930_servers.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210204124932_clusters.yml b/config/metrics/counts_all/20210204124932_clusters.yml
index c5be4a912a679311285b4913174e63ef5baf1879..27bdf43f1dcba6cc56c2c75a2a1a81f56ff31ea2 100644
--- a/config/metrics/counts_all/20210204124932_clusters.yml
+++ b/config/metrics/counts_all/20210204124932_clusters.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml b/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
index 03b58e61f7082760e0416a9d004eff890cb2b15a..d214c23cd64b729467200038c4bd6de5624d5c9c 100644
--- a/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
+++ b/config/metrics/counts_all/20210216174832_cycle_analytics_views.yml
@@ -5,7 +5,7 @@ description: Total visits to VSA (both group- and project-level) all time
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml b/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml
index c31b0a9d912eff26bcf4ea65f764d22274c7b950..2d5e592a2dc4f39d18a9e8bc49fdf0ce25721365 100644
--- a/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml
+++ b/config/metrics/counts_all/20210216174846_p_analytics_pipelines.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml b/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml
index 8fb0041b290faef066c0a3ee45b5243ad72ae46e..0c4b928e93daf867aa2c142c915ae77624520573 100644
--- a/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml
+++ b/config/metrics/counts_all/20210216174850_p_analytics_valuestream.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216174856_p_analytics_repo.yml b/config/metrics/counts_all/20210216174856_p_analytics_repo.yml
index f70c95b4b35e70a24527ae15d6b10b7b6636071c..2c0d615183132ac52a14468ee2995369d48907d7 100644
--- a/config/metrics/counts_all/20210216174856_p_analytics_repo.yml
+++ b/config/metrics/counts_all/20210216174856_p_analytics_repo.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml b/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml
index 7bd836eb477ddeb2cdfb4e18a9544a0ceb20b6f5..8f61665820fbc4a92aabf52945ae5f1e6510bedb 100644
--- a/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml
+++ b/config/metrics/counts_all/20210216174858_i_analytics_cohorts.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216174900_i_analytics_dev_ops_score.yml b/config/metrics/counts_all/20210216174900_i_analytics_dev_ops_score.yml
index 5d2413b929717ccdefdd70e15d98d19bd0750a1a..4171e8efa53e73b4bd477328ed82d3a0f14de489 100644
--- a/config/metrics/counts_all/20210216174900_i_analytics_dev_ops_score.yml
+++ b/config/metrics/counts_all/20210216174900_i_analytics_dev_ops_score.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml b/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml
index 3fdb40f32d93b1f61a8aa2b216ceeb16cf7ca103..7ebea5bbbcc3bf629e54cbfe8d45ff10a9b2ecd3 100644
--- a/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml
+++ b/config/metrics/counts_all/20210216174902_g_analytics_merge_request.yml
@@ -9,10 +9,10 @@ product_category:
 value_type: number
 status: removed
 time_frame: 7d
-data_source: redis_hll
 data_source:
 distribution:
 - ce
 tier:
 - free
-skip_validation: true
\ No newline at end of file
+skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml b/config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml
index dc5d05da04aad85fa0ad5dcf545cb4d21a14beaf..1032204843c27beee64710118b66558e8d5748f1 100644
--- a/config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml
+++ b/config/metrics/counts_all/20210216174906_i_analytics_instance_statistics.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216174908_analytics_unique_visits_for_any_target.yml b/config/metrics/counts_all/20210216174908_analytics_unique_visits_for_any_target.yml
index 551970130713da373fb921720f08cb08f016c726..587bd0acbff3581c473cd56ab2de242078d1089b 100644
--- a/config/metrics/counts_all/20210216174908_analytics_unique_visits_for_any_target.yml
+++ b/config/metrics/counts_all/20210216174908_analytics_unique_visits_for_any_target.yml
@@ -5,14 +5,15 @@ description: Unique visitors to any analytics feature by week
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source: 
+data_source:
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml b/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml
index 5f03db90f3bae4665880e34ac85b71b8fb55dd7e..d81ede4064695029aabb6d0a0419805bf4ebba29 100644
--- a/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_all/20210216175019_projects_with_prometheus_alerts.yml
@@ -17,3 +17,4 @@ tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml b/config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml
index 74a39d81941e6bb4f63438c608fbe2ce3183845a..1f3a527f8268213b5289b5d71c53953a61a27959 100644
--- a/config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml
+++ b/config/metrics/counts_all/20210216175021_pod_logs_usages_total.yml
@@ -17,3 +17,4 @@ tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml b/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml
index 8cd2a5bd76178a357acc5e996563a46664f71646..98c5ae12ff5d1c7baba1b2a7768ffa3064ecae7d 100644
--- a/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_all/20210216175024_service_desk_enabled_projects.yml
@@ -16,3 +16,4 @@ distribution:
 tier:
 - free
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175026_service_desk_issues.yml b/config/metrics/counts_all/20210216175026_service_desk_issues.yml
index 9e2dc5499b0937635c37d47f0203dd91455d778f..2b46e53b904cc24e2aac0d0a26f8b3f4eda53eaa 100644
--- a/config/metrics/counts_all/20210216175026_service_desk_issues.yml
+++ b/config/metrics/counts_all/20210216175026_service_desk_issues.yml
@@ -16,3 +16,4 @@ distribution:
 tier:
 - free
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175037_suggestions.yml b/config/metrics/counts_all/20210216175037_suggestions.yml
index 5cd566a31866ac45a5c8a8463090b4c78e38df58..b380c78158ea4546621ceaf35517fcdc82caede9 100644
--- a/config/metrics/counts_all/20210216175037_suggestions.yml
+++ b/config/metrics/counts_all/20210216175037_suggestions.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175039_merge_requests.yml b/config/metrics/counts_all/20210216175039_merge_requests.yml
index 1c9a1a0185c6f1d83449f0600fee8b3b60da82b1..64418431caef3603ad27dad57023854412d5e0b8 100644
--- a/config/metrics/counts_all/20210216175039_merge_requests.yml
+++ b/config/metrics/counts_all/20210216175039_merge_requests.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175041_merge_request_comment.yml b/config/metrics/counts_all/20210216175041_merge_request_comment.yml
index 0b3bce59176cf843b8bd0a00b7868a69f723cad9..dbc8995993be2794f598e0365bf4e16b2b680f19 100644
--- a/config/metrics/counts_all/20210216175041_merge_request_comment.yml
+++ b/config/metrics/counts_all/20210216175041_merge_request_comment.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175043_merge_request_create.yml b/config/metrics/counts_all/20210216175043_merge_request_create.yml
index 13393b8c1b817effab67b15430a4d113c91c226b..b3302b6bf7245211871796f8734d734873e7c55a 100644
--- a/config/metrics/counts_all/20210216175043_merge_request_create.yml
+++ b/config/metrics/counts_all/20210216175043_merge_request_create.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175045_merge_requests.yml b/config/metrics/counts_all/20210216175045_merge_requests.yml
index 088df8eca7cd657cc7dabd65a3e8b6d3f8144eeb..b6211db1e5a6b66c331eff8bc57228e908629e6c 100644
--- a/config/metrics/counts_all/20210216175045_merge_requests.yml
+++ b/config/metrics/counts_all/20210216175045_merge_requests.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175053_suggestions.yml b/config/metrics/counts_all/20210216175053_suggestions.yml
index f0361655616d3b833a58c0ac1e96a255d8c1be5d..cad2f44921eaf427657c6032fe5e072f95e20444 100644
--- a/config/metrics/counts_all/20210216175053_suggestions.yml
+++ b/config/metrics/counts_all/20210216175053_suggestions.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175206_merged_merge_requests_using_approval_rules.yml b/config/metrics/counts_all/20210216175206_merged_merge_requests_using_approval_rules.yml
index b5facd08c21ff83db93bd3e189d06d22877099b0..7ab8415d5083c1bb465e64bba4a11bcccf9855be 100644
--- a/config/metrics/counts_all/20210216175206_merged_merge_requests_using_approval_rules.yml
+++ b/config/metrics/counts_all/20210216175206_merged_merge_requests_using_approval_rules.yml
@@ -16,3 +16,4 @@ tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml b/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
index be8c33d144dd61335f91c8dc74664a0cbc63ab8f..35b296157938bd60c8947f2f943edc45fe7839e7 100644
--- a/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
+++ b/config/metrics/counts_all/20210216175229_auto_devops_enabled.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: counts.auto_devops_enabled
-description: Projects with Auto DevOps template enabled (excluding implicit Auto DevOps enabled and Auto DevOps template includes)
+description: Projects with Auto DevOps template enabled (excluding implicit Auto DevOps
+  enabled and Auto DevOps template includes)
 product_section: ops
 product_stage: configure
 product_group: group::configure
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml b/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml
index 69e9729d825a0008fdfc29158560398a32702953..3bbb6f2ac39eb6c8fd590a50abfea71d1cc76b25 100644
--- a/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml
+++ b/config/metrics/counts_all/20210216175231_auto_devops_disabled.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.auto_devops_disabled
 description: Projects with Auto DevOps template disabled
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: auto_devops
 value_type: number
@@ -16,3 +16,4 @@ tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175232_clusters.yml b/config/metrics/counts_all/20210216175232_clusters.yml
index e6894699827e89551e8b06d8cf38bdfc03a45798..1446c477e1f707d624ed6251e4b80f653d8f5628 100644
--- a/config/metrics/counts_all/20210216175232_clusters.yml
+++ b/config/metrics/counts_all/20210216175232_clusters.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters
 description: Total GitLab Managed clusters both enabled and disabled
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175234_clusters_enabled.yml b/config/metrics/counts_all/20210216175234_clusters_enabled.yml
index 6b940dfb5b3a8d34fe20bf0cb106cdc0f0f1d420..a553baa771786ea441453f3defbf7407e16ce266 100644
--- a/config/metrics/counts_all/20210216175234_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175234_clusters_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml b/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml
index f0db7b473cf6251b7520f4d2e52d38b5252b5ce5..b1cafeff17215f46293bc0849cc6e56439ae3a85 100644
--- a/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175236_project_clusters_enabled.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.project_clusters_enabled
 description: Total GitLab Managed clusters attached to projects
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml b/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml
index 6765d24cea84019b93378c1b3481d976e28f3655..b9af222740c60ea23aedcffbdde47689a7e1e997 100644
--- a/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175238_group_clusters_enabled.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.group_clusters_enabled
 description: Total GitLab Managed clusters attached to groups
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml b/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml
index afa8a761cf1abb484f13c75ad4143c7a16f7adc8..5813fe5c994c41fa0c3e7f54a9ee5466fe780df1 100644
--- a/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175240_instance_clusters_enabled.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instance_clusters_enabled
 description: Total GitLab Managed clusters attached to the instance
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175242_clusters_disabled.yml b/config/metrics/counts_all/20210216175242_clusters_disabled.yml
index 0fac20affd344cdf9adf69ffc7bb0faf215a82f1..6cfb6ffe32e874a36fb851350fe60894554fe918 100644
--- a/config/metrics/counts_all/20210216175242_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175242_clusters_disabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml b/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml
index 2b41f610415666c31f90fd61b617d108c1090b23..8eaa2c964975a5ff1cb1d25c1bb803622ca372aa 100644
--- a/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175244_project_clusters_disabled.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.project_clusters_disabled
 description: Total GitLab Managed disabled clusters previously attached to projects
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml b/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml
index b7a839f345af9730495ef7f6bc9df75dc0d0eb31..49a4d17b3f3e88f5bf3bc9c76c6b0117a2f4e7ae 100644
--- a/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175246_group_clusters_disabled.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.group_clusters_disabled
 description: Total GitLab Managed disabled clusters previously attached to groups
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml b/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml
index 94b5d48dffa8624ca00f1d2a1fd4c80a661abbd2..b7618704997f131fa036dabcaabe37c050e1adbe 100644
--- a/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175248_instance_clusters_disabled.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instance_clusters_disabled
 description: Total GitLab Managed disabled clusters previously attached to the instance
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml b/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml
index 1470dbe809fd556da2cb2cbd2a93cda11eb59ad8..f19489704b3ebe469b0b8f9f15d940bbfc3e82a4 100644
--- a/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml
+++ b/config/metrics/counts_all/20210216175250_clusters_platforms_eks.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_platforms_eks
 description: Total GitLab Managed clusters provisioned with GitLab on AWS EKS
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml b/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml
index 6f1692cc2b6e5e33b7173daa95402714650adc72..97d82b92f2feffa92e284b0318867dc78ff2c77f 100644
--- a/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml
+++ b/config/metrics/counts_all/20210216175251_clusters_platforms_gke.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_platforms_gke
 description: Total GitLab Managed clusters provisioned with GitLab on GCE GKE
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml b/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml
index eaeff4aa3a0b1681e1baf19260f538805f5a8289..d0e67887ed460cdd751832d1a7b90b87c29feb39 100644
--- a/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml
+++ b/config/metrics/counts_all/20210216175253_clusters_platforms_user.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_platforms_user
 description: Total GitLab Managed clusters that are user provisioned
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml b/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml
index bb85d43bc634d4432dd7b0d93587c11985d569b0..2c7f5a86aa7d0f8cfe6bbb632dd6f770a8b76073 100644
--- a/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml
+++ b/config/metrics/counts_all/20210216175255_clusters_applications_helm.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_applications_helm
 description: Total GitLab Managed clusters with GitLab Managed App:Helm enabled
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml b/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml
index 87b412b45f6d5fc7e6291c6f5f21115b434c29f9..1984d50f0e6be660a9c26c8eb3c45057fb76401b 100644
--- a/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml
+++ b/config/metrics/counts_all/20210216175257_clusters_applications_ingress.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_applications_ingress
 description: Total GitLab Managed clusters with GitLab Managed App:Ingress installed
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml b/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml
index f93f0e73e9d34c1d1d1e7e97245266286ff3f0f9..d1dfad6027142b2b97844e54260ec1aeb79a6f11 100644
--- a/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml
+++ b/config/metrics/counts_all/20210216175259_clusters_applications_cert_managers.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_applications_cert_managers
 description: Total GitLab Managed clusters with GitLab Managed App:Cert Manager installed
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml b/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml
index b365dabe4661f883e88b4d74fb8a7044d2b22a26..02c0734bf83eed2b2d6ccc30bc74c58e72035566 100644
--- a/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml
+++ b/config/metrics/counts_all/20210216175301_clusters_applications_crossplane.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_applications_crossplane
 description: Total GitLab Managed clusters with GitLab Managed App:Crossplane installed
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml b/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml
index 7d86d5da125e954cbd027541a2d16f2d129ea2c2..5811faa0c5c7cb1f50f483851a34f6bdb97762b4 100644
--- a/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_all/20210216175303_clusters_applications_prometheus.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_applications_prometheus
 description: Total GitLab Managed clusters with GitLab Managed App:Prometheus installed
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml b/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
index d10f2bb240a0de82c3e3a5842e141e856b444e6a..2a98d48cbca814a59ce677fead6c9f8ebf493c86 100644
--- a/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
+++ b/config/metrics/counts_all/20210216175305_clusters_applications_runner.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml b/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml
index a92b043622da95d501fa77a93e7362a86f631abb..04f2cfdcb56384d323e4df00eff4135c2c1862b2 100644
--- a/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml
+++ b/config/metrics/counts_all/20210216175307_clusters_applications_knative.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_applications_knative
 description: Total GitLab Managed clusters with GitLab Managed App:Knative installed
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml b/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml
index 9f94bf9ff3039cf73ecfdd665072cdc9850a904b..11f23a62905cf2debc14f7ae9ab77a8016dda254 100644
--- a/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml
+++ b/config/metrics/counts_all/20210216175309_clusters_applications_elastic_stack.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_applications_elastic_stack
 description: Total GitLab Managed clusters with GitLab Managed App:Elastic Stack installed
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml b/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml
index 8501a763454ee0644dc669d3e518eb97476ca984..33f93fde6889302c67e302f6bb524490fe5ba51d 100644
--- a/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml
+++ b/config/metrics/counts_all/20210216175310_clusters_applications_jupyter.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_applications_jupyter
 description: Total GitLab Managed clusters with GitLab Managed App:Jupyter installed
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml b/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
index f01577832356fe07e320c2d281c4b3722f58f2c7..d7b2efab4c5069b53ce02edfa951b186d00f44f9 100644
--- a/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
+++ b/config/metrics/counts_all/20210216175312_clusters_applications_cilium.yml
@@ -3,7 +3,7 @@ data_category: operational
 key_path: counts.clusters_applications_cilium
 description: Total GitLab Managed clusters with GitLab Managed App:Cilium installed
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175314_clusters_management_project.yml b/config/metrics/counts_all/20210216175314_clusters_management_project.yml
index c6dbd9469c120f091889b7114358a830e800408a..707d1a27c895709b98ab3539b8ac3873cce8b591 100644
--- a/config/metrics/counts_all/20210216175314_clusters_management_project.yml
+++ b/config/metrics/counts_all/20210216175314_clusters_management_project.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.clusters_management_project
 description: Total GitLab Managed clusters with defined cluster management project
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: kubernetes_management
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml b/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml
index 9fc55da3b6434724c2df53324ad5d7a89ff29c19..5dcae874ea2a9dad8a398a75f810f8c6fdc185bd 100644
--- a/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml
+++ b/config/metrics/counts_all/20210216175320_projects_with_terraform_reports.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml b/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml
index b7ea1a99a1f8464f550869d10493cf44c3c4d776..c21d969f376c3954fa905e471c4687ec9d337b96 100644
--- a/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml
+++ b/config/metrics/counts_all/20210216175322_projects_with_terraform_states.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175324_terraform_reports.yml b/config/metrics/counts_all/20210216175324_terraform_reports.yml
index 7694a8fd2fd4fe1c43aa44f12e73295722e388a7..ab6ad011bbe36d7b3d946fbea4173bd3be1dfcb6 100644
--- a/config/metrics/counts_all/20210216175324_terraform_reports.yml
+++ b/config/metrics/counts_all/20210216175324_terraform_reports.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.terraform_reports
 description: Count of Terraform MR reports generated
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: infrastructure_as_code
 value_type: number
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175326_terraform_states.yml b/config/metrics/counts_all/20210216175326_terraform_states.yml
index 0c1c27335ccef37b99d40937d99670dca54dfff0..be641fbb6bd38e098f3d2fe7585fc5954c529060 100644
--- a/config/metrics/counts_all/20210216175326_terraform_states.yml
+++ b/config/metrics/counts_all/20210216175326_terraform_states.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml b/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml
index a9f0eb521d91010dfc0b132f4afd73caeee989da..c31d9ad88354929e678d9e5626d8b7e3d4e070f4 100644
--- a/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml
+++ b/config/metrics/counts_all/20210216175329_clusters_applications_cert_managers.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml b/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml
index 44ff075ea0ef405965c2cf34a552acac00a548fd..594ef109d84f016fceb31ec3dcf853760f52fd90 100644
--- a/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml
+++ b/config/metrics/counts_all/20210216175331_clusters_applications_helm.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml b/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml
index 9b92d67d09b869b570094d14c2f3e9e2afd8b292..4bc913484355327c2856da34e955e3ee14b8c8d6 100644
--- a/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml
+++ b/config/metrics/counts_all/20210216175333_clusters_applications_ingress.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml b/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml
index 5bd5d52f8ab458424f60f25a08b429af97060afd..1abcca11a748eca9d338ab3d42b32ce8d3d7fba3 100644
--- a/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml
+++ b/config/metrics/counts_all/20210216175335_clusters_applications_knative.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175337_clusters_management_project.yml b/config/metrics/counts_all/20210216175337_clusters_management_project.yml
index f137981b7fdb4237faa6a7741d8d386a3b5f8646..8a7823e3ce2083dcb974adca6f86759a61b1bede 100644
--- a/config/metrics/counts_all/20210216175337_clusters_management_project.yml
+++ b/config/metrics/counts_all/20210216175337_clusters_management_project.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175339_clusters_disabled.yml b/config/metrics/counts_all/20210216175339_clusters_disabled.yml
index 15becf3a739eb7ad86c3eeda6590e624c2bf49be..0831a29f105ce7253ed00eaff6efee24ae4e7e0b 100644
--- a/config/metrics/counts_all/20210216175339_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175339_clusters_disabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175341_clusters_enabled.yml b/config/metrics/counts_all/20210216175341_clusters_enabled.yml
index 2a5d932ccf5a1552dcfa1bf8383e2bb357cfcdc5..bfa807da1d0848c6a43bd5d9fec9cca85eb46961 100644
--- a/config/metrics/counts_all/20210216175341_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175341_clusters_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml b/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml
index 2847e56bbcf14b711e20372c2b6062aa7f8b102c..dc22b8137fda4608d3e764d73406268ad796f38d 100644
--- a/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml
+++ b/config/metrics/counts_all/20210216175343_clusters_platforms_gke.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml b/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml
index 52af7411aae4478d0154d3e2f3fcbefa1096c41d..3b74dd322b4026bc858392dcd83c80dcd2158756 100644
--- a/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml
+++ b/config/metrics/counts_all/20210216175345_clusters_platforms_eks.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml b/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml
index 53ec537593703a10aa452f8df5083cc812a794de..4e4a77559b03620ff543f82b6433da31e2b0948f 100644
--- a/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml
+++ b/config/metrics/counts_all/20210216175346_clusters_platforms_user.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml b/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml
index 278261441915dda5afc781d079b3d452fbea1831..1a29d8f999b2cbeb9603ac2abb59ad4944a4b21e 100644
--- a/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175348_instance_clusters_disabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml b/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml
index 4e26fef5e62c6a04cf690d9624171fc45da7c591..6ca1bd555b37bb5f4eceaab127932e1ed7e7ef1e 100644
--- a/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175350_instance_clusters_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml b/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml
index 07651126a418f8ec7c5af426293531cb25dbfb6e..059145c82cc4b5e9228bdcdd9ae6ed726b1eabcd 100644
--- a/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175352_group_clusters_disabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml b/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml
index 72182fde57428378d6881c1d1a9e47a01f138984..440badea7507bf35e6173a0fc9bf965cb1a391ed 100644
--- a/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175354_group_clusters_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml b/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml
index a8b21924a1bfb79ac5920ec57efae5f552955fc9..c39fa60b348207678b2c88361851d41cf0c89c12 100644
--- a/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml
+++ b/config/metrics/counts_all/20210216175356_project_clusters_disabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml b/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml
index 80ac8ff67e3ce61b01de3f3edb80422992b46f97..4d75f1c9ed85757e5adef33499f2a6c76f532dc5 100644
--- a/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml
+++ b/config/metrics/counts_all/20210216175358_project_clusters_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml b/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml
index ab1a286bc0cd8202a5bb764b08814f2a3ba58436..60fb405b9f8097298960caa295ec588d7becc0e3 100644
--- a/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml
+++ b/config/metrics/counts_all/20210216175403_projects_with_prometheus_alerts.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml b/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
index 7e9b163f23a232c436522d70d022fa7a987d069a..ef8bb634b854eb2a022262ab58f58b799b5de880 100644
--- a/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
+++ b/config/metrics/counts_all/20210216175442_ingress_modsecurity_packets_processed.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml b/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
index 23c3beb281221ba48e518f016606e1a1e3f90d1f..067ac95782ffac873631c56f15609b4dd96b02f4 100644
--- a/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
+++ b/config/metrics/counts_all/20210216175444_ingress_modsecurity_packets_anomalous.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175446_network_policy_forwards.yml b/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
index 1b3448efecc9adddfb6ac574a42f390f947a616d..e0a037ffedb7096736dbe6a006046c9b3e413760 100644
--- a/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
+++ b/config/metrics/counts_all/20210216175446_network_policy_forwards.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175448_network_policy_drops.yml b/config/metrics/counts_all/20210216175448_network_policy_drops.yml
index 54b947599a96715d16e40810ee1e1c6f9149cb30..84f12746762ca850213dc16fe474f20821db1818 100644
--- a/config/metrics/counts_all/20210216175448_network_policy_drops.yml
+++ b/config/metrics/counts_all/20210216175448_network_policy_drops.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml b/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
index 8db0a0bd4d636c344006f97d3d057c33f8553a58..55dc3b6ca3b1ff20ad35286a21c1cfba886972de 100644
--- a/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
+++ b/config/metrics/counts_all/20210216175450_ingress_modsecurity_logging.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml b/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
index a663a49b88e7fe8053d359a701b49f9341cc9686..c21b1d24885a76f1c902932d569acb0f8ab2e4b6 100644
--- a/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
+++ b/config/metrics/counts_all/20210216175452_ingress_modsecurity_blocking.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml b/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
index 44bf44bd20a30c6b140d1ae2773e3b3a4e1be774..a4f4910cf7658028d5738331b95ff004bd116bd8 100644
--- a/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
+++ b/config/metrics/counts_all/20210216175454_ingress_modsecurity_disabled.yml
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml b/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
index 7de28e42533039fab7d10ad42badd060e9e87c8c..4a3717786be5e0f11251bdc0d04e9438aa296dc0 100644
--- a/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
+++ b/config/metrics/counts_all/20210216175456_ingress_modsecurity_not_installed.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175510_ci_builds.yml b/config/metrics/counts_all/20210216175510_ci_builds.yml
index 74f9d3963a714b24009a31e07c5e141540ca9ece..be1a41b2e6678cb28016a3e434a85f2b2d93b230 100644
--- a/config/metrics/counts_all/20210216175510_ci_builds.yml
+++ b/config/metrics/counts_all/20210216175510_ci_builds.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml b/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
index 85db2d7eed12fcd9d231111c21117a77c2e18584..2d2045f9c1f5bbdcca7b4b325609036cacec331e 100644
--- a/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
+++ b/config/metrics/counts_all/20210216175512_ci_internal_pipelines.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml b/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
index 31f948b0eb711fa5c25fd0a92f916815acffbf27..5d7f1c08f463bd9b631601800354b716de5ed96a 100644
--- a/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
+++ b/config/metrics/counts_all/20210216175514_ci_external_pipelines.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
index e3a379ed21ef938a371d9b475979bd78c701edd0..b9f190169f1eefbfa0c57454cbb33af70f979b37 100644
--- a/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
+++ b/config/metrics/counts_all/20210216175516_ci_pipeline_config_auto_devops.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml b/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml
index 1c03e614c6ea14ec6e255b0ec290cd1b9df2eb08..b85acf91296341540ecef5e2ee2766c8b35a3d6b 100644
--- a/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_all/20210216175518_ci_pipeline_config_repository.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175520_ci_runners.yml b/config/metrics/counts_all/20210216175520_ci_runners.yml
index 185783bf693ec3200b6e2154b13413c163c4cf87..5016a85d1d74cb666f3a6641e46254182702cf6e 100644
--- a/config/metrics/counts_all/20210216175520_ci_runners.yml
+++ b/config/metrics/counts_all/20210216175520_ci_runners.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175521_ci_triggers.yml b/config/metrics/counts_all/20210216175521_ci_triggers.yml
index b6452ca45f240786dcd2964286473f2b18fd9835..6c1e063655d33e16d8bd1a7b515ebbba3372fe4a 100644
--- a/config/metrics/counts_all/20210216175521_ci_triggers.yml
+++ b/config/metrics/counts_all/20210216175521_ci_triggers.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml b/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
index f136cb35ac55883b7e2c7de4e409ad023d4d86fd..13a3ef123b4083508835d5ba9510e8040353b223 100644
--- a/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_all/20210216175523_ci_pipeline_schedules.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175525_ci_builds.yml b/config/metrics/counts_all/20210216175525_ci_builds.yml
index 3b857e8bb0d1ab0700f489b463399ea34c803f43..16a662f14f08f7643e7f1fcbadb461439507f77c 100644
--- a/config/metrics/counts_all/20210216175525_ci_builds.yml
+++ b/config/metrics/counts_all/20210216175525_ci_builds.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml b/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
index 827bcbcd2e29c03f3355d45085c317adafde58ea..fefa76da1e7e246b477f9b61c176f8b1561c0d56 100644
--- a/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
+++ b/config/metrics/counts_all/20210216175527_ci_external_pipelines.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml b/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
index 1e1a1ee7af3c9713f0b92d1f69edd136f10fc6e5..82bb3aaf3c225b02aa115227b1cd9bd762570429 100644
--- a/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
+++ b/config/metrics/counts_all/20210216175529_ci_internal_pipelines.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml b/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml
index 3b9790f9b7114af7dbcefd7906c943b940d65aeb..2b02a1ea8a9e5a436c7d7d7385cf90283a3fc4bf 100644
--- a/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml
+++ b/config/metrics/counts_all/20210216175531_ci_pipeline_config_auto_devops.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml b/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml
index 6763d3f0f109ea98d65a0088056db587807828f7..39f6122430666e97bba31dfc672093aad2653e61 100644
--- a/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml
+++ b/config/metrics/counts_all/20210216175533_ci_pipeline_config_repository.yml
@@ -17,4 +17,4 @@ tier:
 - free
 - premium
 - ultimate
-
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml b/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
index 3c882f1f759eeaf10b0ebcd36512b47fee7742eb..37abe8569a9ee4e776636636013ce9ace6bce33a 100644
--- a/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
+++ b/config/metrics/counts_all/20210216175535_ci_pipeline_schedules.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175537_ci_pipelines.yml b/config/metrics/counts_all/20210216175537_ci_pipelines.yml
index f6fb62945f0e6fcc584dfcee187103ed3440e695..c64a595c11282479d9cf7a4a734dff32eaa94f24 100644
--- a/config/metrics/counts_all/20210216175537_ci_pipelines.yml
+++ b/config/metrics/counts_all/20210216175537_ci_pipelines.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175539_ci_triggers.yml b/config/metrics/counts_all/20210216175539_ci_triggers.yml
index 5a0e630993c2f33ff4e7fe37bb15862ca3a34e7b..03bae21fbd31f7be8b3fe6c98fb2f7e67dd8caf4 100644
--- a/config/metrics/counts_all/20210216175539_ci_triggers.yml
+++ b/config/metrics/counts_all/20210216175539_ci_triggers.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175621_web_hooks.yml b/config/metrics/counts_all/20210216175621_web_hooks.yml
index 9c7f000ae5043bc4ba0a65d21f68326d2a048b0d..1c3ea0343458fae9e44fc7555415c9696db91614 100644
--- a/config/metrics/counts_all/20210216175621_web_hooks.yml
+++ b/config/metrics/counts_all/20210216175621_web_hooks.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: counts.web_hooks
-description: 
+description:
 product_section: dev
 product_stage: ecosystem
 product_group: group::integrations
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
@@ -16,3 +16,4 @@ tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175623_projects_asana_active.yml b/config/metrics/counts_all/20210216175623_projects_asana_active.yml
index 67b7ef984715236f4f85cbe53db8d582800840a7..1cc4435718a7e21574c6090a6a2982506a3be084 100644
--- a/config/metrics/counts_all/20210216175623_projects_asana_active.yml
+++ b/config/metrics/counts_all/20210216175623_projects_asana_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175625_groups_asana_active.yml b/config/metrics/counts_all/20210216175625_groups_asana_active.yml
index 2fa25aa0bc18e869a6982e451f8e84e5cb7b0c45..68f8ddbb8e5cdc11306f502d53dc4c6d58646ac8 100644
--- a/config/metrics/counts_all/20210216175625_groups_asana_active.yml
+++ b/config/metrics/counts_all/20210216175625_groups_asana_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175627_templates_asana_active.yml b/config/metrics/counts_all/20210216175627_templates_asana_active.yml
index e0348f0760bf5ec3bfd1d675a095c9e72a92199d..f80b599d291c1eda478d7f663b8119dd2b030bd9 100644
--- a/config/metrics/counts_all/20210216175627_templates_asana_active.yml
+++ b/config/metrics/counts_all/20210216175627_templates_asana_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175628_instances_asana_active.yml b/config/metrics/counts_all/20210216175628_instances_asana_active.yml
index daad2b4f7ad6fde08ea1d0a1aeb2b51ed41d3a7c..072569b3f0e0f29d910078fda7791d547fa3352a 100644
--- a/config/metrics/counts_all/20210216175628_instances_asana_active.yml
+++ b/config/metrics/counts_all/20210216175628_instances_asana_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml b/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml
index adfe86ba5e0a7d5d3ebab1f1a58bbee8ed36c130..a7dfab4b4e2f6f205cd794bdc6effcc32e457c48 100644
--- a/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml
+++ b/config/metrics/counts_all/20210216175630_projects_inheriting_asana_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml b/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml
index c08e3762d5377888b43da7ef08e0ed6b1c457e37..27e3b6435b6fff14cc8f3cbf800d64150cd7d5d8 100644
--- a/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml
+++ b/config/metrics/counts_all/20210216175632_groups_inheriting_asana_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175634_projects_assembla_active.yml b/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
index 892b7723ba0adf3087b226ef134a3b6f52d40a5c..f889554204d7a1769a7bb64fcfd7761c497d12d4 100644
--- a/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175634_projects_assembla_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175636_groups_assembla_active.yml b/config/metrics/counts_all/20210216175636_groups_assembla_active.yml
index 7a0a02c3f34efdcfae0ce00c6ec9ede8e9ec052b..72b3b6525c673ee4d118ed797decd8be4fdcd2d7 100644
--- a/config/metrics/counts_all/20210216175636_groups_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175636_groups_assembla_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175638_templates_assembla_active.yml b/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
index c0867387261383d1fc6cd03f54a319cba7b8debc..bce06ac5b94490fa7c428fb7fc547ffeabc623aa 100644
--- a/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175638_templates_assembla_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175640_instances_assembla_active.yml b/config/metrics/counts_all/20210216175640_instances_assembla_active.yml
index 9ae2d48a68305bb204cb9d07948f06c522ee143a..97b742af9e204ec1cd7d36b7f8f9f6fb7d4f546c 100644
--- a/config/metrics/counts_all/20210216175640_instances_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175640_instances_assembla_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml b/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml
index ec1402be55d3f1913d4c76c8ea7cc6604656bd0c..58e5cbc463ad020f428df2fc74e9b708ff5b9615 100644
--- a/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175642_projects_inheriting_assembla_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml b/config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml
index eed75f72abd9599ece7a6dbf2bd0bf3987d7ca91..c4a3e97f5dd188c02d5aa185c2e4bfd451100fa9 100644
--- a/config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml
+++ b/config/metrics/counts_all/20210216175644_groups_inheriting_assembla_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml b/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
index 0d7f1b4b22f21f604acc625b32a2e7d6f020b652..de457accbc6bfa98c8c81a20770db13cbdb1a468 100644
--- a/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175645_projects_bamboo_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml b/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml
index e6379a4bfed4cb97254de6a3efbb900fa4797137..0ddb9142069572cc5af023cd88fb410a3d67c458 100644
--- a/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175647_groups_bamboo_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml b/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml
index e3c0882e781649fd9114d6bb59264553283f4e34..44ec35777237c2876ae650b5337625af1445eb3e 100644
--- a/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175649_templates_bamboo_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml b/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
index 61af43bb5e4e9e6e280cc54f16a1a21c25b57530..2819b9538663c2c3f143af51d6eff9961ee6dec2 100644
--- a/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175651_instances_bamboo_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml b/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml
index 5670c7dd7b12512476d76df0c7e9b457c7b71365..37cf4b6a5c9e6c3edcbc808cb257bdb89a63288b 100644
--- a/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175653_projects_inheriting_bamboo_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml b/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml
index e71b6d1d89e500c438472f7408acd0f0e69f3677..91d4c1ee87cfea188d85760972031b64dd08dc11 100644
--- a/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml
+++ b/config/metrics/counts_all/20210216175655_groups_inheriting_bamboo_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml b/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
index 16af8eb9792edf3b863132fbe19698d5a79e8830..2ae5655f3b0cb8472319f3804f1dd72394b6a002 100644
--- a/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175657_projects_bugzilla_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml b/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
index fe14026cd090e3d0c02ff623221cf39c99cc2b41..db4c0e668f04aab1e6c4c30e0125975a45a7bcc6 100644
--- a/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175659_groups_bugzilla_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml b/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
index 99426d2a4180f950624aa751dba486ba5a286d01..5a80e37f556873b5dc3888129622a0ead244c27b 100644
--- a/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175701_templates_bugzilla_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml b/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml
index f727c33a009745914b8a8e4165089a67418fae25..155f942f2e7c9962a95bc721bcdb79ee57390b08 100644
--- a/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175702_instances_bugzilla_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml b/config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml
index 375680322fc06420684194802de98984eba42c77..c6f74ebb5b85d792770e63cafd7450c0000cf58f 100644
--- a/config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175704_projects_inheriting_bugzilla_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml b/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml
index 58a5665b089c685b56f87500c73046ad2712b195..c0d7ad2d345fd75a9cd39ed7675b6149ec4afc9e 100644
--- a/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml
+++ b/config/metrics/counts_all/20210216175706_groups_inheriting_bugzilla_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml b/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
index 36ccdfc3bb4410da80426e7f4f31315469b834c8..168ac1af9fc34aecf214bbb2cea3d292fce8746a 100644
--- a/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175708_projects_buildkite_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml b/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
index eef27850d5e7a2962a653df926b629fc18eacd06..5d4b21b1fbdfe3cd44c4b443c6f6a89439a771d7 100644
--- a/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175710_groups_buildkite_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml b/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml
index 70b1f66c6f289941d203ae03128379b49b2004d9..125f0e4735668009a4cf3cbf5b1329dc7f4a6718 100644
--- a/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175712_templates_buildkite_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml b/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml
index ce52864f710b73b044752bc89b0b79224936db25..37a66245303356f6f19a0545b1660432f1b37eb8 100644
--- a/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175714_instances_buildkite_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml b/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml
index 409ea6b9d5d60a0a0203e93ace86932fdfb4093d..7d7a7c2e075164c330f25935ea42a08e2feaa565 100644
--- a/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175716_projects_inheriting_buildkite_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml b/config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml
index 6dd3e52aa899cd0f5390149dd0b6988ed1626b8c..24f7f58ecaa6cbcd7397928d200740ed6ed2b350 100644
--- a/config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml
+++ b/config/metrics/counts_all/20210216175717_groups_inheriting_buildkite_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175719_projects_campfire_active.yml b/config/metrics/counts_all/20210216175719_projects_campfire_active.yml
index 068b6ca70bd7158b5bb2ba54eba1e15cb55e9e6a..9f7dfb89153a60b41f3b3c0ef80f4595af767442 100644
--- a/config/metrics/counts_all/20210216175719_projects_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175719_projects_campfire_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175721_groups_campfire_active.yml b/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
index 81b57aaa2b7ad82a83d99494932aec38f72a4c29..eedc3e7bf58c495b69f0d78e69cd0d0fd3018fd4 100644
--- a/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175721_groups_campfire_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175723_templates_campfire_active.yml b/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
index 489e1ff085dd4deb911a710b364b511288c49bec..7fc6331367bac53f9abc40bd9beff6de345c7f4a 100644
--- a/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175723_templates_campfire_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175725_instances_campfire_active.yml b/config/metrics/counts_all/20210216175725_instances_campfire_active.yml
index ce01b949a43e6b889de3337ed39d3970197844d2..ef9d4cb6944ac492ed41dc2a6566b732e2c3ca24 100644
--- a/config/metrics/counts_all/20210216175725_instances_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175725_instances_campfire_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml b/config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml
index 2de7329aaceca722c5f58d9c885b64d3676b1a6d..ad5bf3fe8eda433fd83cea1684e4576a509b9548 100644
--- a/config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175727_projects_inheriting_campfire_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml b/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml
index 4639d011005cb0c951ce370f4339fb746269cf46..a5b5f00909822f1669b977f86c7eb84d9ba84d49 100644
--- a/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml
+++ b/config/metrics/counts_all/20210216175729_groups_inheriting_campfire_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175731_projects_confluence_active.yml b/config/metrics/counts_all/20210216175731_projects_confluence_active.yml
index 29420ee10e7307948d1b630eec3413c1ce53127f..bb2f1f0158f4d11c0f4c6cf50212658cd283f7fc 100644
--- a/config/metrics/counts_all/20210216175731_projects_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175731_projects_confluence_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175733_groups_confluence_active.yml b/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
index 5ee10fc89bd5ec7bb83251d428fcbdd5a78e27f7..7de039a27c2b3b58c811d38055aac51a5154c270 100644
--- a/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175733_groups_confluence_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175734_templates_confluence_active.yml b/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
index 4e8db8fe03123a6ff0f65e35a061410ffd5015c2..d059c1f09ad1352b4b2b22085e7914d4c95b6d60 100644
--- a/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175734_templates_confluence_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175736_instances_confluence_active.yml b/config/metrics/counts_all/20210216175736_instances_confluence_active.yml
index eda4940cc6d9f047ef47572a5046607f5b36339b..27cd481b3c214da972631d2e48d40ebe7957b285 100644
--- a/config/metrics/counts_all/20210216175736_instances_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175736_instances_confluence_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml b/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml
index 925341c3c81bb458d099af49f000960f1055d58e..120c5c584a8d93fe9b05abf0dcce1d8a1605935a 100644
--- a/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175738_projects_inheriting_confluence_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml b/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml
index d91c8dcd08daaaa4e8562726c87a36754497ded5..4b5cc064e923f4f0017d78b967d6a7ad20ce8382 100644
--- a/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml
+++ b/config/metrics/counts_all/20210216175740_groups_inheriting_confluence_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175742_projects_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175742_projects_custom_issue_tracker_active.yml
index f1d02dcdb9c7646695dc3eb86f182ae2e5b43f9f..baa22cf5d8bee948a35c405b10cda6ba9f3c8a3c 100644
--- a/config/metrics/counts_all/20210216175742_projects_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175742_projects_custom_issue_tracker_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175744_groups_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175744_groups_custom_issue_tracker_active.yml
index db1c01076865255df39c14de0ba4f7a0e63bd846..a3d742e55747d1206e024c60f73578a960f4a2a5 100644
--- a/config/metrics/counts_all/20210216175744_groups_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175744_groups_custom_issue_tracker_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175745_templates_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175745_templates_custom_issue_tracker_active.yml
index 8a60d0a3c5faa0d1da0dd0e02b668ddaff1843fc..fec328053dc81ea5836e6413355e94f8a523d2ea 100644
--- a/config/metrics/counts_all/20210216175745_templates_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175745_templates_custom_issue_tracker_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175747_instances_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175747_instances_custom_issue_tracker_active.yml
index 3f2658ffbde5a6988b361895a15c6dc608318794..e1b07c4709a2a5ad3c26c6f69d21bc052163e58a 100644
--- a/config/metrics/counts_all/20210216175747_instances_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175747_instances_custom_issue_tracker_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175749_projects_inheriting_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175749_projects_inheriting_custom_issue_tracker_active.yml
index cad81761f769f8650da160100a806d1f0abad4bb..807a2486a2ede404643f249a645491acfc94119a 100644
--- a/config/metrics/counts_all/20210216175749_projects_inheriting_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175749_projects_inheriting_custom_issue_tracker_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175751_groups_inheriting_custom_issue_tracker_active.yml b/config/metrics/counts_all/20210216175751_groups_inheriting_custom_issue_tracker_active.yml
index 20b3fbe3ba032713f4074f1f6f28d1bc14e9d5f1..0f6b2b3eed38c47aa138de177be53a884fc69e4c 100644
--- a/config/metrics/counts_all/20210216175751_groups_inheriting_custom_issue_tracker_active.yml
+++ b/config/metrics/counts_all/20210216175751_groups_inheriting_custom_issue_tracker_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175753_projects_discord_active.yml b/config/metrics/counts_all/20210216175753_projects_discord_active.yml
index e0973b0bffcd7e5b522afea7ea90df63025c2137..e77370d11f92cf779b4588967719c39a981765b8 100644
--- a/config/metrics/counts_all/20210216175753_projects_discord_active.yml
+++ b/config/metrics/counts_all/20210216175753_projects_discord_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175755_groups_discord_active.yml b/config/metrics/counts_all/20210216175755_groups_discord_active.yml
index f3fd18b35823fc0993183a42e1974dbfd7623d61..44a297f26e7f3871020e133358eb2079ebc08245 100644
--- a/config/metrics/counts_all/20210216175755_groups_discord_active.yml
+++ b/config/metrics/counts_all/20210216175755_groups_discord_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175756_templates_discord_active.yml b/config/metrics/counts_all/20210216175756_templates_discord_active.yml
index 0e16a045af24ea445c3a92d707e64d4eb07da71a..724369709a4f7625209dd57feb91b508f13b0727 100644
--- a/config/metrics/counts_all/20210216175756_templates_discord_active.yml
+++ b/config/metrics/counts_all/20210216175756_templates_discord_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175758_instances_discord_active.yml b/config/metrics/counts_all/20210216175758_instances_discord_active.yml
index 12d230f416916f21af5859ac858c60d16c481270..5f1461dd4cab8ba9fdeb631d592e9856e99ec4f2 100644
--- a/config/metrics/counts_all/20210216175758_instances_discord_active.yml
+++ b/config/metrics/counts_all/20210216175758_instances_discord_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml b/config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml
index 2dd434f3642fc4dedc5b1ad4945830cae6a0fdd9..afc14749b83ecdc19052587d53afb9de6a47f2e4 100644
--- a/config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml
+++ b/config/metrics/counts_all/20210216175800_projects_inheriting_discord_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml b/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml
index 16f962bd7bf2dc0ef0eb571074ea8242cd0d63d2..cae6b268640b45d39bc03ffeb217c4ad239c8149 100644
--- a/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml
+++ b/config/metrics/counts_all/20210216175802_groups_inheriting_discord_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml b/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml
index c0de6ead30e1e9832abbc7eea760108cb276d81f..1450d1dd4efcd93a8df3546452f0a1c204b4159b 100644
--- a/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175804_projects_drone_ci_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml b/config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml
index c2824b4c1796152ae9ac197db820be24c5c8c68d..2236393cce3b7652d6ce75f87728091a43d9f84e 100644
--- a/config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175806_groups_drone_ci_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml b/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml
index 8ee28df4d74151280a6ad7b9ad0e384bfcca06d3..81a87abede8037d0d63a577f932ead7cd7278b02 100644
--- a/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175807_templates_drone_ci_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml b/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml
index de5f27210ae1109799b7c1599611895b17f12f9b..a580eeb99113522818a49b982bb841681a394ab4 100644
--- a/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175809_instances_drone_ci_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml b/config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml
index 4d9e656fb283ee6c6b641eb56fa9105b9c4db490..0323c54abcf379b8c8509e1d24a45973b31b3625 100644
--- a/config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175811_projects_inheriting_drone_ci_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml b/config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml
index cb8883accf3e61d5932decbe0fb141c8e4e0216b..36776e486d9407dbe8b2ecc58848129b82ec750c 100644
--- a/config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml
+++ b/config/metrics/counts_all/20210216175813_groups_inheriting_drone_ci_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175815_projects_emails_on_push_active.yml b/config/metrics/counts_all/20210216175815_projects_emails_on_push_active.yml
index 01a94735afc80ea6cce5f29dbe3b4a99fe7cf3b5..a7cd15bd970648008788c9aa2a37aa13262ea6de 100644
--- a/config/metrics/counts_all/20210216175815_projects_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175815_projects_emails_on_push_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175817_groups_emails_on_push_active.yml b/config/metrics/counts_all/20210216175817_groups_emails_on_push_active.yml
index 67aa24bf260d9e7f5861c3fa79c7a79000449463..b1bb762b3317c345f3f53c4c5a4365cdbb06eebd 100644
--- a/config/metrics/counts_all/20210216175817_groups_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175817_groups_emails_on_push_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml b/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml
index a73d3bf2eca7c95c7f4aee026b902624229e581e..9784c2db282eb2b1edce6a59f59a07da6b2fa838 100644
--- a/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175818_templates_emails_on_push_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175820_instances_emails_on_push_active.yml b/config/metrics/counts_all/20210216175820_instances_emails_on_push_active.yml
index 3b2d47f996f81bd22dccb902c81fa2214f4d4051..ff6d8d935c0c471bb41d63578caf4364445314c8 100644
--- a/config/metrics/counts_all/20210216175820_instances_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175820_instances_emails_on_push_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175822_projects_inheriting_emails_on_push_active.yml b/config/metrics/counts_all/20210216175822_projects_inheriting_emails_on_push_active.yml
index fba967b763711d8f5534a19c14c76046bc58340b..8fa32ba188f1728bc2c7830e7a2fe7aaa573895c 100644
--- a/config/metrics/counts_all/20210216175822_projects_inheriting_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175822_projects_inheriting_emails_on_push_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml b/config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml
index 4770cec8031d1f8e3ac0c080933b31fc226926a7..d85bbefbc1f1668f6edc9cc6f3447cc50a7fb417 100644
--- a/config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml
+++ b/config/metrics/counts_all/20210216175824_groups_inheriting_emails_on_push_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml b/config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml
index 2d59b82103405c7644f4c12d8181552869d85924..ad6873aa0298bc165c84eed2becfce902964d96d 100644
--- a/config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175826_projects_external_wiki_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml b/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml
index 9bf2573d8cf1204639ae98cfb091117d65153768..5191174b03f2aa60ccc60bb32ae56f4deac35cb3 100644
--- a/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175828_groups_external_wiki_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml b/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml
index 6eec57b84da1f8604c722338c1d4cc1344389c73..d7e17564f964ce528321299e043557aff9e072c2 100644
--- a/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175829_templates_external_wiki_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml b/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml
index e69007baa075f4b73341298f55812580a93bd710..8ff6ce868cac98672b389defc976f7607574ae97 100644
--- a/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175831_instances_external_wiki_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175833_projects_inheriting_external_wiki_active.yml b/config/metrics/counts_all/20210216175833_projects_inheriting_external_wiki_active.yml
index 7926a9e8afd0dd1ad77485a40ce439a91229241f..afa54a16d86ca292f97ebdc412fbc76068d8611a 100644
--- a/config/metrics/counts_all/20210216175833_projects_inheriting_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175833_projects_inheriting_external_wiki_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175835_groups_inheriting_external_wiki_active.yml b/config/metrics/counts_all/20210216175835_groups_inheriting_external_wiki_active.yml
index 5afd44dd6c9eb1ba0ea45e4be60796fb239d773f..0e9b52ce806c63a3bdc775f613420b21aa2aa268 100644
--- a/config/metrics/counts_all/20210216175835_groups_inheriting_external_wiki_active.yml
+++ b/config/metrics/counts_all/20210216175835_groups_inheriting_external_wiki_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml b/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
index b291a420ee072e68054b7f0e5dae37d499366e04..d6f6de24068e9986afb0c96c22aef400b10e8a9a 100644
--- a/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175837_projects_flowdock_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml b/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
index 372d6d70b99712d6748a879a2fb3574bbff24eee..21a9256da6b919d6f208ab32d481811b0d42ebd7 100644
--- a/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175839_groups_flowdock_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml b/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml
index 8fdd17db523a8358d39c95e64540cf3bdfb8c04e..37d5ce81f12dd6da50905e8a4f02bcde39c6c0b5 100644
--- a/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175840_templates_flowdock_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml b/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
index 0ee29e5eafc1dfd7f7c7dbc99f014045bc8df02b..6b28b5f5cd84f5d7324ed481a51135ef77328ef9 100644
--- a/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175842_instances_flowdock_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml b/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
index f235a68138acfde568d7c543d67306b54b4ea0a2..48025839c037ebcac5fcee5630ca41e2a66e0ca6 100644
--- a/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175844_projects_inheriting_flowdock_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml b/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
index 613f77a7823f4b0cac2c484b9451a598a317360c..558edfc4e62166f7c60e9d35070a43a066b3e7d7 100644
--- a/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
+++ b/config/metrics/counts_all/20210216175846_groups_inheriting_flowdock_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml
index b65bdf26462a732cf8445d6dde8c9c256f64ec40..b22c8c633ed3c78ba2f752697027385561c39760 100644
--- a/config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175859_projects_hangouts_chat_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml
index f66a539058580e45dd18a03a2ff93e43d678b7af..5299718008f8c1e3e46f3d9d3ad75c68c67404f4 100644
--- a/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175901_groups_hangouts_chat_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml
index 0660b43acdbe2eac1a14113f056df0f6b9c7b7d2..945473b3c35dcf91c01d330740d9e5624198c37b 100644
--- a/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175902_templates_hangouts_chat_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml
index 760b2ae0130356fd62abf8192d400480ca176060..401760532638d0a5f2b7b944d0ac7180532fd91a 100644
--- a/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175904_instances_hangouts_chat_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml
index b012752e1006355dbc409cd18455c0e8c1b879a9..a2753b7f000cc9711a8f6a6bac184495a1743d5c 100644
--- a/config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175906_projects_inheriting_hangouts_chat_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175908_groups_inheriting_hangouts_chat_active.yml b/config/metrics/counts_all/20210216175908_groups_inheriting_hangouts_chat_active.yml
index 314f03f9c44a2963e12f9eb380bcaa38c52b601a..27c34ef851af2db43fd0e22f1faba2ef7d9d62f6 100644
--- a/config/metrics/counts_all/20210216175908_groups_inheriting_hangouts_chat_active.yml
+++ b/config/metrics/counts_all/20210216175908_groups_inheriting_hangouts_chat_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml b/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
index 04bf41281d1fa61844f49586cda86bf7e468d1b8..b1e5dfecea41b61ea49dfae3490313696514d028 100644
--- a/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175910_projects_hipchat_active.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml b/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
index 6d1b376d473e1285d8742119f65d7df290de27ac..444bbafc516120ca33b44c4de4a2f751e7712017 100644
--- a/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175912_groups_hipchat_active.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml b/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
index 1ad29856e8b9bca7db29d8d5d9b17fca4d9e88cb..40db443b1504c0ecde35e13abf3bed72522369dd 100644
--- a/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175913_templates_hipchat_active.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml b/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
index 17b27862eb8b249591bde519e03bfac4eeb452ef..ef7548871848fc39571509e6c74dbbf1edee199d 100644
--- a/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175915_instances_hipchat_active.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml b/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml
index 3926629d84efc74628d9fab95c1f350b52fae247..d93814d3b7197ece15d573e5b3201aff5165c59f 100644
--- a/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175917_projects_inheriting_hipchat_active.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml b/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml
index db64df5e880f8f3763ed93201987127ad0cf42c4..75fbbb12034a199d92f0bbc460afaef3651c514c 100644
--- a/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml
+++ b/config/metrics/counts_all/20210216175919_groups_inheriting_hipchat_active.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175921_projects_irker_active.yml b/config/metrics/counts_all/20210216175921_projects_irker_active.yml
index 6aa1dce7279eece4b27aabe704c46302564f8efa..024be65ab21884f914406b2a15bd6b6e8cd97347 100644
--- a/config/metrics/counts_all/20210216175921_projects_irker_active.yml
+++ b/config/metrics/counts_all/20210216175921_projects_irker_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175923_groups_irker_active.yml b/config/metrics/counts_all/20210216175923_groups_irker_active.yml
index 23dee4faa99f978e9f19ffad8a771e3528fa1697..4df751374464a4777558f982b78045bcdfd01321 100644
--- a/config/metrics/counts_all/20210216175923_groups_irker_active.yml
+++ b/config/metrics/counts_all/20210216175923_groups_irker_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175924_templates_irker_active.yml b/config/metrics/counts_all/20210216175924_templates_irker_active.yml
index eff644775cce855d1b1136d8591de442ed736455..bb821cd9ee93e9a82cba3e7fa27c75c1ef8dab27 100644
--- a/config/metrics/counts_all/20210216175924_templates_irker_active.yml
+++ b/config/metrics/counts_all/20210216175924_templates_irker_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175926_instances_irker_active.yml b/config/metrics/counts_all/20210216175926_instances_irker_active.yml
index ce785139cdbecdd6a288d87e9fa129c3d50171f4..9de79edaee7842a5fecdfc6b3ff6b405ea51cca1 100644
--- a/config/metrics/counts_all/20210216175926_instances_irker_active.yml
+++ b/config/metrics/counts_all/20210216175926_instances_irker_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml b/config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml
index 84f11bfbbfb879010785d894674b882c8424db2e..e503701d79833063df2f4a1725e1fb7ec62927f0 100644
--- a/config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml
+++ b/config/metrics/counts_all/20210216175928_projects_inheriting_irker_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml b/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml
index bb7fe5bd2bd1ebd074f9c9217c930fe3aaf58d9f..341e32bde2ef836ee0fe24cab4d2bb0343abcfa6 100644
--- a/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml
+++ b/config/metrics/counts_all/20210216175930_groups_inheriting_irker_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml b/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
index 52c1332cf9a39656dc2f3daed906208a4616ef96..a7126bf0a92cb8a0c006a1f2b31af8e76cb2d9f6 100644
--- a/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175932_projects_jenkins_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml b/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
index 04045aaa428106153f87071dc28c384f86afdd7e..765d955613789b4a6928aa6542d21789810575c4 100644
--- a/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175934_groups_jenkins_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml b/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml
index 1cf5485d7a48ae186cc3caad42c86b887683f7a1..5e24a79288769ae7b210d650c49b85e1d467eb77 100644
--- a/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175935_templates_jenkins_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml b/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
index 2c54388e9f4243a4c9a97118c4295647100352cd..79f539216b4bef925702ef7508dde9d06d0df492 100644
--- a/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175937_instances_jenkins_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml b/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml
index b5eed44d695be0c471b8b43caeae557f2f78a16a..da54fad496cdb9536e3da07cab9528846d0469a9 100644
--- a/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175939_projects_inheriting_jenkins_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml b/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml
index ba255d1b3a92bc8ad6a3ea722d9499dae58a14d4..1789f36acaa6d2e1023afd2ea7f5c4fe835039a0 100644
--- a/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml
+++ b/config/metrics/counts_all/20210216175941_groups_inheriting_jenkins_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175943_projects_jira_active.yml b/config/metrics/counts_all/20210216175943_projects_jira_active.yml
index fa63e02db35c915e2d9f94a702291084938647dc..92866092aeb099ad1423786f48cbe13b8dd508c9 100644
--- a/config/metrics/counts_all/20210216175943_projects_jira_active.yml
+++ b/config/metrics/counts_all/20210216175943_projects_jira_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175945_groups_jira_active.yml b/config/metrics/counts_all/20210216175945_groups_jira_active.yml
index 49cc71aeb61b595f841acce6532ad752b252abcc..a8ab0507d8efa13a1ee7ec5ba103e04016c75edf 100644
--- a/config/metrics/counts_all/20210216175945_groups_jira_active.yml
+++ b/config/metrics/counts_all/20210216175945_groups_jira_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175946_templates_jira_active.yml b/config/metrics/counts_all/20210216175946_templates_jira_active.yml
index d643ad4438718a06c90fbd2c7492b114985ac949..51721ed79362ca32ccd5dab1f93cca9924011bd1 100644
--- a/config/metrics/counts_all/20210216175946_templates_jira_active.yml
+++ b/config/metrics/counts_all/20210216175946_templates_jira_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175948_instances_jira_active.yml b/config/metrics/counts_all/20210216175948_instances_jira_active.yml
index 4b251b686402feae8e3b96f61160ea9e8ee1d697..7728019b87acf64f17b40671d43a6b25c5e077d7 100644
--- a/config/metrics/counts_all/20210216175948_instances_jira_active.yml
+++ b/config/metrics/counts_all/20210216175948_instances_jira_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml b/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml
index 1b11fa56c6f27ef76d3f5290b4a951e72ab4c02b..3222eb5fc1aee5847f59c882cb8bbb31aa211e70 100644
--- a/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml
+++ b/config/metrics/counts_all/20210216175950_projects_inheriting_jira_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml b/config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml
index 68e82a030c87ec1a2d8e3d6cd016cd93773934c7..647c1274281fc11ebe81c6fa7bdf7fc968bae6b0 100644
--- a/config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml
+++ b/config/metrics/counts_all/20210216175952_groups_inheriting_jira_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml b/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml
index f8c7edb9f406dee678d8313408f7d4246c250f95..7e3ee671d305050aa238e923898fe01d243868d3 100644
--- a/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175954_projects_mattermost_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml b/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml
index 92c072c2c85b9fe5227226b48fd2caafe3445e99..360e2f465663bae70e6c4c8d0bf7de813f6c7f96 100644
--- a/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175956_groups_mattermost_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml b/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml
index d935e0a86b0753f5e50863ac60a6b74e8cb5820c..959fabec93dac083d3028449df9bd24c70ac5c2e 100644
--- a/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175957_templates_mattermost_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml b/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml
index f7fe5081472cca0d675978dc48cf78c264278316..9a1b30ab0565a8d8e316291e9108856ba5041507 100644
--- a/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216175959_instances_mattermost_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml b/config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml
index 34b74f6ab2884f60a603045ad31191078f1e420d..246f5b8ec68bd1600643b332094ee4712b3f1859 100644
--- a/config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216180001_projects_inheriting_mattermost_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml b/config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml
index 68576193e3afe03426e8875693187240948397e5..333e6e9fa9223be723d190982f118e6a7b38be51 100644
--- a/config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml
+++ b/config/metrics/counts_all/20210216180003_groups_inheriting_mattermost_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180005_projects_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180005_projects_mattermost_slash_commands_active.yml
index d95571b0fb8a475b765eadae7551cd9fdcf67671..2028173499a41ed244c349daa3a9a2a80d01103b 100644
--- a/config/metrics/counts_all/20210216180005_projects_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180005_projects_mattermost_slash_commands_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180006_groups_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180006_groups_mattermost_slash_commands_active.yml
index 6ce8be4a8bedf3ead82090a43c1ac812c326d02e..dda7195ea647d16ce80bc71ec05e45f35c5c5896 100644
--- a/config/metrics/counts_all/20210216180006_groups_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180006_groups_mattermost_slash_commands_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180008_templates_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180008_templates_mattermost_slash_commands_active.yml
index d9255db7311bf82bdb26290160eed3d1fd8b278b..6eac8da9b05fe87be5622c7ef6083ea9e76085cc 100644
--- a/config/metrics/counts_all/20210216180008_templates_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180008_templates_mattermost_slash_commands_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml
index ad5e011a21cc24bf50e5b257c7593fd3bdaa5c62..f936fd4b1ade05bd5ac7361e34e700b9639bfa80 100644
--- a/config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180010_instances_mattermost_slash_commands_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml
index 4a26a69ed37c0ab81fa1f0a1097263b80f7d05a0..efb912998edc54f4136c7ff1e808a6e2deb6608c 100644
--- a/config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180012_projects_inheriting_mattermost_slash_commands_active.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml b/config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml
index 4c2deca981c8de36fa489a979a2b269ee5e1c11a..37f4b243e7ba929f723890d09c984937b0ab1baf 100644
--- a/config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180014_groups_inheriting_mattermost_slash_commands_active.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml
index ff25e7fe72a5387264243dcd092c877494710e59..a1e661b9ad5331da1ab8877be3c667c41f82342f 100644
--- a/config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180016_projects_microsoft_teams_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml
index 2afa40977b1f3782ce4249648edd685fc5f11d97..25c3cd360646f2b35e8eec9a25a61ec83c769ed7 100644
--- a/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180018_groups_microsoft_teams_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml
index 4ac134394fcb976a7735131dbe4a92a82fd2f54c..ff1a23e1b5f928700ec8379782c367cd80e88225 100644
--- a/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180019_templates_microsoft_teams_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml
index e78ae2b7411746684bc9a8a6931b45cbb017df38..22d89621a0380ed5e582cd0b318427a002d501b1 100644
--- a/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180021_instances_microsoft_teams_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180023_projects_inheriting_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180023_projects_inheriting_microsoft_teams_active.yml
index 73791545ea698193a484aa850b5260f3d4ebab70..cd81148870392de1cf69605dca8879d36d84af9a 100644
--- a/config/metrics/counts_all/20210216180023_projects_inheriting_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180023_projects_inheriting_microsoft_teams_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180025_groups_inheriting_microsoft_teams_active.yml b/config/metrics/counts_all/20210216180025_groups_inheriting_microsoft_teams_active.yml
index a1300f264f6106c0abe29040ee95e7e136bed9fa..89ef9460b5ce64504debf5e20458f7afe7da1ea6 100644
--- a/config/metrics/counts_all/20210216180025_groups_inheriting_microsoft_teams_active.yml
+++ b/config/metrics/counts_all/20210216180025_groups_inheriting_microsoft_teams_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180027_projects_packagist_active.yml b/config/metrics/counts_all/20210216180027_projects_packagist_active.yml
index a009cb2045ecd5a84f38abfc575990794cad13f9..1f9456729cd1795b150cd717c31663544b48be1e 100644
--- a/config/metrics/counts_all/20210216180027_projects_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180027_projects_packagist_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180029_groups_packagist_active.yml b/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
index efcd3dbd39c95e5197892d5292386613edb173d0..195c5718c1b6677231626f24af421bfd2c2b9e05 100644
--- a/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180029_groups_packagist_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180030_templates_packagist_active.yml b/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
index f6a337662b82270676892dcb5a273b1c3ca4a444..2def57be060757fbafe7bbe04591b77ae9906246 100644
--- a/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180030_templates_packagist_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180032_instances_packagist_active.yml b/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
index 41693d7a98490b39c7eb30463798400c4e306a98..cf3eb9049773f36757cc4ac398f1f103dc490b39 100644
--- a/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180032_instances_packagist_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml b/config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml
index 08073ec5aa957f2686313195808465352fa5dea7..7c338ceba6df8518558879f9dc2f5d0cd657c7b2 100644
--- a/config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180034_projects_inheriting_packagist_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml b/config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml
index e431c52ad43e3a1b914a210616cdb090cef960f4..7f53c894fb6760afffad08e6aab0d3d894423cc6 100644
--- a/config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml
+++ b/config/metrics/counts_all/20210216180036_groups_inheriting_packagist_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml b/config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml
index 83f9c5b734254391dc26099084e29a7294675f34..0fa095a27de5186ce6f21f9699ebe47c66e8215c 100644
--- a/config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180038_projects_pipelines_email_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml b/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml
index a705d1e2da660fcfc7ca86f3c6ccd8dc795b16b8..9af7ca2793155a3a4da3595c3ad188ea9b123330 100644
--- a/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180040_groups_pipelines_email_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml b/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml
index df1bf53c012dbd964abee33ed891c5f021b38ea9..2139b3ae6d00ede1ec90da81787bed92e2d63779 100644
--- a/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180041_templates_pipelines_email_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml b/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml
index a759da8865a1b22e121f8da95bad05262175dcb8..39a979e85043d59c6d5e1463859959943798e801 100644
--- a/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180043_instances_pipelines_email_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml b/config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml
index 7f3366977168b1f72fc90f7a210fd417906d3b91..f6c136ae24f1ef04753bf97df47f9830cb30d50c 100644
--- a/config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180045_projects_inheriting_pipelines_email_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml b/config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml
index 049343d22f62a39aa26711f51bd620b995f218e5..2582f65343312d521fd1cdcd5c092203e52855e3 100644
--- a/config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml
+++ b/config/metrics/counts_all/20210216180047_groups_inheriting_pipelines_email_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
index 5330268e0794b252e82ea27c23e4060da70c8b77..9be062f8de9eb5e86c884b7826c45d3b262f3413 100644
--- a/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180049_projects_pivotaltracker_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
index 3d077219657da3a29d5a71888d4b9ffb0df71e96..ba688786b5f619f3519bffee1b09015201a9bf79 100644
--- a/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180051_groups_pivotaltracker_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
index 183417d566c8cf9853359d8ef30cee555015e882..f2babdbcf1a0dbb67614318cf6d9b52df8bd8054 100644
--- a/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180052_templates_pivotaltracker_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml
index adeec68290a8ef5623440da3212d673c1c07bceb..49de98e67018058bfe10e3c4f62e14560b6874ab 100644
--- a/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180054_instances_pivotaltracker_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml
index c9f6ba7680a64bd934c430e29a8472cbbec8b0f4..7f108a6a2c3ca478b77136ddc2a88233553d27e0 100644
--- a/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180056_projects_inheriting_pivotaltracker_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml b/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml
index b247a3b48e4be43ff251eae6baaf654d5ba9f894..5abba518e8ad39f1edc6ad9a566dd44de9c0f52d 100644
--- a/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml
+++ b/config/metrics/counts_all/20210216180058_groups_inheriting_pivotaltracker_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180100_projects_pushover_active.yml b/config/metrics/counts_all/20210216180100_projects_pushover_active.yml
index 1f5635f56da6339d44c00a291e3fd0521ce5c281..8ae09814aae0ada032db87b92bc341c9a1164e03 100644
--- a/config/metrics/counts_all/20210216180100_projects_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180100_projects_pushover_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180102_groups_pushover_active.yml b/config/metrics/counts_all/20210216180102_groups_pushover_active.yml
index 5a8225f97a35fd5c0e09f85573dbc6320f5996c6..bfc825994e49a1de266723b09b00c2766f698dd1 100644
--- a/config/metrics/counts_all/20210216180102_groups_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180102_groups_pushover_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180104_templates_pushover_active.yml b/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
index 79ea70fc7fad3902eeb67d06a3dcee1adb76206e..63476b4e0cdac7001e42dc1e8a516ea6fc585224 100644
--- a/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180104_templates_pushover_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180105_instances_pushover_active.yml b/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
index cfe8f5170d1f1edb7fefe7bfbc5e57e2cb3c4d22..bc793094aa100fbcef2a764aabaa1c9194c8df5f 100644
--- a/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180105_instances_pushover_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml b/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml
index 25942eb52ec551b45cba6ee08ed791c30837933b..38d11261fba58952dbdaa20ab51eb9ad4921db82 100644
--- a/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180107_projects_inheriting_pushover_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml b/config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml
index 941fe56037ae923def867a2bb6dd7a4a8580fdf4..a69ef94d87a77b1b70019ba4d79d61b83747087b 100644
--- a/config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml
+++ b/config/metrics/counts_all/20210216180109_groups_inheriting_pushover_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180111_projects_redmine_active.yml b/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
index b19251acb7987151e9f88cd2b3bd38a6384173e7..eb36236fd064d745992f8264884ae2d6c3940c95 100644
--- a/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180111_projects_redmine_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180113_groups_redmine_active.yml b/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
index 5bb559e9f247d28107e91380367d8c53017f0016..aa62c1f237c7ef802bdbdacbb3c1a4ed2eece5b6 100644
--- a/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180113_groups_redmine_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180115_templates_redmine_active.yml b/config/metrics/counts_all/20210216180115_templates_redmine_active.yml
index 3a173346fa8d136d2ce870c128f670be18f4c83d..9f3705a2a48127054f2aa79ac0f5b1e707550b75 100644
--- a/config/metrics/counts_all/20210216180115_templates_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180115_templates_redmine_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180116_instances_redmine_active.yml b/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
index 17974b6f1575ccf553050a83f3194dfc26de85aa..7280f0f82044c54f5695788fa6c2e2ec7058a9e7 100644
--- a/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180116_instances_redmine_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml b/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml
index 8c94c811d69ac94c0f9ceabf8bafd6c427af2f31..fda80b11b8a6b47e52422ff99a06b4c2e341e32a 100644
--- a/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180118_projects_inheriting_redmine_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml b/config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml
index 459b97667eb024d533d56e37c65b21ef579a85ca..66417c10642069149d67a6b44640ad3326e1c6d7 100644
--- a/config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml
+++ b/config/metrics/counts_all/20210216180120_groups_inheriting_redmine_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180122_projects_slack_active.yml b/config/metrics/counts_all/20210216180122_projects_slack_active.yml
index 4663d4b516c0de1b1b0fd9e95680f42f0684d972..9c62e852b4434bacf6f9319d322b0d28be052d03 100644
--- a/config/metrics/counts_all/20210216180122_projects_slack_active.yml
+++ b/config/metrics/counts_all/20210216180122_projects_slack_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180124_groups_slack_active.yml b/config/metrics/counts_all/20210216180124_groups_slack_active.yml
index 14c7bab4c77571693f289f6bb5de0c6d148a330f..c4cdd4c70b765aeed2eddebaba26d3dbeced07b4 100644
--- a/config/metrics/counts_all/20210216180124_groups_slack_active.yml
+++ b/config/metrics/counts_all/20210216180124_groups_slack_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180126_templates_slack_active.yml b/config/metrics/counts_all/20210216180126_templates_slack_active.yml
index 22a205d7d4ca782c82a3b596b56289a19fcc1ed9..8aca7c44ec2724976770202b3b6f56b6deb16d50 100644
--- a/config/metrics/counts_all/20210216180126_templates_slack_active.yml
+++ b/config/metrics/counts_all/20210216180126_templates_slack_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180127_instances_slack_active.yml b/config/metrics/counts_all/20210216180127_instances_slack_active.yml
index 8c9155ce5abb765216bf98526c545d0b70c85613..6493a89712a66477268eb0dfb1f19d4b96945a54 100644
--- a/config/metrics/counts_all/20210216180127_instances_slack_active.yml
+++ b/config/metrics/counts_all/20210216180127_instances_slack_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml b/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml
index 0b3dae20a6ec6aee78de7cd94be711dad34e313d..89856214e62452424ce19c5c14d2f69c4707034d 100644
--- a/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml
+++ b/config/metrics/counts_all/20210216180129_projects_inheriting_slack_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml b/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml
index 93ca97e00e5f4bdd00920cdec5ee3fa6340a4b94..f2af9cc2bc399e5f3851c9fc31855be5f8f75b7a 100644
--- a/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml
+++ b/config/metrics/counts_all/20210216180131_groups_inheriting_slack_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180133_projects_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180133_projects_slack_slash_commands_active.yml
index d98029d89ad87aaa6e15ceccc1a5c3c60a015313..8d5ddd2da1090ee3a0382e417b3d9108bef48d0a 100644
--- a/config/metrics/counts_all/20210216180133_projects_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180133_projects_slack_slash_commands_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml
index f1434b65fbfb85e60abf498188b1794cc92a2b41..ed2e0a700b9ce99512bfb0e1b1537e73e71c0c6d 100644
--- a/config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180135_groups_slack_slash_commands_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180137_templates_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180137_templates_slack_slash_commands_active.yml
index 48edd9813ef4de2c584ff67848672d9efe372f12..8e26090955e062424789e6279fac72d5353ccd47 100644
--- a/config/metrics/counts_all/20210216180137_templates_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180137_templates_slack_slash_commands_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180138_instances_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180138_instances_slack_slash_commands_active.yml
index 7cd8c1de0be13cce25c9c653816e2a4e9ddebfd3..63ff1e411733d3958feeda563145dca33700a4df 100644
--- a/config/metrics/counts_all/20210216180138_instances_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180138_instances_slack_slash_commands_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml
index c28b0116702d3f4983c599da49d1e701cf59d6e2..f77fb730106163d6815fb66a35222ca59b6bdd2d 100644
--- a/config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180140_projects_inheriting_slack_slash_commands_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml b/config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml
index e94e5d173bd316681da0fdb890df57cf34cf15b8..12d80cc157c345b486bd320dfe0266122c00ac25 100644
--- a/config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml
+++ b/config/metrics/counts_all/20210216180142_groups_inheriting_slack_slash_commands_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml b/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
index 4c6c5c6c5190318fb80331f79a0fa7dc3573d9c9..b333ed1bb53b77fbeecaaf48bc56e5a940a8caad 100644
--- a/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180144_projects_teamcity_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml b/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml
index 20a719dbefbe2ea6d8f93ae290576108d5eb0c55..eccb558f02f46bc506258d3de88040409654130b 100644
--- a/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180146_groups_teamcity_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml b/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
index 5e8ea66b008db3248eee38741c298e4d4937a312..e3864612aa34d295cb8da8ce183014a18c2eae56 100644
--- a/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180148_templates_teamcity_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml b/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml
index f02df75cc87b04ae330a8324c10fa899e1902757..ad961cce922874576e2bc54555b6908ff4daba79 100644
--- a/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180149_instances_teamcity_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml b/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml
index 54121809d981a6174f71f9ed83170866f4c69fdc..be93bc02ba492c247ddc5f27f9acb992fbdc57c1 100644
--- a/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180151_projects_inheriting_teamcity_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml b/config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml
index 33a126b4d0ca80f99836839bed6737ef48cddb60..329154f48d0751abfde84538e47fc0cc3444ff77 100644
--- a/config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml
+++ b/config/metrics/counts_all/20210216180153_groups_inheriting_teamcity_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml b/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml
index be5ddb6089164557bb85a7a3e021e011d165e00f..32296e20f196465bc33f57b50eb3b2982739077d 100644
--- a/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180155_projects_unify_circuit_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml b/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml
index ca03f75a3951f2967d2f6b11b2e38077d6757379..81f3a32578345ba057e44387cac08a3ec6086a6c 100644
--- a/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180157_groups_unify_circuit_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml b/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml
index 77d402bdd52c65981e683746c5ca74c877ae4b01..e47586a4adbee6a810f7d2a676602224c6a95634 100644
--- a/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180159_templates_unify_circuit_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml b/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml
index 7e789cdb67f42de11b1d7321acaed45e07393c7e..7475cd17c6509c781768066e286d32aef4cf5d7a 100644
--- a/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180201_instances_unify_circuit_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml b/config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml
index 4b5e83b2fea60b638d74b929a7bc27ee59159a9f..fce93504c1025cf48eb2b4addb2fd14e17e4176f 100644
--- a/config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180203_projects_inheriting_unify_circuit_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180204_groups_inheriting_unify_circuit_active.yml b/config/metrics/counts_all/20210216180204_groups_inheriting_unify_circuit_active.yml
index 55644e584d6146bb22253131a88bdba2d3309164..4ee6902f7e37fdf4afda552549c13a6e5093e387 100644
--- a/config/metrics/counts_all/20210216180204_groups_inheriting_unify_circuit_active.yml
+++ b/config/metrics/counts_all/20210216180204_groups_inheriting_unify_circuit_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml b/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml
index d6284cb68fd6be65be470412993cd8439b782549..29056da213a8799bd1500ee8f5c9e2b3645039c4 100644
--- a/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180206_projects_webex_teams_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml b/config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml
index 7ef4fe1ca419f0445b7b3e05fc7a88a58a98b5b8..187ae3d63226cef61acadeff13a6bad1a5b41e10 100644
--- a/config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180208_groups_webex_teams_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml b/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml
index e461f99e59608d442a32f9530a0ffa76d10bc249..c43f7ad3ebfe6a851be173546c7b359b48fd4187 100644
--- a/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180210_templates_webex_teams_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml b/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml
index c82e1a34b19f5bf1299b24359ba84b7c3f405a0e..bfcf88b111affb42b65889339b3b170c6c49977a 100644
--- a/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180212_instances_webex_teams_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml b/config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml
index e16b7177fb38fbc8415213de091b21a5568d4284..705aa3190c64879af3986129c15e77142cfc97c3 100644
--- a/config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180214_projects_inheriting_webex_teams_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml b/config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml
index 31737003f3979597661b45b9a141c82d79e0afc9..c14055c5d8f9869d6c3e2aed1457fb82ed4ec8e6 100644
--- a/config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml
+++ b/config/metrics/counts_all/20210216180215_groups_inheriting_webex_teams_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml b/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml
index 9361edb0a122d9120d35836f4be2ad4068c9b877..25e1298436671b1ab7c41c2761160ba7b81c089e 100644
--- a/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180217_projects_youtrack_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml b/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml
index a2fa39722b308a67c3b8d72ea3700ed368f461e1..10b07bb5c029b8173fe7f5791b24f31ec65bc829 100644
--- a/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180219_groups_youtrack_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml b/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml
index bd32fd5eb6e0876fb35aeea085e36fd9f57eb1ce..fff16f6ece41c5db0f4c29c9aeba9794e0cae7e9 100644
--- a/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180221_templates_youtrack_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml b/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml
index cb160d513b02cd3c39fb9d72f736c811162c7e91..14b513317b56154a1b7599c47e649c47f7b0e5f4 100644
--- a/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180223_instances_youtrack_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml b/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml
index 875620ff2ba820f1ba2ced5683ec46c78deda9c3..8f446518109e9ab70bfb930d49006f3657bcf90c 100644
--- a/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180225_projects_inheriting_youtrack_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml b/config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml
index 34f0c8f93fa7b15197f41926e71da22847b76721..87139a187c1f3ba358abd836e99b99a972a1ae5c 100644
--- a/config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml
+++ b/config/metrics/counts_all/20210216180226_groups_inheriting_youtrack_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml b/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
index 8870013fc2b32a32649d5c9871ad886d732b4034..e0f5dd0e82405a385e815334548e5c1eeaff2c00 100644
--- a/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
+++ b/config/metrics/counts_all/20210216180228_projects_jira_server_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml b/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
index adf7098e71cf8d76f5a367c85f983ec47ec043bd..f03a4adac3264d1401f540cfada1f27bf1cd8f47 100644
--- a/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
+++ b/config/metrics/counts_all/20210216180230_projects_jira_cloud_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml b/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml
index 33be7ef4f87b70d9c2f2263c8f07dcfa19c28a4d..02e1eccafee3c740a1d54cd90c35f0df4e4a0114 100644
--- a/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml
+++ b/config/metrics/counts_all/20210216180232_projects_jira_dvcs_cloud_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml b/config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml
index b7fa31e101e6c0620a16a831935659b5ccdece2f..5899537f778f6d84f4353ae48ecd82740e2ea91a 100644
--- a/config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml
+++ b/config/metrics/counts_all/20210216180234_projects_jira_dvcs_server_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180239_personal_snippets.yml b/config/metrics/counts_all/20210216180239_personal_snippets.yml
index ea8404a6163365687fe516c965885ec574bbe0a8..a31a0919ec9ee61bc7e1f6690ef9a90edf6900a8 100644
--- a/config/metrics/counts_all/20210216180239_personal_snippets.yml
+++ b/config/metrics/counts_all/20210216180239_personal_snippets.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180241_project_snippets.yml b/config/metrics/counts_all/20210216180241_project_snippets.yml
index 1f915327d3947a0bad6904d4baa89f853461ee9e..d5ff82c0ae925c6c01ca255b7cae1f341d7df2e1 100644
--- a/config/metrics/counts_all/20210216180241_project_snippets.yml
+++ b/config/metrics/counts_all/20210216180241_project_snippets.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180242_web_ide_commits.yml b/config/metrics/counts_all/20210216180242_web_ide_commits.yml
index c85dd1f876cd1aba5badd8fd3dec549152002667..2fde4424a602a1ee28065a463ea2519448e6e9f3 100644
--- a/config/metrics/counts_all/20210216180242_web_ide_commits.yml
+++ b/config/metrics/counts_all/20210216180242_web_ide_commits.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180244_web_ide_views.yml b/config/metrics/counts_all/20210216180244_web_ide_views.yml
index 222e92482e975468f9c07111d8f6002eb76c3e8f..1b9b7aaab7efb0f3d6d665e74189f06cbe9fe0e2 100644
--- a/config/metrics/counts_all/20210216180244_web_ide_views.yml
+++ b/config/metrics/counts_all/20210216180244_web_ide_views.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml b/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
index c5e50275878a63f6fbb67e2ce03d251c2a5e2b1b..f5cabb039b47ec339eddf03f688b039387aa8fd5 100644
--- a/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
+++ b/config/metrics/counts_all/20210216180246_web_ide_merge_requests.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180248_web_ide_previews.yml b/config/metrics/counts_all/20210216180248_web_ide_previews.yml
index b4c349e5cc31485e39aaea9fc2bd5925f6579333..17d85a7174b0e47221a3a5c473cf0ffd19af6485 100644
--- a/config/metrics/counts_all/20210216180248_web_ide_previews.yml
+++ b/config/metrics/counts_all/20210216180248_web_ide_previews.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180250_web_ide_terminals.yml b/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
index d451222dfd436ba9a1e8449b7476557401dd7548..425e3cd6410a787beb13f007df85accf48a27b80 100644
--- a/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
+++ b/config/metrics/counts_all/20210216180250_web_ide_terminals.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml b/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
index 562f63814875ad85ae39c256e2e196f2b8c05049..f59cb5a868933712a986cf77d15aa02377f273ae 100644
--- a/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
+++ b/config/metrics/counts_all/20210216180252_web_ide_pipelines.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180253_snippet_comment.yml b/config/metrics/counts_all/20210216180253_snippet_comment.yml
index efc079fa13e19ca69e001e0634189b6e66308190..8f657de503783b5ef252e86fae0880eb8e32db3c 100644
--- a/config/metrics/counts_all/20210216180253_snippet_comment.yml
+++ b/config/metrics/counts_all/20210216180253_snippet_comment.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180255_snippet_create.yml b/config/metrics/counts_all/20210216180255_snippet_create.yml
index 4303deb1aeb58ace07043351f973df07a7d2d2ee..9c0e2d5cd4466f0df29671836917fe2d860c5395 100644
--- a/config/metrics/counts_all/20210216180255_snippet_create.yml
+++ b/config/metrics/counts_all/20210216180255_snippet_create.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180257_snippet_update.yml b/config/metrics/counts_all/20210216180257_snippet_update.yml
index d59f2a63a4271405f9e7e0d7c74673d4fec90c63..bee3fb477a698954e998c42e54d6525bb129e269 100644
--- a/config/metrics/counts_all/20210216180257_snippet_update.yml
+++ b/config/metrics/counts_all/20210216180257_snippet_update.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180259_static_site_editor_views.yml b/config/metrics/counts_all/20210216180259_static_site_editor_views.yml
index 684bf25af10962bc5c62f296a97c187f49bd2e45..37d87abf57c344e5af50e5992943ae1f0a6138ef 100644
--- a/config/metrics/counts_all/20210216180259_static_site_editor_views.yml
+++ b/config/metrics/counts_all/20210216180259_static_site_editor_views.yml
@@ -20,3 +20,4 @@ tier:
 performance_indicator_type:
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml b/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
index 046448d551a82a25280131b6f5eacfea18038296..9dda088ef5180c9b60c6d8779265d1b34157677d 100644
--- a/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
+++ b/config/metrics/counts_all/20210216180301_static_site_editor_commits.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml b/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml
index 62741924580caf0331e5aba1e8e9bfcfe709b842..3d9855fc624a789b5f085083998c93e8a9b35f7c 100644
--- a/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml
+++ b/config/metrics/counts_all/20210216180303_static_site_editor_merge_requests.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml b/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml
index ed85c6ba21deff0fd49b447ab1d22a62bd32df0f..cff54148986764d988fef83c0c71127c4615414c 100644
--- a/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml
+++ b/config/metrics/counts_all/20210216180304_user_preferences_user_gitpod_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180306_snippets.yml b/config/metrics/counts_all/20210216180306_snippets.yml
index 5dcf43846e6aee580ba4b62e3b544f668f4322d7..aa98cb23475918726a9084254cd41e1b4197708a 100644
--- a/config/metrics/counts_all/20210216180306_snippets.yml
+++ b/config/metrics/counts_all/20210216180306_snippets.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180316_snippets.yml b/config/metrics/counts_all/20210216180316_snippets.yml
index f975500f3e6eefc22b5c858e83628e4f46cec1bb..cd4324fd20ea0d38aa975fcff5ef140c4a4c11b7 100644
--- a/config/metrics/counts_all/20210216180316_snippets.yml
+++ b/config/metrics/counts_all/20210216180316_snippets.yml
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180410_pool_repositories.yml b/config/metrics/counts_all/20210216180410_pool_repositories.yml
index 06a65c536dd296610adefeab06e9e521d11f19d1..6920977d2ce5943ecace9f256100d092700645c9 100644
--- a/config/metrics/counts_all/20210216180410_pool_repositories.yml
+++ b/config/metrics/counts_all/20210216180410_pool_repositories.yml
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180413_all_searches.yml b/config/metrics/counts_all/20210216180413_all_searches.yml
index b9a3374b333e7a7761583c66b0edd9555c68ee97..ce425b0fe784b2570dc85535622c3313fac2d53c 100644
--- a/config/metrics/counts_all/20210216180413_all_searches.yml
+++ b/config/metrics/counts_all/20210216180413_all_searches.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180414_navbar_searches.yml b/config/metrics/counts_all/20210216180414_navbar_searches.yml
index 5cceeecff8a8f246b81a8c0c9b2a39c271914145..294fac727d6167cebb31eea1280044fd0d96b789 100644
--- a/config/metrics/counts_all/20210216180414_navbar_searches.yml
+++ b/config/metrics/counts_all/20210216180414_navbar_searches.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: counts.navbar_searches
-description: Total Searches using the navbar for All Basic Search and Advanced Search in self-managed and SaaS
+description: Total Searches using the navbar for All Basic Search and Advanced Search
+  in self-managed and SaaS
 product_section: enablement
 product_stage: enablement
 product_group: group::global search
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180416_i_search_total.yml b/config/metrics/counts_all/20210216180416_i_search_total.yml
index 0e8a7cfecf09b978b50f92df1038bfb48a4d2217..27ebfb38c47b273ed40d7960a48d5e80a072c2e2 100644
--- a/config/metrics/counts_all/20210216180416_i_search_total.yml
+++ b/config/metrics/counts_all/20210216180416_i_search_total.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180434_issues_created_from_gitlab_error_tracking_ui.yml b/config/metrics/counts_all/20210216180434_issues_created_from_gitlab_error_tracking_ui.yml
index 67fac53ec4e2df483bcda0c876834330dfa36905..25eec6cd18f6bc111ee0fecf65b5b6f40a880b07 100644
--- a/config/metrics/counts_all/20210216180434_issues_created_from_gitlab_error_tracking_ui.yml
+++ b/config/metrics/counts_all/20210216180434_issues_created_from_gitlab_error_tracking_ui.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180436_issues_with_associated_zoom_link.yml b/config/metrics/counts_all/20210216180436_issues_with_associated_zoom_link.yml
index c840150b20538d18040cd21463cbf96a78dc3b52..8b1ce7afa41f3265c8c30f8ae84bcfa07cb33340 100644
--- a/config/metrics/counts_all/20210216180436_issues_with_associated_zoom_link.yml
+++ b/config/metrics/counts_all/20210216180436_issues_with_associated_zoom_link.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180438_issues_using_zoom_quick_actions.yml b/config/metrics/counts_all/20210216180438_issues_using_zoom_quick_actions.yml
index e69555757d8c5ded3a0f2ad47bb9384ce3e24f0d..f3cd37a90c3a309dbbc9ee1c30417daee231208a 100644
--- a/config/metrics/counts_all/20210216180438_issues_using_zoom_quick_actions.yml
+++ b/config/metrics/counts_all/20210216180438_issues_using_zoom_quick_actions.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180440_issues_with_embedded_grafana_charts_approx.yml b/config/metrics/counts_all/20210216180440_issues_with_embedded_grafana_charts_approx.yml
index aebb69d4fe74f989b2772cd61b3a894b7efc6e39..11915b55b5881b079f80b3a089fbdee4fa0195a0 100644
--- a/config/metrics/counts_all/20210216180440_issues_with_embedded_grafana_charts_approx.yml
+++ b/config/metrics/counts_all/20210216180440_issues_with_embedded_grafana_charts_approx.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml b/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml
index dcce2f4e36686b1fb7c2f7f26337e753326c3222..182884b61525d1593eca0a77b5f52cac575decbd 100644
--- a/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml
+++ b/config/metrics/counts_all/20210216180441_issues_created_from_alerts.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180443_issues_created_gitlab_alerts.yml b/config/metrics/counts_all/20210216180443_issues_created_gitlab_alerts.yml
index 373a5e6c262f93bfe3b0fa8e0e7506187ff965fd..e028f6a625ce9ee2f73acfe64823286cef5fbc97 100644
--- a/config/metrics/counts_all/20210216180443_issues_created_gitlab_alerts.yml
+++ b/config/metrics/counts_all/20210216180443_issues_created_gitlab_alerts.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180445_issues_created_manually_from_alerts.yml b/config/metrics/counts_all/20210216180445_issues_created_manually_from_alerts.yml
index a72f821f1e7718fd828b35b6135d05a4f3e93031..779f4e4b68cb6ca718f044a52036874681b1d682 100644
--- a/config/metrics/counts_all/20210216180445_issues_created_manually_from_alerts.yml
+++ b/config/metrics/counts_all/20210216180445_issues_created_manually_from_alerts.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180447_incident_issues.yml b/config/metrics/counts_all/20210216180447_incident_issues.yml
index bc3dd346e4d849defe2922a9e8e307bb8446a683..2fcfc8049e3569713706489e1622852a1e7d90d2 100644
--- a/config/metrics/counts_all/20210216180447_incident_issues.yml
+++ b/config/metrics/counts_all/20210216180447_incident_issues.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180449_alert_bot_incident_issues.yml b/config/metrics/counts_all/20210216180449_alert_bot_incident_issues.yml
index 5fa90b9f6c127635a953a9a878b03ed5c4fbd227..087af80eabf19ea28cf68ad1d13f28f892b25b2e 100644
--- a/config/metrics/counts_all/20210216180449_alert_bot_incident_issues.yml
+++ b/config/metrics/counts_all/20210216180449_alert_bot_incident_issues.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180451_incident_labeled_issues.yml b/config/metrics/counts_all/20210216180451_incident_labeled_issues.yml
index 9764d0cba4cde69d405042463ab4cbdba95b0449..80405762443aa7021a2783f4df5f3077ab7aa63e 100644
--- a/config/metrics/counts_all/20210216180451_incident_labeled_issues.yml
+++ b/config/metrics/counts_all/20210216180451_incident_labeled_issues.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml b/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml
index 10f2abcfb849d816d2ffd2bffc40407a292b1cb2..f199df997d4c3a3abf3df97631cb71991692d521 100644
--- a/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml
+++ b/config/metrics/counts_all/20210216180453_projects_creating_incidents.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180454_projects_with_error_tracking_enabled.yml b/config/metrics/counts_all/20210216180454_projects_with_error_tracking_enabled.yml
index c5c4a1e90bf5bfcde9f52a81caece736725b4932..cfedcabdbd334ce0793c85a1c3f1ae316efb1f25 100644
--- a/config/metrics/counts_all/20210216180454_projects_with_error_tracking_enabled.yml
+++ b/config/metrics/counts_all/20210216180454_projects_with_error_tracking_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml b/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml
index f162e767cbee519eae34f40320490bf8dda3267f..609760e25c6ea4ed3d23c07ea9045d2c9d12ab5b 100644
--- a/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml
+++ b/config/metrics/counts_all/20210216180456_projects_with_alerts_service_enabled.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml b/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml
index bfca848f0fdfd2333e1c70b68694cdc509523d0b..f725272551c03a8cf733de94d62b0e49cad41143 100644
--- a/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml
+++ b/config/metrics/counts_all/20210216180458_projects_with_alerts_created.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180500_projects_with_enabled_alert_integrations.yml b/config/metrics/counts_all/20210216180500_projects_with_enabled_alert_integrations.yml
index 6b37f627c954ed9806935316a1df5ef8e0b75c87..bf47d0e584019f96aee77754507374c6a812980f 100644
--- a/config/metrics/counts_all/20210216180500_projects_with_enabled_alert_integrations.yml
+++ b/config/metrics/counts_all/20210216180500_projects_with_enabled_alert_integrations.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180517_projects_with_error_tracking_enabled.yml b/config/metrics/counts_all/20210216180517_projects_with_error_tracking_enabled.yml
index b6de290e3ee35872122742886cbad7662a86f661..6e6e1c19d457421c502bea8b16b2295d518bb548 100644
--- a/config/metrics/counts_all/20210216180517_projects_with_error_tracking_enabled.yml
+++ b/config/metrics/counts_all/20210216180517_projects_with_error_tracking_enabled.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180518_projects_with_incidents.yml b/config/metrics/counts_all/20210216180518_projects_with_incidents.yml
index 5ed0d61b5d1a8facb98a214bc05676b8364c4611..d375aa0d49f7c14e928d4dbb2b786608aa6e8751 100644
--- a/config/metrics/counts_all/20210216180518_projects_with_incidents.yml
+++ b/config/metrics/counts_all/20210216180518_projects_with_incidents.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml b/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml
index 9a0d7e145660fa6ac8bb3959028f576846b5d3a9..cd23a79f23cde4bd4d085d7cc3e7589598bdef9d 100644
--- a/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml
+++ b/config/metrics/counts_all/20210216180520_projects_with_alert_incidents.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml b/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml
index 967e060db39ff824136bb754fcbc72bdec3841ec..87b8fe61ea9fba55a3e13216d5eb5ef8ef3d8629 100644
--- a/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml
+++ b/config/metrics/counts_all/20210216180628_projects_imported_from_github.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180630_projects_imported_from_github.yml b/config/metrics/counts_all/20210216180630_projects_imported_from_github.yml
index 51dd7a63ba47b4c2ca4c2a12e30b96cc540ed11e..d28483d96ba4da10c3d7d6fbe0242d24b1b0dace 100644
--- a/config/metrics/counts_all/20210216180630_projects_imported_from_github.yml
+++ b/config/metrics/counts_all/20210216180630_projects_imported_from_github.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml b/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml
index f2ee013002c54eafd12454af561b634cb3af64ac..95f1acc625474e9fe7838a932754f243c024b5ca 100644
--- a/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml
+++ b/config/metrics/counts_all/20210216180632_unique_users_all_imports.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180634_gitlab.yml b/config/metrics/counts_all/20210216180634_gitlab.yml
index c578ff7bab0183f55a29d3a3de0c208327cfaa1a..c157ae84873a47a9515d0d8a637d55ffb8d0fec8 100644
--- a/config/metrics/counts_all/20210216180634_gitlab.yml
+++ b/config/metrics/counts_all/20210216180634_gitlab.yml
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180636_gitlab_v1.yml b/config/metrics/counts_all/20210216180636_gitlab_v1.yml
index 80cf9db3e46e45264a69f67d516babcd240ad685..c20a53d70077edf6ac4338c7840629874cd5e862 100644
--- a/config/metrics/counts_all/20210216180636_gitlab_v1.yml
+++ b/config/metrics/counts_all/20210216180636_gitlab_v1.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180638_gitlab_project.yml b/config/metrics/counts_all/20210216180638_gitlab_project.yml
index 60f3a0e6bd617635056ba9431692f3215f040238..7163012b9d22b1d671d132178eb245ff9e44eb66 100644
--- a/config/metrics/counts_all/20210216180638_gitlab_project.yml
+++ b/config/metrics/counts_all/20210216180638_gitlab_project.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180639_gitlab.yml b/config/metrics/counts_all/20210216180639_gitlab.yml
index 66b4511cc759867277dd0c8020e621288d612621..e0852a13b37da42bbc820fe0ae41f45775036cbd 100644
--- a/config/metrics/counts_all/20210216180639_gitlab.yml
+++ b/config/metrics/counts_all/20210216180639_gitlab.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180641_github.yml b/config/metrics/counts_all/20210216180641_github.yml
index 6ebb762be0d6476d13e23af95f4df55a672772f3..e34d73c118e6e4cdafea1eab1cb2acc6e645c4ad 100644
--- a/config/metrics/counts_all/20210216180641_github.yml
+++ b/config/metrics/counts_all/20210216180641_github.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180643_bitbucket.yml b/config/metrics/counts_all/20210216180643_bitbucket.yml
index 1b683d1414d156d08b698f99c249abfb4dca7f10..cf4aebc8da8915d5553a0db942c11bfe9d761f06 100644
--- a/config/metrics/counts_all/20210216180643_bitbucket.yml
+++ b/config/metrics/counts_all/20210216180643_bitbucket.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180645_bitbucket_server.yml b/config/metrics/counts_all/20210216180645_bitbucket_server.yml
index a7d6481a0d1b5d63672e9387316e0f96843c1abc..906771490e888bc89fd9a305f55e9ae44eb833f6 100644
--- a/config/metrics/counts_all/20210216180645_bitbucket_server.yml
+++ b/config/metrics/counts_all/20210216180645_bitbucket_server.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180647_gitea.yml b/config/metrics/counts_all/20210216180647_gitea.yml
index 4cf1ebfd78fe27f7fb05bb8a919ab788443ec0b2..d4260d42cf0daec4e9b7da8e139347cc1a0a56f9 100644
--- a/config/metrics/counts_all/20210216180647_gitea.yml
+++ b/config/metrics/counts_all/20210216180647_gitea.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180649_git.yml b/config/metrics/counts_all/20210216180649_git.yml
index 9c60f4a230262df827aa10275a54623e46519d6e..03b3f7f348166fcdcc3610b724a54d26d09963de 100644
--- a/config/metrics/counts_all/20210216180649_git.yml
+++ b/config/metrics/counts_all/20210216180649_git.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180650_manifest.yml b/config/metrics/counts_all/20210216180650_manifest.yml
index ee1037328deaad7cc53564338377d8cced317245..26429d863a3e73bf07a441baf3e3bbd75f0053cd 100644
--- a/config/metrics/counts_all/20210216180650_manifest.yml
+++ b/config/metrics/counts_all/20210216180650_manifest.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180652_gitlab_migration.yml b/config/metrics/counts_all/20210216180652_gitlab_migration.yml
index 8aa45dee4346c30f49d8491ba88339fff50c3592..d40fb3b248424b9a0ed899c5decb5a5bd8f2e2fc 100644
--- a/config/metrics/counts_all/20210216180652_gitlab_migration.yml
+++ b/config/metrics/counts_all/20210216180652_gitlab_migration.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180654_jira.yml b/config/metrics/counts_all/20210216180654_jira.yml
index 7c7a2739576858423f76c4a8eab87d91aebd7523..bc5311ecdd4b49dde19dd42269bd07eaa1d03e58 100644
--- a/config/metrics/counts_all/20210216180654_jira.yml
+++ b/config/metrics/counts_all/20210216180654_jira.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180656_fogbugz.yml b/config/metrics/counts_all/20210216180656_fogbugz.yml
index 2d4e5ddcc0210d2501123a0775016579cc6b9f9f..9ab769a65fba8efd5f63a6722a1b9c802bfa1d75 100644
--- a/config/metrics/counts_all/20210216180656_fogbugz.yml
+++ b/config/metrics/counts_all/20210216180656_fogbugz.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180658_phabricator.yml b/config/metrics/counts_all/20210216180658_phabricator.yml
index e5cdd3f382baf3375bc24f234eaed0b3a2e7f936..79e9f388c613c2e35c8792b6a7b7ad8de22f9fd0 100644
--- a/config/metrics/counts_all/20210216180658_phabricator.yml
+++ b/config/metrics/counts_all/20210216180658_phabricator.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180700_csv.yml b/config/metrics/counts_all/20210216180700_csv.yml
index b69251a5b0b4f1cfa258174d14484a5928b16a9f..6b20096987b8378fbf7bfac30d9f26c45699c4cf 100644
--- a/config/metrics/counts_all/20210216180700_csv.yml
+++ b/config/metrics/counts_all/20210216180700_csv.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180702_group_import.yml b/config/metrics/counts_all/20210216180702_group_import.yml
index 45e2650d69e4e1a96b119d31182f52b84fbb4bb4..36949d4480815eeadfb8b0396d424c96f1e870b3 100644
--- a/config/metrics/counts_all/20210216180702_group_import.yml
+++ b/config/metrics/counts_all/20210216180702_group_import.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180703_gitlab_migration.yml b/config/metrics/counts_all/20210216180703_gitlab_migration.yml
index 10b549ca252ee1065092a11b096ef23bd0a65d81..ab4acf2a2bec9d8aff6f2930ea1c01b9e076afcd 100644
--- a/config/metrics/counts_all/20210216180703_gitlab_migration.yml
+++ b/config/metrics/counts_all/20210216180703_gitlab_migration.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180705_total.yml b/config/metrics/counts_all/20210216180705_total.yml
index ca7cab549c170020f32f8d624f0c2df9c42839ea..5d76fd3873b102d87d47e81203d66660111312cc 100644
--- a/config/metrics/counts_all/20210216180705_total.yml
+++ b/config/metrics/counts_all/20210216180705_total.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180707_gitlab_project.yml b/config/metrics/counts_all/20210216180707_gitlab_project.yml
index 3ed628fd20d10c65e07d6b4d3e0649752ed60dc2..f0d513e80b37b10534669f899cb981c353a46d1f 100644
--- a/config/metrics/counts_all/20210216180707_gitlab_project.yml
+++ b/config/metrics/counts_all/20210216180707_gitlab_project.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage.manage.projects_imported.gitlab_project
-description: 'Distinct count of users that imported projects using Project Import/Export'
+description: Distinct count of users that imported projects using Project Import/Export
 product_section: dev
 product_stage: manage
 product_group: group::import
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180709_gitlab.yml b/config/metrics/counts_all/20210216180709_gitlab.yml
index d8c23badb74c3624017e4a5e6e75152a2c126516..ea5e3b257757fb9cc7e545da462208b02387f0bf 100644
--- a/config/metrics/counts_all/20210216180709_gitlab.yml
+++ b/config/metrics/counts_all/20210216180709_gitlab.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage.manage.projects_imported.gitlab
-description: 'Distinct count of users that imported projects from GitLab.com'
+description: Distinct count of users that imported projects from GitLab.com
 product_section: dev
 product_stage: manage
 product_group: group::import
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180711_github.yml b/config/metrics/counts_all/20210216180711_github.yml
index 4c7444c7805a2a8eba5a391396c559b23948bd69..cd3fd06d0576a0cab0e873571ac311bd08338a2c 100644
--- a/config/metrics/counts_all/20210216180711_github.yml
+++ b/config/metrics/counts_all/20210216180711_github.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180713_bitbucket.yml b/config/metrics/counts_all/20210216180713_bitbucket.yml
index 2d3dc15432484e49e72319e2d800f7a58a55f9cb..d0eb23fc41a9ff4f10371c52e484303c5395f6ce 100644
--- a/config/metrics/counts_all/20210216180713_bitbucket.yml
+++ b/config/metrics/counts_all/20210216180713_bitbucket.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage.manage.projects_imported.bitbucket
-description: 'Distinct count of users that imported projects from Bitbucket Cloud'
+description: Distinct count of users that imported projects from Bitbucket Cloud
 product_section: dev
 product_stage: manage
 product_group: group::import
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180715_bitbucket_server.yml b/config/metrics/counts_all/20210216180715_bitbucket_server.yml
index 82a675b5428d2555ae06dd76e86c5edb137782a8..9a3de0cb33051cc16720fbb7cfadba787c19a457 100644
--- a/config/metrics/counts_all/20210216180715_bitbucket_server.yml
+++ b/config/metrics/counts_all/20210216180715_bitbucket_server.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage.manage.projects_imported.bitbucket_server
-description: 'Distinct count of users that imported projects from Bitbucket Server'
+description: Distinct count of users that imported projects from Bitbucket Server
 product_section: dev
 product_stage: manage
 product_group: group::import
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180716_gitea.yml b/config/metrics/counts_all/20210216180716_gitea.yml
index 50d5923e3772200e98a951f638a86bb14382290c..b107b213a30d64c6026a912997b22ff627b796f4 100644
--- a/config/metrics/counts_all/20210216180716_gitea.yml
+++ b/config/metrics/counts_all/20210216180716_gitea.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage.manage.projects_imported.gitea
-description: 'Distinct count of users that imported projects from Gitea'
+description: Distinct count of users that imported projects from Gitea
 product_section: dev
 product_stage: manage
 product_group: group::import
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180718_git.yml b/config/metrics/counts_all/20210216180718_git.yml
index f9f648bb713d3ab9d18aa8cb498a4bc85378f6c9..0cd399a65ec8bb3a960e50a85325ae7531854949 100644
--- a/config/metrics/counts_all/20210216180718_git.yml
+++ b/config/metrics/counts_all/20210216180718_git.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage.manage.projects_imported.git
-description: 'Distinct count of users that imported projects using Import by URL'
+description: Distinct count of users that imported projects using Import by URL
 product_section: dev
 product_stage: manage
 product_group: group::import
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180720_manifest.yml b/config/metrics/counts_all/20210216180720_manifest.yml
index 28b689eddcfe9e63dfd530d2c6cb571f31a00a3a..b91ae015f6ef9f6b5f1a97c82f5343bc86074870 100644
--- a/config/metrics/counts_all/20210216180720_manifest.yml
+++ b/config/metrics/counts_all/20210216180720_manifest.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage.manage.projects_imported.manifest
-description: 'Distinct count of users that imported projects using Manifest file'
+description: Distinct count of users that imported projects using Manifest file
 product_section: dev
 product_stage: manage
 product_group: group::import
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180722_jira.yml b/config/metrics/counts_all/20210216180722_jira.yml
index add51bcf494dca1bdf07f6d30cbc8b45327b45c5..89ea9da081d8c583cde69b02d481d1ee70c48879 100644
--- a/config/metrics/counts_all/20210216180722_jira.yml
+++ b/config/metrics/counts_all/20210216180722_jira.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180724_fogbugz.yml b/config/metrics/counts_all/20210216180724_fogbugz.yml
index 45dd4ee1f50aabc2d8e8542a736f03752c392a33..e9cb3159301014fe234df4ab71e807b43a35cc30 100644
--- a/config/metrics/counts_all/20210216180724_fogbugz.yml
+++ b/config/metrics/counts_all/20210216180724_fogbugz.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage.manage.issues_imported.fogbugz
-description: 'Distinct count of users that imported issues into projects using FogBugz'
+description: Distinct count of users that imported issues into projects using FogBugz
 product_section: dev
 product_stage: manage
 product_group: group::import
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180726_phabricator.yml b/config/metrics/counts_all/20210216180726_phabricator.yml
index c006ac22b7536942b419bc2452f23deabd320b06..933047aff583f9c59b5372cd5497c6585fe3abd7 100644
--- a/config/metrics/counts_all/20210216180726_phabricator.yml
+++ b/config/metrics/counts_all/20210216180726_phabricator.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180727_csv.yml b/config/metrics/counts_all/20210216180727_csv.yml
index 6a6f16e09ef63d767c14c4d42a66ab973b422e1d..e6bc3eba97354dffa4e9dd9812b3bd404f936597 100644
--- a/config/metrics/counts_all/20210216180727_csv.yml
+++ b/config/metrics/counts_all/20210216180727_csv.yml
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180729_groups_imported.yml b/config/metrics/counts_all/20210216180729_groups_imported.yml
index 04e1febb4379bb66b860042a10d094f4c798a93a..32e968c76e23e4113e822ec871b2b85d6e09ecdb 100644
--- a/config/metrics/counts_all/20210216180729_groups_imported.yml
+++ b/config/metrics/counts_all/20210216180729_groups_imported.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180734_wiki_pages_create.yml b/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
index 25326291509c143a89e6b1d2703da578fb22dc34..e21c5065e3f0aa0861987752c2fb4a81c829278b 100644
--- a/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
+++ b/config/metrics/counts_all/20210216180734_wiki_pages_create.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180736_wiki_pages_update.yml b/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
index 82736e363ae61c43cfb0e0f70bc3a51cbfe0cb0f..138c849da6196ee416ba5accf95249ad45edb8e7 100644
--- a/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
+++ b/config/metrics/counts_all/20210216180736_wiki_pages_update.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml b/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
index 26b88ba5c9fc2222e04416214d4aab290f2d52f3..4f2071cfc56e7663697594868037839e63692298 100644
--- a/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
+++ b/config/metrics/counts_all/20210216180738_wiki_pages_delete.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180740_design_management_designs_create.yml b/config/metrics/counts_all/20210216180740_design_management_designs_create.yml
index 3332d1963ba4f5d66b20ac9042a50f9ecf1ad256..f9a258917c1f80d8cdbe3893364c998346a73555 100644
--- a/config/metrics/counts_all/20210216180740_design_management_designs_create.yml
+++ b/config/metrics/counts_all/20210216180740_design_management_designs_create.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180741_design_management_designs_update.yml b/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
index 3911079ef56ed39f823ba87e33d41736f11528de..64275cda6f31b948bbc60ade0e3ae1f018e7d626 100644
--- a/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
+++ b/config/metrics/counts_all/20210216180741_design_management_designs_update.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml b/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
index c6900276ef7a9e061e321a3f3d203fcb05559147..830793d027976262faa2a4fcb5f461692b8baeda 100644
--- a/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
+++ b/config/metrics/counts_all/20210216180743_design_management_designs_delete.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180750_groups.yml b/config/metrics/counts_all/20210216180750_groups.yml
index 6163cbab8ad5139d2171fdfee23b09c6b999f2f0..40800b492213632d4a54037ea62ef0a98f0a95f7 100644
--- a/config/metrics/counts_all/20210216180750_groups.yml
+++ b/config/metrics/counts_all/20210216180750_groups.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180752_keys.yml b/config/metrics/counts_all/20210216180752_keys.yml
index d105e047d4955f7cbf090897dd7b02b7b85bf546..4d6d5b4f0c720a66ddb8dcdf92a3db742bdd7f6a 100644
--- a/config/metrics/counts_all/20210216180752_keys.yml
+++ b/config/metrics/counts_all/20210216180752_keys.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180754_events.yml b/config/metrics/counts_all/20210216180754_events.yml
index 8d1a58f1820a38b9873cb40f9a20bb6eaa630ad8..19d9864ca318f80e1aecee5eee3ba2580b82082a 100644
--- a/config/metrics/counts_all/20210216180754_events.yml
+++ b/config/metrics/counts_all/20210216180754_events.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180756_groups.yml b/config/metrics/counts_all/20210216180756_groups.yml
index 938a95c59110e29e6d26b54f139a8e1828b06a74..fbd244b5078f787b8620f3b83b42bf30c2a5786f 100644
--- a/config/metrics/counts_all/20210216180756_groups.yml
+++ b/config/metrics/counts_all/20210216180756_groups.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180758_users_created.yml b/config/metrics/counts_all/20210216180758_users_created.yml
index 816887531b6155bc9a50970fd1bb2ab6745abf18..f160f72f85bccf8b08604e6e76759db28e079eca 100644
--- a/config/metrics/counts_all/20210216180758_users_created.yml
+++ b/config/metrics/counts_all/20210216180758_users_created.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml b/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
index f46bc3b8566300b2f09128cbb1b40ddf73423e21..2aea7f78569a74d39227480ef13539ac42b9f3ba 100644
--- a/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
+++ b/config/metrics/counts_all/20210216180927_grafana_integrated_projects.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.grafana_integrated_projects
 description: Total Grafana integrations attached to projects
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml b/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
index 211115a08565a30a049b3ea62f17419031c43013..9289a2e773e667df865ae4a7749a39993abc58da 100644
--- a/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_all/20210216180929_projects_with_tracing_enabled.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_with_tracing_enabled
 description: Projects with tracing enabled
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: tracing
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml b/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml
index 9b4c7e4e1452fb0bc708bbec18b9a34d068049bf..7b800fd9240facd85d299bdbecf5f538d9f4ecb7 100644
--- a/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180931_projects_prometheus_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_prometheus_active
 description: Count of projects with active integrations for Prometheus
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml b/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml
index 44f7150cb66c40b1bbcb61e763214fdfdcebcb5d..5f084a84f57913986662b0e009b743f4b9d317aa 100644
--- a/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180933_groups_prometheus_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_prometheus_active
 description: Count of groups with active integrations for Prometheus
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml b/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml
index eba4f2f5741b441763f06f10fbbf67b0b7d19cba..ccd73b22e2add4f63fb0ea3c18358943ca3fa80c 100644
--- a/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180934_templates_prometheus_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.templates_prometheus_active
 description: Count of active service templates for Prometheus
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml b/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
index 3c03a3b2eae6d99981222f0e799ae7070665fd77..c7b15121df3e0e5eb1ffb45bd04d25dcb79815b1 100644
--- a/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180936_instances_prometheus_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.instances_prometheus_active
 description: Count of active instance-level integrations for Prometheus
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml b/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml
index d89a809a613e83b35c861e81aeb10b92cbd9d54a..2f5bdf392a5469e8dfcafb8eddc14475a3fbe3b5 100644
--- a/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180938_projects_inheriting_prometheus_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.projects_inheriting_prometheus_active
 description: Count of active projects inheriting integrations for Prometheus
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml b/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml
index 0d3f11e9a1ae3ea177dd51ccabc793d5f9c35630..bd2b54244e21f8b0a51c4575282df47d588896e5 100644
--- a/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml
+++ b/config/metrics/counts_all/20210216180940_groups_inheriting_prometheus_active.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.groups_inheriting_prometheus_active
 description: Count of active groups inheriting integrations for Prometheus
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml b/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
index 3038e53932c8f331651f3ddc2997f60c8b91f608..2403e85554700e92574bee220ec9c775efb325c5 100644
--- a/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_all/20210216180942_operations_dashboard_default_dashboard.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.operations_dashboard_default_dashboard
 description: Active users with enabled operations dashboard
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml b/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml
index 4802532c053c823e23404ab482ad9e766fbe69ef..244441dfec94de826c2d8be8b87c16b43b8a9e32 100644
--- a/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml
+++ b/config/metrics/counts_all/20210216180944_operations_dashboard_users_with_projects_added.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: counts.operations_dashboard_users_with_projects_added
 description: Active users with projects on operations dashboard
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180945_clusters.yml b/config/metrics/counts_all/20210216180945_clusters.yml
index 2294cd5e1de588eb2d95ca0cf174620d6a2cdead..ad31e5baaba07b2deefff699aaa4b42555805daa 100644
--- a/config/metrics/counts_all/20210216180945_clusters.yml
+++ b/config/metrics/counts_all/20210216180945_clusters.yml
@@ -11,9 +11,10 @@ status: data_available
 time_frame: all
 data_source: database
 distribution:
-  - ce
-  - ee
+- ce
+- ee
 tier:
-  - free
-  - premium
-  - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml b/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
index a921b517b40927e29af87523f8cb1270d737afce..4eaf4177888becbc981070047dcc4dbaf168ef23 100644
--- a/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
+++ b/config/metrics/counts_all/20210216180947_clusters_applications_prometheus.yml
@@ -11,9 +11,10 @@ status: data_available
 time_frame: all
 data_source: database
 distribution:
-  - ce
-  - ee
+- ce
+- ee
 tier:
-  - free
-  - premium
-  - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml b/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
index 278cd3d63370c64f0b3781cc7a04f7c624da5a5d..bd7e1aee0f57fff472e064ad659b44c182d0d6d2 100644
--- a/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
+++ b/config/metrics/counts_all/20210216180949_operations_dashboard_default_dashboard.yml
@@ -11,8 +11,9 @@ status: data_available
 time_frame: all
 data_source: database
 distribution:
-  - ce
-  - ee
+- ce
+- ee
 tier:
-  - free
-  - premium
+- free
+- premium
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml b/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
index 6d1d00cd1e3fbe8a7d08b252439a14f671d61bf5..bee04c0f88bab2356c0f7cb6e75f0d80f837a192 100644
--- a/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
+++ b/config/metrics/counts_all/20210216180951_projects_with_tracing_enabled.yml
@@ -11,9 +11,10 @@ status: data_available
 time_frame: all
 data_source: database
 distribution:
-  - ce
-  - ee
+- ce
+- ee
 tier:
-  - free
-  - premium
-  - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml b/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml
index 13971a4fc71d01ac6244738ac2c0960c90603a7c..5f8d7a53c7e18c8706acb33a32eaa905da1f0e9c 100644
--- a/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml
+++ b/config/metrics/counts_all/20210216180953_operations_dashboard_users_with_projects_added.yml
@@ -11,9 +11,10 @@ status: data_available
 time_frame: all
 data_source: database
 distribution:
-  - ce
-  - ee
+- ce
+- ee
 tier:
-  - free
-  - premium
-  - ultimate
+- free
+- premium
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181009_lfs_objects.yml b/config/metrics/counts_all/20210216181009_lfs_objects.yml
index cb8b2fc547493053904751fe68d014225c9b01b9..ec667b9fb9403d6e27302778b118682d715ae2ba 100644
--- a/config/metrics/counts_all/20210216181009_lfs_objects.yml
+++ b/config/metrics/counts_all/20210216181009_lfs_objects.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: counts.lfs_objects
-description: 
+description:
 product_section: ops
 product_stage: create
 product_group: group::create
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
@@ -16,3 +16,4 @@ tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181011_projects_with_packages.yml b/config/metrics/counts_all/20210216181011_projects_with_packages.yml
index 59edfc3634d2051dcab96567c48bc06d7cf522cb..a88af256510c93313fce7fe38a7d5c01617f45b9 100644
--- a/config/metrics/counts_all/20210216181011_projects_with_packages.yml
+++ b/config/metrics/counts_all/20210216181011_projects_with_packages.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181012_packages.yml b/config/metrics/counts_all/20210216181012_packages.yml
index ec5e1ae783165dbf7ee36efa69000ad4ff041978..82437eb0f7c1189499927c9a8835581ace8ec297 100644
--- a/config/metrics/counts_all/20210216181012_packages.yml
+++ b/config/metrics/counts_all/20210216181012_packages.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml b/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
index 14cefebb51435821481da82065f28a348e2aae84..42b62a8bd2f2819f76f3dd7ccfb5a46e6a2dc429 100644
--- a/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
+++ b/config/metrics/counts_all/20210216181014_projects_with_expiration_policy_disabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml b/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml
index 54ab06ea5c46448a9642ec403e7880075989fbf3..029bde8e35d30083b7503958a8cb5a419cae7707 100644
--- a/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml
+++ b/config/metrics/counts_all/20210216181016_projects_with_expiration_policy_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml b/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml
index 3b742c6875810a85440560845d503fbd751a1288..4bd5870dff8ecc5aeea6600b867f407e215afab5 100644
--- a/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml
+++ b/config/metrics/counts_all/20210216181018_projects_with_expiration_policy_enabled_with_keep_n_set_to_1.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml b/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml
index 1681e2c642e54580f5cff199d1caac9886d7e95d..072a755004885d4f74868ce1060779be5abc688c 100644
--- a/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml
+++ b/config/metrics/counts_all/20210216181020_projects_with_expiration_policy_enabled_with_keep_n_set_to_5.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml b/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml
index 3f5ee49993ae3aa850073776d62658b4bcb584e7..7e1f4f600d4dbe4211134c94ecea93912ed68be6 100644
--- a/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml
+++ b/config/metrics/counts_all/20210216181022_projects_with_expiration_policy_enabled_with_keep_n_set_to_10.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml b/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml
index a18a4fa12d8b92f303db3c7de6fadd1dee919156..a3c03f2b9cde85c20782b3bd73693aae186b8250 100644
--- a/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml
+++ b/config/metrics/counts_all/20210216181024_projects_with_expiration_policy_enabled_with_keep_n_set_to_25.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml b/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml
index bd7d576520e7d3d2ef364edbf37d4a4620bc1933..15a69f8612b94b6ec01ab0d4d125e3a11b6beba7 100644
--- a/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml
+++ b/config/metrics/counts_all/20210216181025_projects_with_expiration_policy_enabled_with_keep_n_set_to_50.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml b/config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml
index 420c428e46c0fbad07932405d45e81bed766bbae..2c1e0a1176d7ae9c58d1c9bad102838dafdcced4 100644
--- a/config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml
+++ b/config/metrics/counts_all/20210216181027_projects_with_expiration_policy_enabled_with_keep_n_set_to_100.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml b/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml
index 21cd670e5aa8cfc2bb60cd41ede9213605db5edf..e2c41f2a39372e5f4464da12dcdb253d4796e807 100644
--- a/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml
+++ b/config/metrics/counts_all/20210216181029_projects_with_expiration_policy_enabled_with_cadence_set_to_1d.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml b/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml
index d6b0d0dc1d6887f77d2dddfca1ce909789120c9c..bf6aa97530145f5a90c53e31ed9a6cd8f31ee872 100644
--- a/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml
+++ b/config/metrics/counts_all/20210216181031_projects_with_expiration_policy_enabled_with_cadence_set_to_7d.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml b/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml
index 9c4d4b83be94d051e20a69d9b630f6e7c311e46e..29aa7d65c5dab70fb02726aead0e1e9459da754b 100644
--- a/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml
+++ b/config/metrics/counts_all/20210216181033_projects_with_expiration_policy_enabled_with_cadence_set_to_14d.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml b/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml
index 963665a5ee0cdd9e1168e11603068602929c36a0..e40b0414d1a2030c684054bb0dd71342678ba96c 100644
--- a/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml
+++ b/config/metrics/counts_all/20210216181035_projects_with_expiration_policy_enabled_with_cadence_set_to_1month.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml b/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml
index 8fa068bb372f3aab5cc54ab29f05d61af32f9d2d..d6d3c3aad89b0acd6c74abb9d29bb3becd96fc7f 100644
--- a/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml
+++ b/config/metrics/counts_all/20210216181037_projects_with_expiration_policy_enabled_with_cadence_set_to_3month.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml b/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml
index 3742446b11ad43f491710903d9da50719b09186b..409279f2b4ddaf2d902820f41df1ade76da90c79 100644
--- a/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml
+++ b/config/metrics/counts_all/20210216181038_projects_with_expiration_policy_enabled_with_older_than_set_to_7d.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: counts.projects_with_expiration_policy_enabled_with_older_than_set_to_7d
-description: A count of projects with the cleanup policy set delete tags older than 7 days
+description: A count of projects with the cleanup policy set delete tags older than
+  7 days
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml b/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml
index 1216a041bfb3b1cf9963b752e35f4061d7499429..ee2bbbfad893a30517262fdffcac3f1297fdedff 100644
--- a/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml
+++ b/config/metrics/counts_all/20210216181040_projects_with_expiration_policy_enabled_with_older_than_set_to_14d.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: counts.projects_with_expiration_policy_enabled_with_older_than_set_to_14d
-description: A count of projects with the cleanup policy set delete tags older than 14 days
+description: A count of projects with the cleanup policy set delete tags older than
+  14 days
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml b/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml
index 387bf3dff9000c44dbac6bafa02bf44c24504276..f9b21e5b25f95a0baf19ad2aaa2efb6f1de51128 100644
--- a/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml
+++ b/config/metrics/counts_all/20210216181042_projects_with_expiration_policy_enabled_with_older_than_set_to_30d.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: counts.projects_with_expiration_policy_enabled_with_older_than_set_to_30d
-description: A count of projects with the cleanup policy set delete tags older than 30 days
+description: A count of projects with the cleanup policy set delete tags older than
+  30 days
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml b/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml
index 8dcfbc1ce020e930b4101191a7eaafa12d58c137..ada20a988d0b17344d1bb42cf2c1cb5a2cee570a 100644
--- a/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml
+++ b/config/metrics/counts_all/20210216181044_projects_with_expiration_policy_enabled_with_older_than_set_to_90d.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: counts.projects_with_expiration_policy_enabled_with_older_than_set_to_90d
-description: A count of projects with the cleanup policy set delete tags older than 90 days
+description: A count of projects with the cleanup policy set delete tags older than
+  90 days
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml b/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml
index 29fe874c89ec7d7007c771c440a2b57dead05c47..6c59c8508a9ff813eeb45ead0c87a2789bfa3189 100644
--- a/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml
+++ b/config/metrics/counts_all/20210216181046_projects_with_expiration_policy_enabled_with_keep_n_unset.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: counts.projects_with_expiration_policy_enabled_with_keep_n_unset
-description: A count of projects with the cleanup policy with the number of tags to keep unset
+description: A count of projects with the cleanup policy with the number of tags to
+  keep unset
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml b/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml
index 475b52f856f74c500ccf5af10e300bd7202888bb..fbe29f5280ee718fedbb8fa2a97b0d5bc03e13a3 100644
--- a/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml
+++ b/config/metrics/counts_all/20210216181048_projects_with_expiration_policy_enabled_with_older_than_unset.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: counts.projects_with_expiration_policy_enabled_with_older_than_unset
-description: A count of projects with the cleanup policy with the number of tags to delete unset
+description: A count of projects with the cleanup policy with the number of tags to
+  delete unset
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181051_vendor.yml b/config/metrics/counts_all/20210216181051_vendor.yml
index 840054e426311dd2595bdabdc0b54a8dc01b2e28..907b58c78652fa67ef53c3629cb628d9baaacc3c 100644
--- a/config/metrics/counts_all/20210216181051_vendor.yml
+++ b/config/metrics/counts_all/20210216181051_vendor.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: container_registry_server.vendor
-description: Identifies if a user is using an external container registry and what type
+description: Identifies if a user is using an external container registry and what
+  type
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -17,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181055_projects_with_packages.yml b/config/metrics/counts_all/20210216181055_projects_with_packages.yml
index 99c51335b807192222b5b39fde1ec8acf02bf5d8..b7f237e0f93610de3325fe84c141d2591cbad0f2 100644
--- a/config/metrics/counts_all/20210216181055_projects_with_packages.yml
+++ b/config/metrics/counts_all/20210216181055_projects_with_packages.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181102_issues.yml b/config/metrics/counts_all/20210216181102_issues.yml
index 8777da9942f772a29391c9e44e532bb10ee07c33..646e2cb2942e260bb2749abb35b6dcbf5b76da35 100644
--- a/config/metrics/counts_all/20210216181102_issues.yml
+++ b/config/metrics/counts_all/20210216181102_issues.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181104_label_lists.yml b/config/metrics/counts_all/20210216181104_label_lists.yml
index 247e891e95660287c5e5e91713d0f8cad516ea08..96d16c74128a6111e38235c2e249ca975486c144 100644
--- a/config/metrics/counts_all/20210216181104_label_lists.yml
+++ b/config/metrics/counts_all/20210216181104_label_lists.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181108_milestones.yml b/config/metrics/counts_all/20210216181108_milestones.yml
index 720c7ae0bc025782fd4b4944de1ea7874d5fb5cd..7218e12549b421aa523b30170e93fd66ec80d542 100644
--- a/config/metrics/counts_all/20210216181108_milestones.yml
+++ b/config/metrics/counts_all/20210216181108_milestones.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181109_uploads.yml b/config/metrics/counts_all/20210216181109_uploads.yml
index 42ba5feb46d3f1a3f70d388b00d4f2fed78e247a..b8955201e90f9647435f798291fb4503147d87a0 100644
--- a/config/metrics/counts_all/20210216181109_uploads.yml
+++ b/config/metrics/counts_all/20210216181109_uploads.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181111_labels.yml b/config/metrics/counts_all/20210216181111_labels.yml
index 3a0a200754ef7fb3bb90e0bdad80149c69524b25..48c44c6d62b7d225261513c65237763d99356544 100644
--- a/config/metrics/counts_all/20210216181111_labels.yml
+++ b/config/metrics/counts_all/20210216181111_labels.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181113_notes.yml b/config/metrics/counts_all/20210216181113_notes.yml
index 5d2c4a029e3e8525dc1fcce09c6549ec836b141c..53bb38582702b9a6e7e5a99c30bea0ace64245a5 100644
--- a/config/metrics/counts_all/20210216181113_notes.yml
+++ b/config/metrics/counts_all/20210216181113_notes.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181115_issues.yml b/config/metrics/counts_all/20210216181115_issues.yml
index 6dbb1b910e157c22d27d4226cad8c59a92250388..22b045cfa73eee7b1b97ec4f0109196f79fec0cc 100644
--- a/config/metrics/counts_all/20210216181115_issues.yml
+++ b/config/metrics/counts_all/20210216181115_issues.yml
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181117_notes.yml b/config/metrics/counts_all/20210216181117_notes.yml
index 20aa29d6d6fbd7eb4f6152d6812267b56f11ca4f..236d283c4d40256dc53e4c9c0a1c5c363fc8791e 100644
--- a/config/metrics/counts_all/20210216181117_notes.yml
+++ b/config/metrics/counts_all/20210216181117_notes.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181119_projects.yml b/config/metrics/counts_all/20210216181119_projects.yml
index 5384bacfec2a0cf225b6fd9e1e0a0675d6cab98c..c448bcc1d7983318eb5d1d297b0e27b04d45ad31 100644
--- a/config/metrics/counts_all/20210216181119_projects.yml
+++ b/config/metrics/counts_all/20210216181119_projects.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181121_todos.yml b/config/metrics/counts_all/20210216181121_todos.yml
index 562e7be5666addf20ae9f01b3902c77122fc7105..854540c7d2ff7acefe75f6a8bc7e620c1b394d3a 100644
--- a/config/metrics/counts_all/20210216181121_todos.yml
+++ b/config/metrics/counts_all/20210216181121_todos.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml b/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml
index 73c975ecd1e2605a9730c42b83460e9111f16f63..de008dd93500884806b4a58547f7e8bc440f5bd1 100644
--- a/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml
+++ b/config/metrics/counts_all/20210216181122_service_desk_enabled_projects.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181124_service_desk_issues.yml b/config/metrics/counts_all/20210216181124_service_desk_issues.yml
index 521d0f42fbe2a8ed9193c501bfb0d83635e9e3dc..cd7c6aa1bf730951658261c10d63cd8375c66361 100644
--- a/config/metrics/counts_all/20210216181124_service_desk_issues.yml
+++ b/config/metrics/counts_all/20210216181124_service_desk_issues.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181126_projects_jira_active.yml b/config/metrics/counts_all/20210216181126_projects_jira_active.yml
index de8f7e5e57836b5688c7dee3abbb3a290e6a3ca2..aaf9421602cd166f175830b936f33bc737e8df75 100644
--- a/config/metrics/counts_all/20210216181126_projects_jira_active.yml
+++ b/config/metrics/counts_all/20210216181126_projects_jira_active.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml b/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml
index 6dca1863e3ef1d0f9fad6393a4e83ec29375c97a..19587d85f82a75150c3422bbb3bc9846c295a764 100644
--- a/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml
+++ b/config/metrics/counts_all/20210216181128_projects_jira_dvcs_cloud_active.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage.plan.projects_jira_dvcs_cloud_active
-description: Distinct count of creator_id from projects with an active Jira Cloud DVCS integration.
+description: Distinct count of creator_id from projects with an active Jira Cloud
+  DVCS integration.
 product_section: dev
 product_stage: ecosystem
 product_group: group::integration
@@ -17,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml b/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml
index 2f37969e8ad7c1f0e49da540df5403df9ac1ca24..2e0bf2aaddad625de0f1de00c19033e33cce586e 100644
--- a/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml
+++ b/config/metrics/counts_all/20210216181130_projects_jira_dvcs_server_active.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage.plan.projects_jira_dvcs_server_active
-description: Distinct count of creator_id from projects with an active Jira Server DVCS integration.
+description: Distinct count of creator_id from projects with an active Jira Server
+  DVCS integration.
 product_section: dev
 product_stage: ecosystem
 product_group: group::integration
@@ -17,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181134_epics.yml b/config/metrics/counts_all/20210216181134_epics.yml
index 339956d84df78443880ab5a62601cb4394af6fde..7c03b1b17d105c4ae95ba6bacf9a272b3476f76c 100644
--- a/config/metrics/counts_all/20210216181134_epics.yml
+++ b/config/metrics/counts_all/20210216181134_epics.yml
@@ -14,3 +14,4 @@ distribution:
 - ee
 tier:
 - premium
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181135_label_lists.yml b/config/metrics/counts_all/20210216181135_label_lists.yml
index f3f9d84993bbf1b8de29a8dce2d7f80d10b67a0f..31b417541ce87b01bdbf343a24697f6d4bd6a21d 100644
--- a/config/metrics/counts_all/20210216181135_label_lists.yml
+++ b/config/metrics/counts_all/20210216181135_label_lists.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181249_feature_flags.yml b/config/metrics/counts_all/20210216181249_feature_flags.yml
index 1743569367341d4bae0adc376ddf0694be5a721d..a8265b49525f1083b818ba1a309d3afe0cc680c2 100644
--- a/config/metrics/counts_all/20210216181249_feature_flags.yml
+++ b/config/metrics/counts_all/20210216181249_feature_flags.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181252_boards.yml b/config/metrics/counts_all/20210216181252_boards.yml
index 91370f6192f9bb65b2cd44362ff8b5397c3fc02b..3771c37b1ed6deb8c4913b42125c3fcb3f441602 100644
--- a/config/metrics/counts_all/20210216181252_boards.yml
+++ b/config/metrics/counts_all/20210216181252_boards.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181254_projects.yml b/config/metrics/counts_all/20210216181254_projects.yml
index ce9659cccc45134f5a6d051e3e3d599aee68326f..aac5fce1e8832e268fc31501708ddce58e5167c0 100644
--- a/config/metrics/counts_all/20210216181254_projects.yml
+++ b/config/metrics/counts_all/20210216181254_projects.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181256_todos.yml b/config/metrics/counts_all/20210216181256_todos.yml
index ab13c2b8d117969ff17664420bb243c21f5ec007..78f4c3aff81b23c41755a150796c832832881804 100644
--- a/config/metrics/counts_all/20210216181256_todos.yml
+++ b/config/metrics/counts_all/20210216181256_todos.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml b/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml
index 13b0f38d16af171dc2772e2f9e6380c5544ab087..38d4521317fff0d7b88106b0ea2de7d27649ed5d 100644
--- a/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml
+++ b/config/metrics/counts_all/20210216181258_jira_imports_total_imported_count.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml b/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
index 4d807c3d33359668cf698076dbeb9ffe108df4c6..f5cd043095a830c0a7bee8c1caa77b3bb06b1380 100644
--- a/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
+++ b/config/metrics/counts_all/20210216181259_jira_imports_projects_count.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml b/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml
index d20eaa11b415bb7da84532f3191ec21d347def03..53d32ac007474b4e1fb2fa692a8034415cff9e34 100644
--- a/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml
+++ b/config/metrics/counts_all/20210216181301_jira_imports_total_imported_issues_count.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181908_deploy_keys.yml b/config/metrics/counts_all/20210216181908_deploy_keys.yml
index 5d144cdb8553137080416ed9c5b15452454d86d9..d600b41825b1c3d7e373a720c423a75072ba2659 100644
--- a/config/metrics/counts_all/20210216181908_deploy_keys.yml
+++ b/config/metrics/counts_all/20210216181908_deploy_keys.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181911_successful_deployments.yml b/config/metrics/counts_all/20210216181911_successful_deployments.yml
index d02c5ee2d8b7af73c41f8c94e4baaa3aa61e2cab..370fc698874aff6a1d31081210a7efdd7a5366bb 100644
--- a/config/metrics/counts_all/20210216181911_successful_deployments.yml
+++ b/config/metrics/counts_all/20210216181911_successful_deployments.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181912_failed_deployments.yml b/config/metrics/counts_all/20210216181912_failed_deployments.yml
index db7532c9e5bed6c7de5284bea8b7263866d20da1..bc9a62e676377d1aab29821c440395d65d8d4b29 100644
--- a/config/metrics/counts_all/20210216181912_failed_deployments.yml
+++ b/config/metrics/counts_all/20210216181912_failed_deployments.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181914_environments.yml b/config/metrics/counts_all/20210216181914_environments.yml
index 86958d713b6a7bd148475608e5202435e7397d87..ebb2eac295532b4699fc7dea895c9711dcb61f65 100644
--- a/config/metrics/counts_all/20210216181914_environments.yml
+++ b/config/metrics/counts_all/20210216181914_environments.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181916_in_review_folder.yml b/config/metrics/counts_all/20210216181916_in_review_folder.yml
index 17cc4f8b730f7db64be9a0a236cb853789de323d..366143b2180fa7506db04f344aaeb4f81e262e7d 100644
--- a/config/metrics/counts_all/20210216181916_in_review_folder.yml
+++ b/config/metrics/counts_all/20210216181916_in_review_folder.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181918_releases.yml b/config/metrics/counts_all/20210216181918_releases.yml
index caf35bd5245d00108d1a772e2d18256c44ed2c6c..1de3aacd29a2ea14a5339b1ed352aea2b477ff7c 100644
--- a/config/metrics/counts_all/20210216181918_releases.yml
+++ b/config/metrics/counts_all/20210216181918_releases.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181926_deployments.yml b/config/metrics/counts_all/20210216181926_deployments.yml
index 36d5b11c115606a5b6907075d1c8077a3fc24e34..9ada4d4a44f798cdcf59e8a7f3d79af88abe8d75 100644
--- a/config/metrics/counts_all/20210216181926_deployments.yml
+++ b/config/metrics/counts_all/20210216181926_deployments.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181928_failed_deployments.yml b/config/metrics/counts_all/20210216181928_failed_deployments.yml
index 36346541dd07dfee144d8c4494f1679d1e58bca2..e3b837457f7940b7b7f57bb1105c9bd137390d0b 100644
--- a/config/metrics/counts_all/20210216181928_failed_deployments.yml
+++ b/config/metrics/counts_all/20210216181928_failed_deployments.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181930_releases.yml b/config/metrics/counts_all/20210216181930_releases.yml
index e14885bd330447b8685b1be5b535c192d3cc6224..49f199765a960afa901988e441650fd09ba617ec 100644
--- a/config/metrics/counts_all/20210216181930_releases.yml
+++ b/config/metrics/counts_all/20210216181930_releases.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181932_successful_deployments.yml b/config/metrics/counts_all/20210216181932_successful_deployments.yml
index 23dee12d8550b48f721454ea3feb4c9ce89e9c42..ec58041b930b7fda12640e430f777cbfc8ce8dc2 100644
--- a/config/metrics/counts_all/20210216181932_successful_deployments.yml
+++ b/config/metrics/counts_all/20210216181932_successful_deployments.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181946_pages_domains.yml b/config/metrics/counts_all/20210216181946_pages_domains.yml
index 4952ae14614bcfe08d0c17e8bd941f1c41910c5b..f9739cf260b4e2418bfe026417f0cf90b175c20d 100644
--- a/config/metrics/counts_all/20210216181946_pages_domains.yml
+++ b/config/metrics/counts_all/20210216181946_pages_domains.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml b/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
index 11251ac89c52403d4d92ac35c5abe1261a3a5932..5c6db9b551e7449a6f3a1926e685e308321e2f23 100644
--- a/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
+++ b/config/metrics/counts_all/20210216181949_clusters_applications_runner.yml
@@ -16,4 +16,5 @@ distribution:
 tier:
 - free
 - premium
-- ultimate
\ No newline at end of file
+- ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216181954_user_unique_users_all_secure_scanners.yml b/config/metrics/counts_all/20210216181954_user_unique_users_all_secure_scanners.yml
index 0d4d7ab0524ad24dc182f7e97c7688e6597ad184..853c278226d03fe966f67159367aefd31a2bb9a0 100644
--- a/config/metrics/counts_all/20210216181954_user_unique_users_all_secure_scanners.yml
+++ b/config/metrics/counts_all/20210216181954_user_unique_users_all_secure_scanners.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 skip_validation: true
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182002_remote_mirrors.yml b/config/metrics/counts_all/20210216182002_remote_mirrors.yml
index 8b03e3891f05313a289bb6e29c23cf54bd68f5a1..842f4128bc3ec2443e3fdbc354f8563caf0fe3dc 100644
--- a/config/metrics/counts_all/20210216182002_remote_mirrors.yml
+++ b/config/metrics/counts_all/20210216182002_remote_mirrors.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182004_commit_comment.yml b/config/metrics/counts_all/20210216182004_commit_comment.yml
index 116442201b0aeb4aa4e318bd6d54c1cc6bd2fbeb..7a268d94424e4c36fb3c52d81ef7899d87e8acde 100644
--- a/config/metrics/counts_all/20210216182004_commit_comment.yml
+++ b/config/metrics/counts_all/20210216182004_commit_comment.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182006_source_code_pushes.yml b/config/metrics/counts_all/20210216182006_source_code_pushes.yml
index 2b36e8e883eff66c9f5d16ec85367daaa8f32aee..0bea42fdaa1329d93781d936424eca405cf614bd 100644
--- a/config/metrics/counts_all/20210216182006_source_code_pushes.yml
+++ b/config/metrics/counts_all/20210216182006_source_code_pushes.yml
@@ -22,3 +22,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182010_deploy_keys.yml b/config/metrics/counts_all/20210216182010_deploy_keys.yml
index 862b7a46b40d719e6826cd4f4fbe2458b11b5962..1ff5fec9bde1c2233fbf5b2c82dc8ff9430e0208 100644
--- a/config/metrics/counts_all/20210216182010_deploy_keys.yml
+++ b/config/metrics/counts_all/20210216182010_deploy_keys.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182012_keys.yml b/config/metrics/counts_all/20210216182012_keys.yml
index b1f53628e907d64de4d752d4d48f21ec3a4226c3..713e627c4fc822c0a50e0b63e5d948586172a99e 100644
--- a/config/metrics/counts_all/20210216182012_keys.yml
+++ b/config/metrics/counts_all/20210216182012_keys.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
index 886de35954d20a654c32a8e69f498560252d6458..acc29c0ca376b3729945cb8a46cef756cbb59039 100644
--- a/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_all/20210216182014_projects_with_disable_overriding_approvers_per_merge_request.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage.create.projects_with_disable_overriding_approvers_per_merge_request
-description: Total count of projects that do not allow overriding approvers on discrete merge requests
+description: Total count of projects that do not allow overriding approvers on discrete
+  merge requests
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -17,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml b/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
index 96e21c1bdb3dcf6992bca6c41e3e7a32e75b790a..e052e906c5fde3d627af892200aa0dd9c3a3695c 100644
--- a/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
+++ b/config/metrics/counts_all/20210216182015_projects_without_disable_overriding_approvers_per_merge_request.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage.create.projects_without_disable_overriding_approvers_per_merge_request
-description: Count of total projects that do not disable overriding approvers per discrete merge request
+description: Count of total projects that do not disable overriding approvers per
+  discrete merge request
 product_section: dev
 product_stage: create
 product_group: group::source code
@@ -17,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182017_remote_mirrors.yml b/config/metrics/counts_all/20210216182017_remote_mirrors.yml
index 60689e01bcc6263f22f10e06947930577fcf0c47..9f7f76589596830fe66b83b7dfa5c7cadd1c1c71 100644
--- a/config/metrics/counts_all/20210216182017_remote_mirrors.yml
+++ b/config/metrics/counts_all/20210216182017_remote_mirrors.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182112_sast_jobs.yml b/config/metrics/counts_all/20210216182112_sast_jobs.yml
index 10e0b0c0532aabb2e398e34d8af607345bdaaf4c..a8218aca536c4adff3f0ed668a28be7f414fcbde 100644
--- a/config/metrics/counts_all/20210216182112_sast_jobs.yml
+++ b/config/metrics/counts_all/20210216182112_sast_jobs.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182114_secret_detection_jobs.yml b/config/metrics/counts_all/20210216182114_secret_detection_jobs.yml
index b6e603499eb0eb2b7b9d8279ee2e420b1e6f7269..8dd570bee3ea848f57f9830cfec78e080700b450 100644
--- a/config/metrics/counts_all/20210216182114_secret_detection_jobs.yml
+++ b/config/metrics/counts_all/20210216182114_secret_detection_jobs.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182116_user_sast_jobs.yml b/config/metrics/counts_all/20210216182116_user_sast_jobs.yml
index a79c1ebeb2f4fbffa55f6869cee9a48686e1ae9f..6cf41a2199d3e46d7fcc04f58dbd503062b6ee87 100644
--- a/config/metrics/counts_all/20210216182116_user_sast_jobs.yml
+++ b/config/metrics/counts_all/20210216182116_user_sast_jobs.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182118_user_secret_detection_jobs.yml b/config/metrics/counts_all/20210216182118_user_secret_detection_jobs.yml
index 7d5f638bf73462e757010036797f5961df85d67e..21d2857cbdd70be77d4259fe4f391b75c1f6fd4a 100644
--- a/config/metrics/counts_all/20210216182118_user_secret_detection_jobs.yml
+++ b/config/metrics/counts_all/20210216182118_user_secret_detection_jobs.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml b/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
index a07ce8ed1bb6c575f8e618906fa93212a9f21686..977acda773c2c1ee22b3e4cbb291cbedb95a9bc2 100644
--- a/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
+++ b/config/metrics/counts_all/20210216182454_protected_branches_except_default.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182547_projects_datadog_active.yml b/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
index 02b47c9a2a67a5b19b6d9cba68fed59a91c4ff76..471cc1bdfc92b72d4f90bb346c77e4b848009974 100644
--- a/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182547_projects_datadog_active.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: counts.projects_datadog_active
-description: 'Count of projects with active integrations for Datadog'
+description: Count of projects with active integrations for Datadog
 product_section: dev
 product_stage: ecosystem
 product_group: group::integrations
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182549_groups_datadog_active.yml b/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
index 4379dbfba7af77b9364b75bbc0f2d1adb6999260..fffabaa8fc2469eaf9c5788c65ea3883261efe12 100644
--- a/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182549_groups_datadog_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182551_templates_datadog_active.yml b/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
index b6ad06d9801ddbe52ed8322f364398e366faa0fd..cd756285214ef7f5c8239fdb3e2c48c798d372fa 100644
--- a/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182551_templates_datadog_active.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182553_instances_datadog_active.yml b/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
index 772639560f4c212e657aec3112d66b531a4b5abd..13534dc72b3498911c525c15d0a0622a94640c53 100644
--- a/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182553_instances_datadog_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml b/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
index 2badb2dd83f53eddcbda02b3dbac796cb6cf8002..1fb65208ac6e2e1d1bc4697711315135bc75432b 100644
--- a/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182555_projects_inheriting_datadog_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml b/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
index 08dd3318dd49660c03d7da7a790891c3f80ae72c..38e18c936356d22ff8b6861f5ae6c884a648e67b 100644
--- a/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
+++ b/config/metrics/counts_all/20210216182557_groups_inheriting_datadog_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182614_projects_ewm_active.yml b/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
index 3cdc44868d082a138d902257eab3c46b0c30eba7..8bd20ccfbb8024caf3e326b044a11fc6b62783a4 100644
--- a/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182614_projects_ewm_active.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: counts.projects_ewm_active
-description: 'Count of projects with active integrations for EWM'
+description: Count of projects with active integrations for EWM
 product_section: dev
 product_stage: ecosystem
 product_group: group::integrations
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182616_groups_ewm_active.yml b/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
index 5e1336e59ff23ab0d549596aba398ca116a7f4bc..c81d0cb8b5db23087f592041bda2f7601b79bdea 100644
--- a/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182616_groups_ewm_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182618_templates_ewm_active.yml b/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
index 8be6bdf0c592a72c4dbce56a875fd41966d9ee50..96a53554b726753ded3204d8c55a8e0c48ce330b 100644
--- a/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182618_templates_ewm_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182620_instances_ewm_active.yml b/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
index ccc502535c9d1b91d68b12126624f814e654402f..80585bae5b294f38a07f5871eb07659ea9f5f8ff 100644
--- a/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182620_instances_ewm_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml b/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
index 8670903142b1ab34655eff2f9fca1c18ba0a05b2..0fdbe3feb69fa1cf7a110ebfb1d29e8cae958b86 100644
--- a/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182622_projects_inheriting_ewm_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml b/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
index 1e8c25751606cc32dcaafcd8aa6ad84ecfa57f3a..211a6d3d0604c79438e54e2cf8c6e19c5b77bbab 100644
--- a/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
+++ b/config/metrics/counts_all/20210216182623_groups_inheriting_ewm_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml b/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
index 71a6b44ffa853de60613a161a22df13dd5976d51..5c12fa799168bdb2360c289624f0d7b4cd3c31a1 100644
--- a/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182722_projects_mock_ci_active.yml
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml b/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
index bdfb6260be3bde5d134933769df4aa939e6aea64..eafff875bfb8ac569c5bbb066c6ad4fc8d458d6c 100644
--- a/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182724_groups_mock_ci_active.yml
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml b/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
index a210d3205adcc734e912ad291bfa1afa0ea96922..b421b3d18431be38ee8d51615e2811cc28ba8fa7 100644
--- a/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182726_templates_mock_ci_active.yml
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml b/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
index e0cf0fd30a10a3101164d4fac688199e78f418ea..eb7009db6008eb8f49d97feba9faa97a87724a8d 100644
--- a/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182728_instances_mock_ci_active.yml
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml b/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml
index f9e6b6ee4d42f56e9a2916fe1f510adcf0a7a8e9..d2f5d4fe1e34267b897c61f1097df5015fc46fe9 100644
--- a/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182730_projects_inheriting_mock_ci_active.yml
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml b/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml
index 3e53603ed9f5456124509413137c8afefa5b584c..3727a16d08c48727b2d766e8680f540e8fb189f5 100644
--- a/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml
+++ b/config/metrics/counts_all/20210216182732_groups_inheriting_mock_ci_active.yml
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
index 378114f92943e3c9c4777fd42cd5738d9665b14a..59ffe96bc368d8a2654c6edf41fd7e4059e82cd0 100644
--- a/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182734_projects_mock_monitoring_active.yml
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
index 231d643bde6b6eec55b6dd925070427281b96c80..2ac5362c37b45f880fe7f86d97cedc5475a7de06 100644
--- a/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182736_groups_mock_monitoring_active.yml
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
index 3b7659c108ed20408ced24d166e8da4e8d10e2ac..961d787b203fb71c9322d2a9344a256f82577c14 100644
--- a/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182738_templates_mock_monitoring_active.yml
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
index b82600ae33a14ce14ad2b5cb146a4b60e4749c78..9f2ece8e9a468e619b1adf0087ab0af27e7d862f 100644
--- a/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182739_instances_mock_monitoring_active.yml
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml
index 71f7ff03adc8858b7538081acf6d27ca77709189..842d4047986d5292ce2927006a68f91dbd3cef25 100644
--- a/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182741_projects_inheriting_mock_monitoring_active.yml
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml b/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml
index dcbcf74bf5d493ebb7de690cbe4cbcf74c818ef2..bd8f344bb36c569776ec4abfa6063af17042369e 100644
--- a/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml
+++ b/config/metrics/counts_all/20210216182743_groups_inheriting_mock_monitoring_active.yml
@@ -18,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml b/config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml
index a7917d3ed3e536da8b8080cefed9e0326ba733a3..d697350af6787d6f03bccc09d40148f5a747419f 100644
--- a/config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml
+++ b/config/metrics/counts_all/20210216182855_package_events_i_package_composer_delete_package.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml b/config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml
index 543a3a7c0bb0149bfc90a0ec8bc6dbb0a8de41e4..e6893db2717c5ef66fcaa7b89a9071fcc4d071e1 100644
--- a/config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml
+++ b/config/metrics/counts_all/20210216182857_package_events_i_package_composer_pull_package.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml b/config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml
index ea346af7322b2a119b1c8f6ed1e6248ded6b3062..be7486e6b83d128c92c170a578462f21f285df3e 100644
--- a/config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml
+++ b/config/metrics/counts_all/20210216182859_package_events_i_package_composer_push_package.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml b/config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml
index 07f4d151a2da9a5f9a9cfb4b27a03187a2f5eff5..1011e8bc457f979379a3871590c400610cfea304 100644
--- a/config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml
+++ b/config/metrics/counts_all/20210216182901_package_events_i_package_conan_delete_package.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml b/config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml
index e9fbb042995d3750b4e24c233715bdc82500fb62..f621b86d6acbc2dfb3fd5b4475805c3748e4537b 100644
--- a/config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml
+++ b/config/metrics/counts_all/20210216182903_package_events_i_package_conan_pull_package.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml b/config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml
index 668c7668e944d6773ec799569731e82bedb54455..447d2444f0208cfe537f32924d1ed74efab8ed0d 100644
--- a/config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml
+++ b/config/metrics/counts_all/20210216182905_package_events_i_package_conan_push_package.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml b/config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml
index f33d1fc32997a5fc908e5f2c96d83bae5e8f6ee2..e36411a81e552267008b043da9eeb8aacb24e3ca 100644
--- a/config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml
+++ b/config/metrics/counts_all/20210216182907_package_events_i_package_container_delete_package.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml b/config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml
index e1aa7ddc683c310011c8688cda80c72f26396338..c9c448b642e6a94685bbe5def280054c65aba5cb 100644
--- a/config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml
+++ b/config/metrics/counts_all/20210216182909_package_events_i_package_container_pull_package.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml b/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml
index 4d64f5749123e9f0497e3ae21575a48b9c7347e6..9ca8e62f68abd3475526c9088b50c17b04429bbe 100644
--- a/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml
+++ b/config/metrics/counts_all/20210216182911_package_events_i_package_container_push_package.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml b/config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml
index e0256f563a8bc34759f24a90df6c0d36225b830f..94f9164cd51afba96b4dfeabc20bdc223b192b98 100644
--- a/config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml
+++ b/config/metrics/counts_all/20210216182913_package_events_i_package_debian_delete_package.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml b/config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml
index 61cebf44a7366bccaec211166817424002a54196..7493a8a0cc8a0d61a2b49f86ee9f0a93a66d2c97 100644
--- a/config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml
+++ b/config/metrics/counts_all/20210216182915_package_events_i_package_debian_pull_package.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml b/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml
index 2fb6e56c49a9c40282bf2bd855c02702911b6b9f..4fe173115ca341fde1fa288fb032adef5764a3ad 100644
--- a/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml
+++ b/config/metrics/counts_all/20210216182917_package_events_i_package_debian_push_package.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml b/config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml
index 4ab016f854dd0c910d8bb97015ba892dd052b1c9..c2282f4fbddd323699c349bffaba79365f0d4ffb 100644
--- a/config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml
+++ b/config/metrics/counts_all/20210216182919_package_events_i_package_delete_package.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml b/config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml
index 45490ab93d69fb888c2aa4be4e63c6aede054a71..a4ec25a635525dfcbcc9fd7e73e72a9fd90cecdb 100644
--- a/config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210216182921_package_events_i_package_delete_package_by_deploy_token.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml b/config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml
index 4c1a0729633b0e1f2750c4f90e68e74510663474..2abb34e428e5bee05e29bf5e046158410fa6b176 100644
--- a/config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml
+++ b/config/metrics/counts_all/20210216182923_package_events_i_package_delete_package_by_guest.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml b/config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml
index e46db03bfaa3d22f8d7a9a65f7ba97725a2290a0..acfac98b954cd9b6752ae9534cd5ca67ca66b3c0 100644
--- a/config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml
+++ b/config/metrics/counts_all/20210216182925_package_events_i_package_delete_package_by_user.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml b/config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml
index c1ee77426364a5d89f19b243c4953849c0a5f046..91801bc30658f0a580ef17cf4485c89208d5be9a 100644
--- a/config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml
+++ b/config/metrics/counts_all/20210216182927_package_events_i_package_generic_delete_package.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml b/config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml
index 1a31301c8a5d1b92e1f553d81ab68b193cddccc2..8da5f9d078cde712b11ffad8e3a654a757ad7bec 100644
--- a/config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml
+++ b/config/metrics/counts_all/20210216182929_package_events_i_package_generic_pull_package.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml b/config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml
index ab3c69f7eed8a38f1cb3ad93e9001e38bde8bf86..0f0f78db69cab4020f83a82c8d0fe008ce97eba5 100644
--- a/config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml
+++ b/config/metrics/counts_all/20210216182931_package_events_i_package_generic_push_package.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml b/config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml
index 2af3db1ed2c8db398a992127ce8c967f5d353aeb..e1f965a829be154d56884c573e75f43a3c1116d5 100644
--- a/config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml
+++ b/config/metrics/counts_all/20210216182933_package_events_i_package_golang_delete_package.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml b/config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml
index ffae5c6efa491f174fbc72fe746c873b05bbbacd..205dea88f01ac9a50ac14eb65e54049acff4cff7 100644
--- a/config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml
+++ b/config/metrics/counts_all/20210216182934_package_events_i_package_golang_pull_package.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml b/config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml
index babfe6c3507fb9265f292289c672579f91cb48d2..c87529f961491e7b7c8e40ead7a13d0b7262f60a 100644
--- a/config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml
+++ b/config/metrics/counts_all/20210216182936_package_events_i_package_golang_push_package.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml b/config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml
index 176996e3447d4d29e192da0845eae4b0cfb820f2..d93643d4950abf56bbdff0b43d786dbb0c64c554 100644
--- a/config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml
+++ b/config/metrics/counts_all/20210216182938_package_events_i_package_maven_delete_package.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml b/config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml
index e589314f06f236c67f3c1448f110b8ab6d99ef5b..0fbf04f1f5bdb4bc72c425398c9c973b536dd894 100644
--- a/config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml
+++ b/config/metrics/counts_all/20210216182940_package_events_i_package_maven_pull_package.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml b/config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml
index 4610a24c51f171f8d1201e8a91b05685949c1a49..5f51a7a60a29a2832120bd552ffd4b8b53dc328b 100644
--- a/config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml
+++ b/config/metrics/counts_all/20210216182942_package_events_i_package_maven_push_package.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml b/config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml
index e540e68355aae175214064de8a58d443001751f1..cc1c9021d552a83824b4e72bd7f14bbfe13f22a9 100644
--- a/config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml
+++ b/config/metrics/counts_all/20210216182944_package_events_i_package_npm_delete_package.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml b/config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml
index d2af5aa56c8f7436953f1537af277846b1d6f1db..2c4deaf31ceffa6f2c6a3473db75e22951fe4d63 100644
--- a/config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml
+++ b/config/metrics/counts_all/20210216182946_package_events_i_package_npm_pull_package.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182948_package_events_i_package_npm_push_package.yml b/config/metrics/counts_all/20210216182948_package_events_i_package_npm_push_package.yml
index 653fba58565fe2f9270dd34d52d192bca589e6e4..a6671834a79a78c583edabe212811c226f2ba318 100644
--- a/config/metrics/counts_all/20210216182948_package_events_i_package_npm_push_package.yml
+++ b/config/metrics/counts_all/20210216182948_package_events_i_package_npm_push_package.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml b/config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml
index 82a5509cd034f8763d7c0bdea1b6c9b121844c25..25e780687e16138fb56a312948b29b8bd668810f 100644
--- a/config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml
+++ b/config/metrics/counts_all/20210216182950_package_events_i_package_nuget_delete_package.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml b/config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml
index 5327b10ecf59982c6a785125d2eb0d4be0b53530..e3f0afcb423d0c3586abb6ac5612c807de2cba76 100644
--- a/config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml
+++ b/config/metrics/counts_all/20210216182952_package_events_i_package_nuget_pull_package.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml b/config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml
index e8b0a0e7fb54ab45577b33a70157a0230e467796..bbd80491a970b88bb571f76d3eb0f146f0e9f969 100644
--- a/config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml
+++ b/config/metrics/counts_all/20210216182954_package_events_i_package_nuget_push_package.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml b/config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml
index f3484ae5b415e10919e52a552a269b6b949ea468..6582f1593f1599a1b8b2a2e48cc24802cb29046c 100644
--- a/config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml
+++ b/config/metrics/counts_all/20210216182956_package_events_i_package_pull_package.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216182958_package_events_i_package_pull_package_by_deploy_token.yml b/config/metrics/counts_all/20210216182958_package_events_i_package_pull_package_by_deploy_token.yml
index 183abf834dd961ebbf04f406d8a7ce398f293dd3..f3110464d2db13c435ae31dd9707c54b4cca2e7c 100644
--- a/config/metrics/counts_all/20210216182958_package_events_i_package_pull_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210216182958_package_events_i_package_pull_package_by_deploy_token.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: counts.package_events_i_package_pull_package_by_deploy_token
-description: A count of packages that have been downloaded from the package registry using a Deploy Token
+description: A count of packages that have been downloaded from the package registry
+  using a Deploy Token
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml b/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml
index bad5254aac4430c8c9557a9970fde656abc2fe8e..7d80ff712be82877aec55d79c0a806197fc7ea12 100644
--- a/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml
+++ b/config/metrics/counts_all/20210216183000_package_events_i_package_pull_package_by_guest.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: counts.package_events_i_package_pull_package_by_guest
-description: A count of packages that have been downloaded from the package registry by a guest
+description: A count of packages that have been downloaded from the package registry
+  by a guest
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183002_package_events_i_package_pull_package_by_user.yml b/config/metrics/counts_all/20210216183002_package_events_i_package_pull_package_by_user.yml
index f5e450cae7a745e90951fe775cdce50d64a514d2..647d9a872fa1bb941a7a124778f15cdb08849c0e 100644
--- a/config/metrics/counts_all/20210216183002_package_events_i_package_pull_package_by_user.yml
+++ b/config/metrics/counts_all/20210216183002_package_events_i_package_pull_package_by_user.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: counts.package_events_i_package_pull_package_by_user
-description: A count of packages that have been downloaded from the package registry by a user
+description: A count of packages that have been downloaded from the package registry
+  by a user
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml b/config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml
index bbcd3e82234bf4f46d06428707ba83c48b4a01d8..b1a57fb1f17b4c0e6c93d85ebca3d9d840caa91a 100644
--- a/config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml
+++ b/config/metrics/counts_all/20210216183004_package_events_i_package_push_package.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml b/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml
index 3a37af76f738ad64f61b82b38a6d8be1525d8fec..2b47a8362152b954b7a749d505799850c50b4285 100644
--- a/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml
+++ b/config/metrics/counts_all/20210216183005_package_events_i_package_push_package_by_deploy_token.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: counts.package_events_i_package_push_package_by_deploy_token
-description: A count of packages that have been published to the package registry using a deploy token
+description: A count of packages that have been published to the package registry
+  using a deploy token
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183007_package_events_i_package_push_package_by_guest.yml b/config/metrics/counts_all/20210216183007_package_events_i_package_push_package_by_guest.yml
index 2f241519d3d7ad14cc9ecd90faa6ce678e2b0490..3ae2bdbb2fad6d5d72e3a2ade91e42051478ded9 100644
--- a/config/metrics/counts_all/20210216183007_package_events_i_package_push_package_by_guest.yml
+++ b/config/metrics/counts_all/20210216183007_package_events_i_package_push_package_by_guest.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: counts.package_events_i_package_push_package_by_guest
-description: A count of packages that have been published to the package registry by a Guest
+description: A count of packages that have been published to the package registry
+  by a Guest
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -17,3 +18,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183009_package_events_i_package_push_package_by_user.yml b/config/metrics/counts_all/20210216183009_package_events_i_package_push_package_by_user.yml
index 25b3932ad67c55aa9e102622b7910a0e8ce511c3..a6b5c845b46ee8127d7027a9aafc3181fcf40c77 100644
--- a/config/metrics/counts_all/20210216183009_package_events_i_package_push_package_by_user.yml
+++ b/config/metrics/counts_all/20210216183009_package_events_i_package_push_package_by_user.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: counts.package_events_i_package_push_package_by_user
-description: A count of packages that have been published to the package registry by a user
+description: A count of packages that have been published to the package registry
+  by a user
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml b/config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml
index 2a90a151a539e9cd988ab1f48e5b4c7fc05bcfa9..6ce565eb9de777c9d40801a4ef126f92b733cd90 100644
--- a/config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml
+++ b/config/metrics/counts_all/20210216183011_package_events_i_package_pypi_delete_package.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183013_package_events_i_package_pypi_pull_package.yml b/config/metrics/counts_all/20210216183013_package_events_i_package_pypi_pull_package.yml
index 0efeac2f9d14e8e47ae28639d5a94454e4bbd14f..edccdede86d1265940317dad402bd4695d0738f9 100644
--- a/config/metrics/counts_all/20210216183013_package_events_i_package_pypi_pull_package.yml
+++ b/config/metrics/counts_all/20210216183013_package_events_i_package_pypi_pull_package.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: counts.package_events_i_package_pypi_pull_package
-description: A count of Python packages that have been downloaded from the package registry
+description: A count of Python packages that have been downloaded from the package
+  registry
 product_section: ops
 product_stage: package
 product_group: group::package
@@ -18,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml b/config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml
index 75c91704892d59344d327bf340e7eeb2ebd587ea..da9dc74cbf94cbee3f7e593fe5fbbd7d3a953a1e 100644
--- a/config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml
+++ b/config/metrics/counts_all/20210216183015_package_events_i_package_pypi_push_package.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml b/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml
index 06217938d8e891836ff531309d3e2993faa2678f..580f06259a1afca6b56d92c56a9eea7198e93129 100644
--- a/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml
+++ b/config/metrics/counts_all/20210216183017_package_events_i_package_tag_delete_package.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml b/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml
index b96c1866a174761eae1d96991b3bf8e81ab65642..cb399d23ed13a19f3f113d8841c135f6b51e40a5 100644
--- a/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml
+++ b/config/metrics/counts_all/20210216183019_package_events_i_package_tag_pull_package.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml b/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml
index 264a9773f7b55e021b3ace6ceadb25a4d9f6bff9..aa32883e6a5e0e26c217a9e218b830f21667c02c 100644
--- a/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml
+++ b/config/metrics/counts_all/20210216183021_package_events_i_package_tag_push_package.yml
@@ -17,3 +17,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183023_wiki_pages_view.yml b/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
index 75403722e5c0c935843620e40994afb8f82edb2c..811277b0b757da5665df3f7cd7f72997ad1a98a4 100644
--- a/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
+++ b/config/metrics/counts_all/20210216183023_wiki_pages_view.yml
@@ -16,3 +16,4 @@ tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183400_omniauth_providers.yml b/config/metrics/counts_all/20210216183400_omniauth_providers.yml
index 1f738f7ea73f8bd743aa7302fc7a67583600657e..860a4fecec1e95c76d2be13325d817e193296376 100644
--- a/config/metrics/counts_all/20210216183400_omniauth_providers.yml
+++ b/config/metrics/counts_all/20210216183400_omniauth_providers.yml
@@ -16,3 +16,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183402_two-factor.yml b/config/metrics/counts_all/20210216183402_two-factor.yml
index 623c67195ce503c618f9f109122a797896ef0b80..72f9872d237243c26efedabb2937b3742d25b116 100644
--- a/config/metrics/counts_all/20210216183402_two-factor.yml
+++ b/config/metrics/counts_all/20210216183402_two-factor.yml
@@ -16,3 +16,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183404_two-factor-via-u2f-device.yml b/config/metrics/counts_all/20210216183404_two-factor-via-u2f-device.yml
index 5bbe08b623cff2c4f1c605d4b337c059568ad2c5..2a79190fafaacf0aef7141b3deaa5edb614afe19 100644
--- a/config/metrics/counts_all/20210216183404_two-factor-via-u2f-device.yml
+++ b/config/metrics/counts_all/20210216183404_two-factor-via-u2f-device.yml
@@ -16,3 +16,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183406_two-factor-via-webauthn-device.yml b/config/metrics/counts_all/20210216183406_two-factor-via-webauthn-device.yml
index adc756900576219e2763fb9ce184b22db7355e05..1b0ab9c53d9241b8a9ba222577608fac05922808 100644
--- a/config/metrics/counts_all/20210216183406_two-factor-via-webauthn-device.yml
+++ b/config/metrics/counts_all/20210216183406_two-factor-via-webauthn-device.yml
@@ -16,3 +16,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183408_standard.yml b/config/metrics/counts_all/20210216183408_standard.yml
index b43bd25031b2f9ef057a082bf8230e747f86342c..900a5c205eef9e115d224ff83538c1ca52e868d8 100644
--- a/config/metrics/counts_all/20210216183408_standard.yml
+++ b/config/metrics/counts_all/20210216183408_standard.yml
@@ -16,3 +16,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183410_google_oauth2.yml b/config/metrics/counts_all/20210216183410_google_oauth2.yml
index 205b8dadbb031def46aef41e54a95d44ac209049..dbf5b6b180140237fecf3975029d59012c3db63e 100644
--- a/config/metrics/counts_all/20210216183410_google_oauth2.yml
+++ b/config/metrics/counts_all/20210216183410_google_oauth2.yml
@@ -16,3 +16,4 @@ tier:
 - free
 - premium
 - ultimate
+milestone: "<13.9"
diff --git a/config/metrics/license/20210204124829_active_user_count.yml b/config/metrics/license/20210204124829_active_user_count.yml
index f8beb5dfd0e46a27f6845fc63734e21235272613..c3d6b19c6e032c5b3c0364cd57c497d8236c06ff 100644
--- a/config/metrics/license/20210204124829_active_user_count.yml
+++ b/config/metrics/license/20210204124829_active_user_count.yml
@@ -7,6 +7,7 @@ product_group: group::product intelligence
 product_category: collection
 value_type: string
 status: data_available
+milestone: "<13.9"
 data_category: subscription
 time_frame: none
 data_source: database
diff --git a/config/metrics/settings/20210201124935_database_adapter.yml b/config/metrics/settings/20210201124935_database_adapter.yml
index 38cdba2a071f4638eeb6ef6221149b9d3e322c81..954807324abc94ddbdf6dbf62f52bd156cd64150 100644
--- a/config/metrics/settings/20210201124935_database_adapter.yml
+++ b/config/metrics/settings/20210201124935_database_adapter.yml
@@ -1,7 +1,9 @@
 ---
 data_category: optional
 key_path: database.adapter
-description: This metric only returns a value of PostgreSQL in supported versions of GitLab. It could be removed from the usage ping. Historically MySQL was also supported.
+description: This metric only returns a value of PostgreSQL in supported versions
+  of GitLab. It could be removed from the usage ping. Historically MySQL was also
+  supported.
 product_section: enablement
 product_stage: enablement
 product_group: group::enablement distribution
@@ -18,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
index 8d635cc17a05956b64e6ea82f3126acea787ad42..8504cf63d5413446a45a7d37f7f399bbff7d9bfc 100644
--- a/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
+++ b/config/metrics/settings/20210204124856_instance_auto_devops_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124858_container_registry_enabled.yml b/config/metrics/settings/20210204124858_container_registry_enabled.yml
index a780b8cfaa937ab1a4116faa573731f15b59c91f..206e173b24093318c6f8e99e17d822c41d5586a9 100644
--- a/config/metrics/settings/20210204124858_container_registry_enabled.yml
+++ b/config/metrics/settings/20210204124858_container_registry_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
index d92a3d9b5f9e6abeb2321b3d0cac0d8cd6b39a48..76bb2049c64ea9a01c1aad8066968a4816947ced 100644
--- a/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
+++ b/config/metrics/settings/20210204124900_dependency_proxy_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
index 552b04675183a7b253c42f730c431234895e477a..e174a298c90b3689f05455ab7852b36d75da0db5 100644
--- a/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
+++ b/config/metrics/settings/20210204124902_gitlab_shared_runners_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124904_gravatar_enabled.yml b/config/metrics/settings/20210204124904_gravatar_enabled.yml
index 541c7be16e7a9471559258e1c96d32b877a596e1..6d16fdd24fcc68ce111874cec2e42fcc28c6b2ad 100644
--- a/config/metrics/settings/20210204124904_gravatar_enabled.yml
+++ b/config/metrics/settings/20210204124904_gravatar_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124906_ldap_enabled.yml b/config/metrics/settings/20210204124906_ldap_enabled.yml
index cabbac5619eb712aa5067c9dfc742251890057e5..e34f2c7b4b084c7572f6edc691a3ae9dc1872e02 100644
--- a/config/metrics/settings/20210204124906_ldap_enabled.yml
+++ b/config/metrics/settings/20210204124906_ldap_enabled.yml
@@ -16,3 +16,4 @@ tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124908_mattermost_enabled.yml b/config/metrics/settings/20210204124908_mattermost_enabled.yml
index 0cefe4b595fcfc9e93dc055883ba3cb7e54a9f59..32ff7293662774b9f101fcac5c0c7a34409d1838 100644
--- a/config/metrics/settings/20210204124908_mattermost_enabled.yml
+++ b/config/metrics/settings/20210204124908_mattermost_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124910_omniauth_enabled.yml b/config/metrics/settings/20210204124910_omniauth_enabled.yml
index 6451a66c87ed0543ad463e1744b7deef6a17582e..36812857bce935e28e23f75968afe18245b31712 100644
--- a/config/metrics/settings/20210204124910_omniauth_enabled.yml
+++ b/config/metrics/settings/20210204124910_omniauth_enabled.yml
@@ -16,3 +16,4 @@ tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124912_prometheus_enabled.yml b/config/metrics/settings/20210204124912_prometheus_enabled.yml
index 9002751cf6ad77b56f573116bdc130b51cf63143..da33a8a962fd5ccfc9834ad41e4bb7b2f998a6d0 100644
--- a/config/metrics/settings/20210204124912_prometheus_enabled.yml
+++ b/config/metrics/settings/20210204124912_prometheus_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml b/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
index 04fc99f8dc5337c3263f9b89bdbd29f9a0780f5b..73e9012d4a4ec3dff4d47807c3e6558a50e122c8 100644
--- a/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
+++ b/config/metrics/settings/20210204124914_prometheus_metrics_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124916_reply_by_email_enabled.yml b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
index 4d4de2da28a2b67e01a14261eb4d99a985f8f8dd..ec37ac98dd2e8b40b9f8711e678c48caab00ab67 100644
--- a/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
+++ b/config/metrics/settings/20210204124916_reply_by_email_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124918_signup_enabled.yml b/config/metrics/settings/20210204124918_signup_enabled.yml
index 059a3ecba7f0780a9f40285f10d9e07ad1f07084..50ff88036434263ccc52dc68a18292b413bbb946 100644
--- a/config/metrics/settings/20210204124918_signup_enabled.yml
+++ b/config/metrics/settings/20210204124918_signup_enabled.yml
@@ -19,3 +19,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml b/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
index f972622d17643017c8b413560c5707ce1d2648c1..e028f9ed32742523bc3d858b7c9f3bebf032d786 100644
--- a/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
+++ b/config/metrics/settings/20210204124920_web_ide_clientside_preview_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124922_grafana_link_enabled.yml b/config/metrics/settings/20210204124922_grafana_link_enabled.yml
index 78225329763163325e2e699708a652a358a8c31f..951df5de64252a231fa4ab4b20cb4cf0310ff274 100644
--- a/config/metrics/settings/20210204124922_grafana_link_enabled.yml
+++ b/config/metrics/settings/20210204124922_grafana_link_enabled.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - free
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210204124934_pages_enabled.yml b/config/metrics/settings/20210204124934_pages_enabled.yml
index 7c830e56787b524329159ec89f4884b5462aaa78..287b154600200fd866be5ff485130e656159ad1d 100644
--- a/config/metrics/settings/20210204124934_pages_enabled.yml
+++ b/config/metrics/settings/20210204124934_pages_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216174829_smtp_server.yml b/config/metrics/settings/20210216174829_smtp_server.yml
index f82fddbc86cd600f0771bdc06cf97fa8ed0e05c0..0e96093feaffbd9bc323235a17d36ae8093d69fc 100644
--- a/config/metrics/settings/20210216174829_smtp_server.yml
+++ b/config/metrics/settings/20210216174829_smtp_server.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
index d92815bebfdc22ba4a8deda6c7385a87b4064b94..9bf0277363fd601bd903054085d17714e2c274f6 100644
--- a/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
+++ b/config/metrics/settings/20210216175459_ingress_modsecurity_enabled.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216175604_edition.yml b/config/metrics/settings/20210216175604_edition.yml
index c85378304cc2428e8ece5dff4dc76886287eed20..4b4f117ccbd3656aeee9625f93304c4b6ec78611 100644
--- a/config/metrics/settings/20210216175604_edition.yml
+++ b/config/metrics/settings/20210216175604_edition.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml b/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
index fb0d3163b3e5477602cbd3fd24ddb7293f5e3da2..9b7a50a4f1c32467b0839f0941e8cd8b6bf3ad21 100644
--- a/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
+++ b/config/metrics/settings/20210216175606_ldap_encrypted_secrets_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216175609_version.yml b/config/metrics/settings/20210216175609_version.yml
index 1a8f7af47429db64df308bdef8c1ea44b869f2c6..223238a70fa0d86e2b5e0a346a3740f658852d0b 100644
--- a/config/metrics/settings/20210216175609_version.yml
+++ b/config/metrics/settings/20210216175609_version.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180314_gitpod_enabled.yml b/config/metrics/settings/20210216180314_gitpod_enabled.yml
index 1ade7ee7186564bd2bb4e9668de3957d1c12534d..30e082720776e89b16c56faf691820726c35aee5 100644
--- a/config/metrics/settings/20210216180314_gitpod_enabled.yml
+++ b/config/metrics/settings/20210216180314_gitpod_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180836_enabled.yml b/config/metrics/settings/20210216180836_enabled.yml
index f4f8f721ad12f761fee6ce9d82fb5f6979df68a1..35ab202ed5ccf7e65b94f64ffd595f7da2ae8a11 100644
--- a/config/metrics/settings/20210216180836_enabled.yml
+++ b/config/metrics/settings/20210216180836_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180838_enabled.yml b/config/metrics/settings/20210216180838_enabled.yml
index 03f4f52aaf9683b24a87322a1a82b8d2e39d2c0f..ec1ed88a15dae4302ce5d8035be7aa5cfcafbba0 100644
--- a/config/metrics/settings/20210216180838_enabled.yml
+++ b/config/metrics/settings/20210216180838_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180840_direct_upload.yml b/config/metrics/settings/20210216180840_direct_upload.yml
index b8b85af94f9a7bb40b179bb7cf639704b2bf9aee..89db3c9903394057c6df4b2a32af10da445d680b 100644
--- a/config/metrics/settings/20210216180840_direct_upload.yml
+++ b/config/metrics/settings/20210216180840_direct_upload.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180841_background_upload.yml b/config/metrics/settings/20210216180841_background_upload.yml
index d354ad6ff49673306796b0dfee3c8d7a4b76d276..6d3feae4944e9c4c6c94145233bbcfabbd3105eb 100644
--- a/config/metrics/settings/20210216180841_background_upload.yml
+++ b/config/metrics/settings/20210216180841_background_upload.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180843_provider.yml b/config/metrics/settings/20210216180843_provider.yml
index 8b94a67dba7165ff97b2d35ab865e049f93b99f9..e4967e5e390e467a53ecaed7c6b68298283ccb90 100644
--- a/config/metrics/settings/20210216180843_provider.yml
+++ b/config/metrics/settings/20210216180843_provider.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180845_enabled.yml b/config/metrics/settings/20210216180845_enabled.yml
index a40aadf701a9a36b504cbadf7891d18a178317b3..26abb8f4f2f5fcdd4b1464d756dd3d2b702be3bf 100644
--- a/config/metrics/settings/20210216180845_enabled.yml
+++ b/config/metrics/settings/20210216180845_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180847_enabled.yml b/config/metrics/settings/20210216180847_enabled.yml
index b1adeac5238081702cca82aaa37627c74f51c90c..76f352bdbafbda52adbea06ab5646ed04a4fd835 100644
--- a/config/metrics/settings/20210216180847_enabled.yml
+++ b/config/metrics/settings/20210216180847_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180849_direct_upload.yml b/config/metrics/settings/20210216180849_direct_upload.yml
index a25637270e7f0dae9ad8a90b4badedb33d81bcc7..cded4304535f5747ce5c9c1a4b60f3e0685c5cc7 100644
--- a/config/metrics/settings/20210216180849_direct_upload.yml
+++ b/config/metrics/settings/20210216180849_direct_upload.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180851_background_upload.yml b/config/metrics/settings/20210216180851_background_upload.yml
index 1326c2ebef4df2ca971eac2245496a0499518a61..f2705f52f3a74be4f893eace0bf6ca54f514e9fa 100644
--- a/config/metrics/settings/20210216180851_background_upload.yml
+++ b/config/metrics/settings/20210216180851_background_upload.yml
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180852_provider.yml b/config/metrics/settings/20210216180852_provider.yml
index e057a6384a24cbaccc6c217acaafa792573c3403..18c0bf6ff080601a1ffd4d725f51fa2a585134e5 100644
--- a/config/metrics/settings/20210216180852_provider.yml
+++ b/config/metrics/settings/20210216180852_provider.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180854_enabled.yml b/config/metrics/settings/20210216180854_enabled.yml
index c129bb028d51538b50a817e576d3a02a858fb69f..72b228f1c6926636e35e4d51a3815f6b97f40533 100644
--- a/config/metrics/settings/20210216180854_enabled.yml
+++ b/config/metrics/settings/20210216180854_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180856_enabled.yml b/config/metrics/settings/20210216180856_enabled.yml
index bd26d91a2faa7bbdea08a0d64de4f916e2165b68..0c5abced9b3ad150d2ec303f1ab4518a5a277e69 100644
--- a/config/metrics/settings/20210216180856_enabled.yml
+++ b/config/metrics/settings/20210216180856_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180858_direct_upload.yml b/config/metrics/settings/20210216180858_direct_upload.yml
index 281b6744d35dfe1fccd0b637ef0d4e956e93dff9..3e23f412668d96985ef5b006d5ffc58a7e95b6ec 100644
--- a/config/metrics/settings/20210216180858_direct_upload.yml
+++ b/config/metrics/settings/20210216180858_direct_upload.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180900_background_upload.yml b/config/metrics/settings/20210216180900_background_upload.yml
index 2e39fa7e379ee012e7659b952f9b9c6ca5685c94..59751ba9fc9540c5849b780395a8b149eed4203b 100644
--- a/config/metrics/settings/20210216180900_background_upload.yml
+++ b/config/metrics/settings/20210216180900_background_upload.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180902_provider.yml b/config/metrics/settings/20210216180902_provider.yml
index a8d265f9676ec36c6366823f849c58f999bc08bc..16b3a915caf543f2755bda0adf58017904af5a7b 100644
--- a/config/metrics/settings/20210216180902_provider.yml
+++ b/config/metrics/settings/20210216180902_provider.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180903_enabled.yml b/config/metrics/settings/20210216180903_enabled.yml
index 00e52b86d866bbd2dbaabb81e94a03b09c23fdda..7f5abb7880604d37b51bd2c4517d71592e4969be 100644
--- a/config/metrics/settings/20210216180903_enabled.yml
+++ b/config/metrics/settings/20210216180903_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180905_enabled.yml b/config/metrics/settings/20210216180905_enabled.yml
index dba464bfed35d029b70893d800267143e6271371..8ef51ba21a139390be227f2e636c14b06391a815 100644
--- a/config/metrics/settings/20210216180905_enabled.yml
+++ b/config/metrics/settings/20210216180905_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180907_direct_upload.yml b/config/metrics/settings/20210216180907_direct_upload.yml
index 93b69a728bc3242349f2b2d59ece8be2ea3b6160..e8e59097faf902f0bfb742f47bdcde5dbfb6b650 100644
--- a/config/metrics/settings/20210216180907_direct_upload.yml
+++ b/config/metrics/settings/20210216180907_direct_upload.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180909_background_upload.yml b/config/metrics/settings/20210216180909_background_upload.yml
index 1af3d227f2f67e4701184dbb26568601d7e714de..e1df69b1e5dc8f1df31676710858a9e0f4ed6ae8 100644
--- a/config/metrics/settings/20210216180909_background_upload.yml
+++ b/config/metrics/settings/20210216180909_background_upload.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180911_provider.yml b/config/metrics/settings/20210216180911_provider.yml
index f9f98da3569532e9f548e42dddec47464d5e962f..4b0455290af0fa316ede0bc54ed90838ea40866d 100644
--- a/config/metrics/settings/20210216180911_provider.yml
+++ b/config/metrics/settings/20210216180911_provider.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180913_enabled.yml b/config/metrics/settings/20210216180913_enabled.yml
index 436e5f717c1504203e08c8d46008cab25a950c12..63b0b856c8c368e1c12eec17f9b910cc8877b72a 100644
--- a/config/metrics/settings/20210216180913_enabled.yml
+++ b/config/metrics/settings/20210216180913_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180915_enabled.yml b/config/metrics/settings/20210216180915_enabled.yml
index b52d85ef8df0b1be435aa77a69e975d0fc664851..d9922248b12a3f10e5c9914b5e22b95a1d3fd112 100644
--- a/config/metrics/settings/20210216180915_enabled.yml
+++ b/config/metrics/settings/20210216180915_enabled.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180916_direct_upload.yml b/config/metrics/settings/20210216180916_direct_upload.yml
index 058531516d7c1718698d6d4bbdc4993be338d670..f49308e888b7d2bfb059913fa95af89c5c65f74a 100644
--- a/config/metrics/settings/20210216180916_direct_upload.yml
+++ b/config/metrics/settings/20210216180916_direct_upload.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180918_background_upload.yml b/config/metrics/settings/20210216180918_background_upload.yml
index c03e600b6220ce86a62841c636a58918dbfbbb96..9273c7d4f174a12600806a452ea113928ee0a3f4 100644
--- a/config/metrics/settings/20210216180918_background_upload.yml
+++ b/config/metrics/settings/20210216180918_background_upload.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216180920_provider.yml b/config/metrics/settings/20210216180920_provider.yml
index bda2c485e3a2df0d512b5157ca2bdee3161edc9e..9a2e52f0f81fd803037144aa5b6a6728a93abd2c 100644
--- a/config/metrics/settings/20210216180920_provider.yml
+++ b/config/metrics/settings/20210216180920_provider.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216183241_filesystems.yml b/config/metrics/settings/20210216183241_filesystems.yml
index 85f2a736756b8faa3f76cad2302c24fb1fb4c66f..6609a6c75a7a26b6e64bbf0e767aa925a207e898 100644
--- a/config/metrics/settings/20210216183241_filesystems.yml
+++ b/config/metrics/settings/20210216183241_filesystems.yml
@@ -16,3 +16,4 @@ tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/config/metrics/settings/20210216183248_pg_system_id.yml b/config/metrics/settings/20210216183248_pg_system_id.yml
index 5883473a003bf3ccf317bc9d7f69b8cce6029241..7432c7fc1eb059c1d53a691066b9e67d3715fd92 100644
--- a/config/metrics/settings/20210216183248_pg_system_id.yml
+++ b/config/metrics/settings/20210216183248_pg_system_id.yml
@@ -5,7 +5,7 @@ description: TBD
 product_section: enablement
 product_stage: enablement
 product_group: group::distribution
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
@@ -16,3 +16,4 @@ tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216174914_g_analytics_contribution_monthly.yml b/ee/config/metrics/counts_28d/20210216174914_g_analytics_contribution_monthly.yml
index a8833610a2e8c6330c315fac66d3a7b226ff5b78..518191a405a36691ace66d52fa826285fc4d507f 100644
--- a/ee/config/metrics/counts_28d/20210216174914_g_analytics_contribution_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174914_g_analytics_contribution_monthly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /groups/:group/-/contribution_analytics by month
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_analytics_contribution
+  - g_analytics_contribution
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216174918_g_analytics_insights_monthly.yml b/ee/config/metrics/counts_28d/20210216174918_g_analytics_insights_monthly.yml
index b467bb078eb6b834c2696809d0698ed4239e562e..2ee7e87cb084a54b57cc13dd8dfa2ba71bcc6fdf 100644
--- a/ee/config/metrics/counts_28d/20210216174918_g_analytics_insights_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174918_g_analytics_insights_monthly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /groups/:group/-/insights/ by month
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_analytics_insights
+  - g_analytics_insights
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216174921_g_analytics_issues_monthly.yml b/ee/config/metrics/counts_28d/20210216174921_g_analytics_issues_monthly.yml
index d98064fafa0e27fd897e69ad84958d2d2b8c0c25..e0a4d252702e9be07329003fb7486f9edad58dd4 100644
--- a/ee/config/metrics/counts_28d/20210216174921_g_analytics_issues_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174921_g_analytics_issues_monthly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /groups/:group/-/issues_analytics by month
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_analytics_issues
+  - g_analytics_issues
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216174926_g_analytics_productivity_monthly.yml b/ee/config/metrics/counts_28d/20210216174926_g_analytics_productivity_monthly.yml
index 3815bc9380b5b8a400c1da5bfe81001452beae52..3ad3f7bbdb880f5be7b6fea42f2eb609b03d33dd 100644
--- a/ee/config/metrics/counts_28d/20210216174926_g_analytics_productivity_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174926_g_analytics_productivity_monthly.yml
@@ -6,7 +6,7 @@ description: Unique visitors to /groups/:group/-/analytics/productivity_analytic
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -14,10 +14,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_analytics_productivity
+  - g_analytics_productivity
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216174929_g_analytics_valuestream_monthly.yml b/ee/config/metrics/counts_28d/20210216174929_g_analytics_valuestream_monthly.yml
index c2e20f2cf9d5d56ca5f0b8b834c998808fa68747..a880587717529a2bbb9946a687dde5ee18359407 100644
--- a/ee/config/metrics/counts_28d/20210216174929_g_analytics_valuestream_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174929_g_analytics_valuestream_monthly.yml
@@ -6,7 +6,7 @@ description: Unique visitors to /groups/:group/-/analytics/value_stream_analytic
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -14,10 +14,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_analytics_valuestream
+  - g_analytics_valuestream
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216174937_p_analytics_code_reviews_monthly.yml b/ee/config/metrics/counts_28d/20210216174937_p_analytics_code_reviews_monthly.yml
index 4247b9d71fdafdbb2eca767b7c294f2c791ba7c7..e31994b4f99cd6814640b4383c014d69d2b258ef 100644
--- a/ee/config/metrics/counts_28d/20210216174937_p_analytics_code_reviews_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174937_p_analytics_code_reviews_monthly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /:group/:project/-/analytics/code_reviews by mon
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_analytics_code_reviews
+  - p_analytics_code_reviews
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216174945_p_analytics_insights_monthly.yml b/ee/config/metrics/counts_28d/20210216174945_p_analytics_insights_monthly.yml
index 08115e3537e6378c53b082fce1c5db35c2d94313..43692b40c501b354f468bc083e5742443ad7fb6b 100644
--- a/ee/config/metrics/counts_28d/20210216174945_p_analytics_insights_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174945_p_analytics_insights_monthly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /:group/:project/insights/ by month
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_analytics_insights
+  - p_analytics_insights
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216174949_p_analytics_issues_monthly.yml b/ee/config/metrics/counts_28d/20210216174949_p_analytics_issues_monthly.yml
index 2353a0988fa7f63d1b78612c8b8fc118815396db..5472399decb9a480228663f6b2a5bda3f1eba963 100644
--- a/ee/config/metrics/counts_28d/20210216174949_p_analytics_issues_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174949_p_analytics_issues_monthly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /:group/:project/-/analytics/issues_analytics by
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_analytics_issues
+  - p_analytics_issues
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216174953_p_analytics_repo_monthly.yml b/ee/config/metrics/counts_28d/20210216174953_p_analytics_repo_monthly.yml
index 4521fd0bd7fefb7f7b6610633b6d123f422c0851..f71d8d8cc8cb0c85cda300cdb8d22c5fa1110326 100644
--- a/ee/config/metrics/counts_28d/20210216174953_p_analytics_repo_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216174953_p_analytics_repo_monthly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /:group/:project/-/graphs/master/charts by month
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_analytics_repo
+  - p_analytics_repo
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216175008_p_analytics_merge_request_monthly.yml b/ee/config/metrics/counts_28d/20210216175008_p_analytics_merge_request_monthly.yml
index 57e254eb2f7615a176e07234fb97b647b09aebe0..be55399e3d5d5224faf8aec43dbb859e1a52c88b 100644
--- a/ee/config/metrics/counts_28d/20210216175008_p_analytics_merge_request_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216175008_p_analytics_merge_request_monthly.yml
@@ -6,7 +6,7 @@ description: Unique visitors to /:group/:project/-/analytics/merge_request_analy
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -14,10 +14,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_analytics_merge_request
+  - p_analytics_merge_request
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216175103_merge_requests_with_added_rules.yml b/ee/config/metrics/counts_28d/20210216175103_merge_requests_with_added_rules.yml
index 7dccbe4955b114e4f602dcf909ba8f9537d7dfca..d788ce185451ccebcbcdfcaeb61137f7ca4ddfbc 100644
--- a/ee/config/metrics/counts_28d/20210216175103_merge_requests_with_added_rules.yml
+++ b/ee/config/metrics/counts_28d/20210216175103_merge_requests_with_added_rules.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216175105_merge_requests_with_optional_codeowners.yml b/ee/config/metrics/counts_28d/20210216175105_merge_requests_with_optional_codeowners.yml
index 9b062628466b83d4eabd69b7faab5fbd391fc9d2..de0b508066f912a81511e555eb7ef6d78219b40f 100644
--- a/ee/config/metrics/counts_28d/20210216175105_merge_requests_with_optional_codeowners.yml
+++ b/ee/config/metrics/counts_28d/20210216175105_merge_requests_with_optional_codeowners.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216175107_merge_requests_with_required_codeowners.yml b/ee/config/metrics/counts_28d/20210216175107_merge_requests_with_required_codeowners.yml
index 7ba46ad410d62ddddc35f67e2f7495292caa86f1..7aba691f7babe7895a5cc5d8850158b2cc6a7d18 100644
--- a/ee/config/metrics/counts_28d/20210216175107_merge_requests_with_required_codeowners.yml
+++ b/ee/config/metrics/counts_28d/20210216175107_merge_requests_with_required_codeowners.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216175222_user_dependency_scanning_jobs.yml b/ee/config/metrics/counts_28d/20210216175222_user_dependency_scanning_jobs.yml
index 5c7f5bd8ac8df8e1d3f69cd61ea51e652580d753..1d5d771c7a61201bcc3c57be933a23d204aed102 100644
--- a/ee/config/metrics/counts_28d/20210216175222_user_dependency_scanning_jobs.yml
+++ b/ee/config/metrics/counts_28d/20210216175222_user_dependency_scanning_jobs.yml
@@ -17,3 +17,4 @@ tier:
 performance_indicator_type:
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216175224_user_license_management_jobs.yml b/ee/config/metrics/counts_28d/20210216175224_user_license_management_jobs.yml
index 67a6c537000b05a5628245ec2522c826b6d1d3b6..7689ed1b19123af2d6b9860e3ef9060fd99da4dd 100644
--- a/ee/config/metrics/counts_28d/20210216175224_user_license_management_jobs.yml
+++ b/ee/config/metrics/counts_28d/20210216175224_user_license_management_jobs.yml
@@ -17,3 +17,4 @@ tier:
 performance_indicator_type:
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216175226_dependency_scanning_pipeline.yml b/ee/config/metrics/counts_28d/20210216175226_dependency_scanning_pipeline.yml
index 2a5f1c2e26dbd2f5fd120505b1ae5615575db242..efcf36b6d38fc01c579910b09af3fc2caf84736d 100644
--- a/ee/config/metrics/counts_28d/20210216175226_dependency_scanning_pipeline.yml
+++ b/ee/config/metrics/counts_28d/20210216175226_dependency_scanning_pipeline.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216175436_projects_slack_notifications_active.yml b/ee/config/metrics/counts_28d/20210216175436_projects_slack_notifications_active.yml
index 23a50e2f692525070fe0230cbb0ebb070477996f..1a790310fced75bf2248edf35a2bffc89ac7f3f3 100644
--- a/ee/config/metrics/counts_28d/20210216175436_projects_slack_notifications_active.yml
+++ b/ee/config/metrics/counts_28d/20210216175436_projects_slack_notifications_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216175437_projects_slack_slash_active.yml b/ee/config/metrics/counts_28d/20210216175437_projects_slack_slash_active.yml
index 61fd227b6d8dcaf57db8787d1a0d20d7e1337300..7c2cf966bbdc5be2fa928e19eb72c79cccb48dbe 100644
--- a/ee/config/metrics/counts_28d/20210216175437_projects_slack_slash_active.yml
+++ b/ee/config/metrics/counts_28d/20210216175437_projects_slack_slash_active.yml
@@ -18,3 +18,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216175505_user_container_scanning_jobs.yml b/ee/config/metrics/counts_28d/20210216175505_user_container_scanning_jobs.yml
index b8af678dd3145c9b5d651abad855f3c4bebefb11..c95268f3b371e0a44ee391ef182726eefe61fc20 100644
--- a/ee/config/metrics/counts_28d/20210216175505_user_container_scanning_jobs.yml
+++ b/ee/config/metrics/counts_28d/20210216175505_user_container_scanning_jobs.yml
@@ -18,3 +18,4 @@ performance_indicator_type:
 - smau
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216175507_container_scanning_pipeline.yml b/ee/config/metrics/counts_28d/20210216175507_container_scanning_pipeline.yml
index 5262a0067cd1d533193549d6353a3001a3492239..0425176d1bc54652949150886a87e378828b6d53 100644
--- a/ee/config/metrics/counts_28d/20210216175507_container_scanning_pipeline.yml
+++ b/ee/config/metrics/counts_28d/20210216175507_container_scanning_pipeline.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216175558_projects_reporting_ci_cd_back_to_github.yml b/ee/config/metrics/counts_28d/20210216175558_projects_reporting_ci_cd_back_to_github.yml
index 64a25d5d6ca556d70f3c41d0db305de1451b98fa..f28bf5431b77bdbe0237454c650c84954dad3476 100644
--- a/ee/config/metrics/counts_28d/20210216175558_projects_reporting_ci_cd_back_to_github.yml
+++ b/ee/config/metrics/counts_28d/20210216175558_projects_reporting_ci_cd_back_to_github.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216175616_user_dast_jobs.yml b/ee/config/metrics/counts_28d/20210216175616_user_dast_jobs.yml
index e0ecb5d697490eb060f997ca639a5ff73c6adf61..768bcaf971c766ceec35a2fd798498be4d123985 100644
--- a/ee/config/metrics/counts_28d/20210216175616_user_dast_jobs.yml
+++ b/ee/config/metrics/counts_28d/20210216175616_user_dast_jobs.yml
@@ -17,3 +17,4 @@ tier:
 performance_indicator_type:
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216175618_dast_pipeline.yml b/ee/config/metrics/counts_28d/20210216175618_dast_pipeline.yml
index 509b88a81d64a0538bc55cda2c56dd391905b722..7bb32c8a47cebf17d2efa52c663cd6304ddea3db 100644
--- a/ee/config/metrics/counts_28d/20210216175618_dast_pipeline.yml
+++ b/ee/config/metrics/counts_28d/20210216175618_dast_pipeline.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216180355_user_api_fuzzing_jobs.yml b/ee/config/metrics/counts_28d/20210216180355_user_api_fuzzing_jobs.yml
index 303a00a7c3421b99d5e5540a2631e4c09d4b32ee..2a987292466ca6db95b04636a1bf7fdf51bb29aa 100644
--- a/ee/config/metrics/counts_28d/20210216180355_user_api_fuzzing_jobs.yml
+++ b/ee/config/metrics/counts_28d/20210216180355_user_api_fuzzing_jobs.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216180357_user_api_fuzzing_dnd_jobs.yml b/ee/config/metrics/counts_28d/20210216180357_user_api_fuzzing_dnd_jobs.yml
index 53f4eebc5c179eb7ca554acda5edd8dd46c84337..ce80493419c89acea2902feda74e3e30650e3f55 100644
--- a/ee/config/metrics/counts_28d/20210216180357_user_api_fuzzing_dnd_jobs.yml
+++ b/ee/config/metrics/counts_28d/20210216180357_user_api_fuzzing_dnd_jobs.yml
@@ -14,3 +14,4 @@ distribution:
 - ee
 tier:
 - ultimate
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216180359_coverage_fuzzing_pipeline.yml b/ee/config/metrics/counts_28d/20210216180359_coverage_fuzzing_pipeline.yml
index c4a5d8b3c91ee927f16b563cbefad6ab87d7f77d..af78902e847212cae39e4c7a35b4f538783def84 100644
--- a/ee/config/metrics/counts_28d/20210216180359_coverage_fuzzing_pipeline.yml
+++ b/ee/config/metrics/counts_28d/20210216180359_coverage_fuzzing_pipeline.yml
@@ -16,3 +16,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216180401_api_fuzzing_pipeline.yml b/ee/config/metrics/counts_28d/20210216180401_api_fuzzing_pipeline.yml
index fceefd1a56af03b8c3c426bdaed44899dad9ff2b..775f55fc456067b602e8c39674816695d652b4e0 100644
--- a/ee/config/metrics/counts_28d/20210216180401_api_fuzzing_pipeline.yml
+++ b/ee/config/metrics/counts_28d/20210216180401_api_fuzzing_pipeline.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216180427_i_search_advanced_monthly.yml b/ee/config/metrics/counts_28d/20210216180427_i_search_advanced_monthly.yml
index 41069adbc4415e38d3051e1bd6e2defd08e7bb91..08c22565dcacc45f459477738a800a53dbc61ea1 100644
--- a/ee/config/metrics/counts_28d/20210216180427_i_search_advanced_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216180427_i_search_advanced_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216180607_incident_management_incident_published_monthly.yml b/ee/config/metrics/counts_28d/20210216180607_incident_management_incident_published_monthly.yml
index 4882f45b4e002444579bab49eac665b8915953ee..c635c71776ea3523b19708afe20a3c66ea1b18f8 100644
--- a/ee/config/metrics/counts_28d/20210216180607_incident_management_incident_published_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216180607_incident_management_incident_published_monthly.yml
@@ -5,7 +5,7 @@ description: Count of unique users that published incidents per month
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -21,3 +21,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216180820_ldap_keys.yml b/ee/config/metrics/counts_28d/20210216180820_ldap_keys.yml
index 99072393c5aaf6f4d2dbf07d1f180850890260ff..9e51f5302572a89c575a6cadbe7dce462a2aa457 100644
--- a/ee/config/metrics/counts_28d/20210216180820_ldap_keys.yml
+++ b/ee/config/metrics/counts_28d/20210216180820_ldap_keys.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216180822_ldap_users.yml b/ee/config/metrics/counts_28d/20210216180822_ldap_users.yml
index 6abc16400ce67312c7d2d21dd2b1ededc9d70d26..968fa8b701cec0bf164aaef38be0e71cc54b7775 100644
--- a/ee/config/metrics/counts_28d/20210216180822_ldap_users.yml
+++ b/ee/config/metrics/counts_28d/20210216180822_ldap_users.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216180824_value_stream_management_customized_group_stages.yml b/ee/config/metrics/counts_28d/20210216180824_value_stream_management_customized_group_stages.yml
index 008ae9bce676393e4a71e0f9869277d5c95dc60e..5157a158b551a0ba9eb4c602ff7dacd8805e1236 100644
--- a/ee/config/metrics/counts_28d/20210216180824_value_stream_management_customized_group_stages.yml
+++ b/ee/config/metrics/counts_28d/20210216180824_value_stream_management_customized_group_stages.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage_monthly.manage.value_stream_management_customized_group_stages
-description: 
+description:
 product_section: dev
-product_stage: 
+product_stage:
 product_group: group::manage
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -17,3 +17,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216180825_projects_with_compliance_framework.yml b/ee/config/metrics/counts_28d/20210216180825_projects_with_compliance_framework.yml
index 054797c3b26deb58acd5f3edce4364c86cca3256..63b75abeac7b2e56a3ff5a4ec7690ee1b15e0673 100644
--- a/ee/config/metrics/counts_28d/20210216180825_projects_with_compliance_framework.yml
+++ b/ee/config/metrics/counts_28d/20210216180825_projects_with_compliance_framework.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216180827_ldap_servers.yml b/ee/config/metrics/counts_28d/20210216180827_ldap_servers.yml
index 9f4f11ffa48e956c022142619f2d4ae481bc380d..337247594bbb2cca5afc74c7351b3abebd0efb45 100644
--- a/ee/config/metrics/counts_28d/20210216180827_ldap_servers.yml
+++ b/ee/config/metrics/counts_28d/20210216180827_ldap_servers.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181156_assignee_lists.yml b/ee/config/metrics/counts_28d/20210216181156_assignee_lists.yml
index 4bbfb8259d2233877174679392b3221c093b0c68..28584f71ec918df63033f250169e6e973c67a3c2 100644
--- a/ee/config/metrics/counts_28d/20210216181156_assignee_lists.yml
+++ b/ee/config/metrics/counts_28d/20210216181156_assignee_lists.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181201_milestone_lists.yml b/ee/config/metrics/counts_28d/20210216181201_milestone_lists.yml
index d84961a1414f19049c9d106f4df524faa33a33fe..6176b4215266b6a87b11538cee04e0586b9e562b 100644
--- a/ee/config/metrics/counts_28d/20210216181201_milestone_lists.yml
+++ b/ee/config/metrics/counts_28d/20210216181201_milestone_lists.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181341_g_project_management_issue_iteration_changed_monthly.yml b/ee/config/metrics/counts_28d/20210216181341_g_project_management_issue_iteration_changed_monthly.yml
index 9fb32072133a84d5f4a7d3a5393cc68eec3f9dcf..4135c8841d5d7e71dcc11d4d6143c2c733201862 100644
--- a/ee/config/metrics/counts_28d/20210216181341_g_project_management_issue_iteration_changed_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181341_g_project_management_issue_iteration_changed_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181345_g_project_management_issue_weight_changed_monthly.yml b/ee/config/metrics/counts_28d/20210216181345_g_project_management_issue_weight_changed_monthly.yml
index 5ff7c55021ccd3ac934bb4509aa7f9f24515df70..eae4a350ea97daa9fd042b0714f10673616669e3 100644
--- a/ee/config/metrics/counts_28d/20210216181345_g_project_management_issue_weight_changed_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181345_g_project_management_issue_weight_changed_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181414_g_project_management_issue_added_to_epic_monthly.yml b/ee/config/metrics/counts_28d/20210216181414_g_project_management_issue_added_to_epic_monthly.yml
index edc2656649628f082ac62b80fe7cebc91d4f6e1a..e580bc7a4c29b28e772f4d3f94097aa41fbc17ae 100644
--- a/ee/config/metrics/counts_28d/20210216181414_g_project_management_issue_added_to_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181414_g_project_management_issue_added_to_epic_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181416_g_project_management_issue_removed_from_epic_monthly.yml b/ee/config/metrics/counts_28d/20210216181416_g_project_management_issue_removed_from_epic_monthly.yml
index 76a1950b79b11dc1c90a073504482d3e913fd2d0..42a04f59f644dcc1c966c70d544e3bf5fd9e52c1 100644
--- a/ee/config/metrics/counts_28d/20210216181416_g_project_management_issue_removed_from_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181416_g_project_management_issue_removed_from_epic_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181420_g_project_management_issue_changed_epic_monthly.yml b/ee/config/metrics/counts_28d/20210216181420_g_project_management_issue_changed_epic_monthly.yml
index 73a5428f4677d3cc74ba0a69a3073bd65faa0814..a4b9b36e7ffe076d034e0a632594e3e65ceb71fb 100644
--- a/ee/config/metrics/counts_28d/20210216181420_g_project_management_issue_changed_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181420_g_project_management_issue_changed_epic_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181457_g_project_management_issue_health_status_changed_monthly.yml b/ee/config/metrics/counts_28d/20210216181457_g_project_management_issue_health_status_changed_monthly.yml
index 6fb62b17319c3dd422c16d4d74468e452b9c85ff..a6d9fdc7f5dc52e7273865048dcb9c809b0cc866 100644
--- a/ee/config/metrics/counts_28d/20210216181457_g_project_management_issue_health_status_changed_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181457_g_project_management_issue_health_status_changed_monthly.yml
@@ -19,3 +19,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml b/ee/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml
index 5c4cd313b295ddfb5d3bd3bfbf97c9b089a5399a..cb155353e76f7d6b692aaa7291810efa6067fba4 100644
--- a/ee/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181516_i_quickactions_assign_multiple_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181534_i_quickactions_child_epic_monthly.yml b/ee/config/metrics/counts_28d/20210216181534_i_quickactions_child_epic_monthly.yml
index 6035bbf07e886b4ff90003b8aa381e1c84cda4fa..57bf1ff9e28d194eb6e4f80e50f748b2dd642325 100644
--- a/ee/config/metrics/counts_28d/20210216181534_i_quickactions_child_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181534_i_quickactions_child_epic_monthly.yml
@@ -19,3 +19,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181538_i_quickactions_clear_weight_monthly.yml b/ee/config/metrics/counts_28d/20210216181538_i_quickactions_clear_weight_monthly.yml
index 0a46150d60d00544a36fe7770a1cac20410ca91a..09a53b1cf71a77aed1ecca03f9c055de558de81d 100644
--- a/ee/config/metrics/counts_28d/20210216181538_i_quickactions_clear_weight_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181538_i_quickactions_clear_weight_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181618_i_quickactions_epic_monthly.yml b/ee/config/metrics/counts_28d/20210216181618_i_quickactions_epic_monthly.yml
index ac87bfdf92cfcf1fc7a36ad865941f00447a58bc..b798edc7927da345376616effc236c139a0737d3 100644
--- a/ee/config/metrics/counts_28d/20210216181618_i_quickactions_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181618_i_quickactions_epic_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181626_i_quickactions_iteration_monthly.yml b/ee/config/metrics/counts_28d/20210216181626_i_quickactions_iteration_monthly.yml
index 3cd6ed2c741f93607e143316234f2b8ddebbdac6..337ae9169cf316a4256ab69f95c603a5945c743b 100644
--- a/ee/config/metrics/counts_28d/20210216181626_i_quickactions_iteration_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181626_i_quickactions_iteration_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181648_i_quickactions_parent_epic_monthly.yml b/ee/config/metrics/counts_28d/20210216181648_i_quickactions_parent_epic_monthly.yml
index 44d56688a6d9e8416f77c4b484c2021ee88b0f5e..8ac4feff36157dba2904eca104af4d799b0572f0 100644
--- a/ee/config/metrics/counts_28d/20210216181648_i_quickactions_parent_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181648_i_quickactions_parent_epic_monthly.yml
@@ -19,3 +19,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181652_i_quickactions_promote_monthly.yml b/ee/config/metrics/counts_28d/20210216181652_i_quickactions_promote_monthly.yml
index 9059e6ae9242cb395821170623beaed21997c544..ab7753329337012d80f31ae5ca3bb304652d3c19 100644
--- a/ee/config/metrics/counts_28d/20210216181652_i_quickactions_promote_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181652_i_quickactions_promote_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181655_i_quickactions_publish_monthly.yml b/ee/config/metrics/counts_28d/20210216181655_i_quickactions_publish_monthly.yml
index 46056953f81abe1210093d9f3ed157d429e31b55..132ef3310d73680467985ddba760cb1fa7ad4145 100644
--- a/ee/config/metrics/counts_28d/20210216181655_i_quickactions_publish_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181655_i_quickactions_publish_monthly.yml
@@ -19,3 +19,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181718_i_quickactions_remove_child_epic_monthly.yml b/ee/config/metrics/counts_28d/20210216181718_i_quickactions_remove_child_epic_monthly.yml
index 80be9f595538f64c7460608ad8afcfcfe35b2aba..de97d4574cf39454864665ade9b381f6b84b05ac 100644
--- a/ee/config/metrics/counts_28d/20210216181718_i_quickactions_remove_child_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181718_i_quickactions_remove_child_epic_monthly.yml
@@ -19,3 +19,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181725_i_quickactions_remove_epic_monthly.yml b/ee/config/metrics/counts_28d/20210216181725_i_quickactions_remove_epic_monthly.yml
index 8a39719e8ac9b9c9b17a61a9516f37385dd5c16b..43492087e95cfa306d5328eaeca7debdd9d5a748 100644
--- a/ee/config/metrics/counts_28d/20210216181725_i_quickactions_remove_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181725_i_quickactions_remove_epic_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181732_i_quickactions_remove_iteration_monthly.yml b/ee/config/metrics/counts_28d/20210216181732_i_quickactions_remove_iteration_monthly.yml
index 39808f364bc9ed34c3e271ff4c6f118e86cd5159..12a8075bd13081915a57a328a0bd6623b6283abe 100644
--- a/ee/config/metrics/counts_28d/20210216181732_i_quickactions_remove_iteration_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181732_i_quickactions_remove_iteration_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181740_i_quickactions_remove_parent_epic_monthly.yml b/ee/config/metrics/counts_28d/20210216181740_i_quickactions_remove_parent_epic_monthly.yml
index e47e52b1cc33d2dff8d8b7945ccee6a497dddc4f..baefef40abfa529fb518530e02d647945009d687 100644
--- a/ee/config/metrics/counts_28d/20210216181740_i_quickactions_remove_parent_epic_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181740_i_quickactions_remove_parent_epic_monthly.yml
@@ -19,3 +19,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181857_i_quickactions_weight_monthly.yml b/ee/config/metrics/counts_28d/20210216181857_i_quickactions_weight_monthly.yml
index 268ba4ddf271860ad841c2993512b51f52295439..7967eeb5103c3cb91547355a7e446e3a8ae42985 100644
--- a/ee/config/metrics/counts_28d/20210216181857_i_quickactions_weight_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216181857_i_quickactions_weight_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216181943_projects_mirrored_with_pipelines_enabled.yml b/ee/config/metrics/counts_28d/20210216181943_projects_mirrored_with_pipelines_enabled.yml
index f06dbe3bd6a1f1351ca297979f4875ade9315932..b3577995f005a132dc6724b6dbfa54bff005d686 100644
--- a/ee/config/metrics/counts_28d/20210216181943_projects_mirrored_with_pipelines_enabled.yml
+++ b/ee/config/metrics/counts_28d/20210216181943_projects_mirrored_with_pipelines_enabled.yml
@@ -5,7 +5,7 @@ description: Count creator_id from projects with repository mirroring enabled.
 product_section: ops
 product_stage: verify
 product_group: group::pipeline execution
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 28d
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182043_projects_enforcing_code_owner_approval.yml b/ee/config/metrics/counts_28d/20210216182043_projects_enforcing_code_owner_approval.yml
index f48831106ad697a336a4789920cc135f147110ca..808fdd0ca30ad8a35f5ec9a659fd4c156bf0c935 100644
--- a/ee/config/metrics/counts_28d/20210216182043_projects_enforcing_code_owner_approval.yml
+++ b/ee/config/metrics/counts_28d/20210216182043_projects_enforcing_code_owner_approval.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182045_projects_with_sectional_code_owner_rules.yml b/ee/config/metrics/counts_28d/20210216182045_projects_with_sectional_code_owner_rules.yml
index ea9a1bfc7452d1b26706fd32716fec9e129ea24b..bda0b82a8deb5484cd82a22ee9c5b34bd60179e5 100644
--- a/ee/config/metrics/counts_28d/20210216182045_projects_with_sectional_code_owner_rules.yml
+++ b/ee/config/metrics/counts_28d/20210216182045_projects_with_sectional_code_owner_rules.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182047_merge_requests_with_overridden_project_rules.yml b/ee/config/metrics/counts_28d/20210216182047_merge_requests_with_overridden_project_rules.yml
index 9323c8988090554ce81f8e6fbf602df6c7a79e89..d424f23ccc916bb35e3e73c50fa2de90d11e85b6 100644
--- a/ee/config/metrics/counts_28d/20210216182047_merge_requests_with_overridden_project_rules.yml
+++ b/ee/config/metrics/counts_28d/20210216182047_merge_requests_with_overridden_project_rules.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182049_projects_with_repositories_enabled.yml b/ee/config/metrics/counts_28d/20210216182049_projects_with_repositories_enabled.yml
index dda3f2f59f9beb3844cd95e18833156f93d018a8..a609faeb50fd24ae19a4b62f1851ec74dbaaa84c 100644
--- a/ee/config/metrics/counts_28d/20210216182049_projects_with_repositories_enabled.yml
+++ b/ee/config/metrics/counts_28d/20210216182049_projects_with_repositories_enabled.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182053_users_using_path_locks.yml b/ee/config/metrics/counts_28d/20210216182053_users_using_path_locks.yml
index 7554ddf0ec7741331dc5c4a17500e4aabef1e9a1..f010bb12c5f9cd47a7b1e7eba61c56e9aa1fb44b 100644
--- a/ee/config/metrics/counts_28d/20210216182053_users_using_path_locks.yml
+++ b/ee/config/metrics/counts_28d/20210216182053_users_using_path_locks.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182054_users_using_lfs_locks.yml b/ee/config/metrics/counts_28d/20210216182054_users_using_lfs_locks.yml
index efeb8e889369b5403ed8d1376d73f978dc164b4d..bb98bab68c79cc7d1aaaddc4c62ab0b854077421 100644
--- a/ee/config/metrics/counts_28d/20210216182054_users_using_lfs_locks.yml
+++ b/ee/config/metrics/counts_28d/20210216182054_users_using_lfs_locks.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182056_approval_project_rules.yml b/ee/config/metrics/counts_28d/20210216182056_approval_project_rules.yml
index 6943d48f36eefbc85761da1703234dac1fc59605..8d721f24821efea14d8d6e780a9896ac17779f1b 100644
--- a/ee/config/metrics/counts_28d/20210216182056_approval_project_rules.yml
+++ b/ee/config/metrics/counts_28d/20210216182056_approval_project_rules.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182058_approval_project_rules_with_target_branch.yml b/ee/config/metrics/counts_28d/20210216182058_approval_project_rules_with_target_branch.yml
index 8b713b91aa99c1cc06e317e7f6cd788d46089a5c..497516a481004474318145fe6a31a0dfd2dc7ce9 100644
--- a/ee/config/metrics/counts_28d/20210216182058_approval_project_rules_with_target_branch.yml
+++ b/ee/config/metrics/counts_28d/20210216182058_approval_project_rules_with_target_branch.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182139_i_testing_metrics_report_widget_total_monthly.yml b/ee/config/metrics/counts_28d/20210216182139_i_testing_metrics_report_widget_total_monthly.yml
index 62a2f221f80e8832dc3383f585304efac782acca..7a053c22888b4cb6cd87f734b1ce2fb86c42d38f 100644
--- a/ee/config/metrics/counts_28d/20210216182139_i_testing_metrics_report_widget_total_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216182139_i_testing_metrics_report_widget_total_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182143_i_testing_group_code_coverage_visit_total_monthly.yml b/ee/config/metrics/counts_28d/20210216182143_i_testing_group_code_coverage_visit_total_monthly.yml
index 2a2e945f0f2f9ef8c3b31d7096af615eb15cdf63..4f796487fee1fab2a415da414b575f9917bd31e6 100644
--- a/ee/config/metrics/counts_28d/20210216182143_i_testing_group_code_coverage_visit_total_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216182143_i_testing_group_code_coverage_visit_total_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182147_i_testing_full_code_quality_report_total_monthly.yml b/ee/config/metrics/counts_28d/20210216182147_i_testing_full_code_quality_report_total_monthly.yml
index e43f1a5363142831f1d098b1ee1a05f912c654b1..4595701e1f1ad2c753cb1f58713ca10bb423ba66 100644
--- a/ee/config/metrics/counts_28d/20210216182147_i_testing_full_code_quality_report_total_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216182147_i_testing_full_code_quality_report_total_monthly.yml
@@ -21,3 +21,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182151_i_testing_web_performance_widget_total_monthly.yml b/ee/config/metrics/counts_28d/20210216182151_i_testing_web_performance_widget_total_monthly.yml
index da746a2906d5126c55c912d4732148d188a0cf6c..6e951aa0e50373ed41fb702c655c2e5fe26688c4 100644
--- a/ee/config/metrics/counts_28d/20210216182151_i_testing_web_performance_widget_total_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216182151_i_testing_web_performance_widget_total_monthly.yml
@@ -21,3 +21,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182153_i_testing_group_code_coverage_project_click_total_monthly.yml b/ee/config/metrics/counts_28d/20210216182153_i_testing_group_code_coverage_project_click_total_monthly.yml
index c791a42b37ac4f209f7583541a96f179ec163f48..a5c4d213eed9da3725ab079e04e7c07a9f3e92cd 100644
--- a/ee/config/metrics/counts_28d/20210216182153_i_testing_group_code_coverage_project_click_total_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216182153_i_testing_group_code_coverage_project_click_total_monthly.yml
@@ -21,3 +21,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182156_i_testing_load_performance_widget_total_monthly.yml b/ee/config/metrics/counts_28d/20210216182156_i_testing_load_performance_widget_total_monthly.yml
index 4563c2df649ec27e55ffc92b54d85950360acca6..958451b69cc95cc9b0d47ec0242d3bdd7a74f953 100644
--- a/ee/config/metrics/counts_28d/20210216182156_i_testing_load_performance_widget_total_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216182156_i_testing_load_performance_widget_total_monthly.yml
@@ -21,3 +21,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182200_i_testing_metrics_report_artifact_uploaders_monthly.yml b/ee/config/metrics/counts_28d/20210216182200_i_testing_metrics_report_artifact_uploaders_monthly.yml
index e9bc9a99a1deea89b74cf08283f16ea9d279d622..1b6abc4bce62c58588824bcca78038c7ec6e0607 100644
--- a/ee/config/metrics/counts_28d/20210216182200_i_testing_metrics_report_artifact_uploaders_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216182200_i_testing_metrics_report_artifact_uploaders_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216182209_user_preferences_group_overview_security_dashboard.yml b/ee/config/metrics/counts_28d/20210216182209_user_preferences_group_overview_security_dashboard.yml
index 6625d9f79efe5dc804091aecc29f27588df11ec9..7c2754d17b1908feb3440cbb4eb9d857e13f88d9 100644
--- a/ee/config/metrics/counts_28d/20210216182209_user_preferences_group_overview_security_dashboard.yml
+++ b/ee/config/metrics/counts_28d/20210216182209_user_preferences_group_overview_security_dashboard.yml
@@ -16,3 +16,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183201_compliance_features_track_unique_visits_union.yml b/ee/config/metrics/counts_28d/20210216183201_compliance_features_track_unique_visits_union.yml
index 7f0230bfe5199209bed91b2283baa0f890b14dad..2bd9edd4716ae90ac9b1d5a00bea5c13b8793fac 100644
--- a/ee/config/metrics/counts_28d/20210216183201_compliance_features_track_unique_visits_union.yml
+++ b/ee/config/metrics/counts_28d/20210216183201_compliance_features_track_unique_visits_union.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183209_i_testing_paid_monthly_active_user_total.yml b/ee/config/metrics/counts_28d/20210216183209_i_testing_paid_monthly_active_user_total.yml
index 4f175c69636d6d7e28f31c38691173537193a553..63cbffd46b9d98ae0517893a2978ff793c973917 100644
--- a/ee/config/metrics/counts_28d/20210216183209_i_testing_paid_monthly_active_user_total.yml
+++ b/ee/config/metrics/counts_28d/20210216183209_i_testing_paid_monthly_active_user_total.yml
@@ -18,3 +18,4 @@ tier:
 - ultimate
 performance_indicator_type:
 - paid_gmau
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183613_total_number_of_path_locks.yml b/ee/config/metrics/counts_28d/20210216183613_total_number_of_path_locks.yml
index 6afd203bb6ef77d99f7a114fbfadd8aa4fec9448..811f8c5b5a26de101de37d0b3658d8909eb52bb2 100644
--- a/ee/config/metrics/counts_28d/20210216183613_total_number_of_path_locks.yml
+++ b/ee/config/metrics/counts_28d/20210216183613_total_number_of_path_locks.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183614_total_number_of_locked_files.yml b/ee/config/metrics/counts_28d/20210216183614_total_number_of_locked_files.yml
index 51798aaea559b358567db08546b521c7e4ce851a..c2e49e521a033c64aacc13ff3e97d3a5b2796ca0 100644
--- a/ee/config/metrics/counts_28d/20210216183614_total_number_of_locked_files.yml
+++ b/ee/config/metrics/counts_28d/20210216183614_total_number_of_locked_files.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183618_approval_project_rules_with_more_approvers_than_required.yml b/ee/config/metrics/counts_28d/20210216183618_approval_project_rules_with_more_approvers_than_required.yml
index 6af7c91799ac9f4e29c1795b2f9e059bdf7a9073..5ff3195f83ecc3258aa1732d7ce40b1a9172c65c 100644
--- a/ee/config/metrics/counts_28d/20210216183618_approval_project_rules_with_more_approvers_than_required.yml
+++ b/ee/config/metrics/counts_28d/20210216183618_approval_project_rules_with_more_approvers_than_required.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183620_approval_project_rules_with_less_approvers_than_required.yml b/ee/config/metrics/counts_28d/20210216183620_approval_project_rules_with_less_approvers_than_required.yml
index 2c4fada97a4686615e6e0d7772949248908c4d82..5c517d556e3964a83da29da4a2d4588033ffccdf 100644
--- a/ee/config/metrics/counts_28d/20210216183620_approval_project_rules_with_less_approvers_than_required.yml
+++ b/ee/config/metrics/counts_28d/20210216183620_approval_project_rules_with_less_approvers_than_required.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183622_approval_project_rules_with_exact_required_approvers.yml b/ee/config/metrics/counts_28d/20210216183622_approval_project_rules_with_exact_required_approvers.yml
index b0e68831e701ab03ee07d45565b910a6ce91191d..583237296651e81a86b29195610abb5ebe84192d 100644
--- a/ee/config/metrics/counts_28d/20210216183622_approval_project_rules_with_exact_required_approvers.yml
+++ b/ee/config/metrics/counts_28d/20210216183622_approval_project_rules_with_exact_required_approvers.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183817_user_coverage_fuzzing_jobs.yml b/ee/config/metrics/counts_28d/20210216183817_user_coverage_fuzzing_jobs.yml
index f558fcc9165ab0f49c93d89794a06c2f1f0902c5..9c21f314f1a73a8887690c51abddb5c18cf60314 100644
--- a/ee/config/metrics/counts_28d/20210216183817_user_coverage_fuzzing_jobs.yml
+++ b/ee/config/metrics/counts_28d/20210216183817_user_coverage_fuzzing_jobs.yml
@@ -17,3 +17,4 @@ tier:
 performance_indicator_type:
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183828_dependency_scanning_scans.yml b/ee/config/metrics/counts_28d/20210216183828_dependency_scanning_scans.yml
index cf4fb210122da576cbdd24621349aa9fe7cce466..1098b2bb42036891d3d87ab0c372c786371f7a73 100644
--- a/ee/config/metrics/counts_28d/20210216183828_dependency_scanning_scans.yml
+++ b/ee/config/metrics/counts_28d/20210216183828_dependency_scanning_scans.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183832_dast_scans.yml b/ee/config/metrics/counts_28d/20210216183832_dast_scans.yml
index 3d65cebd79d27c051d0e1ddd3d4008648b532683..ece7d711078dc3079db0abe94a823c14ed1a8269 100644
--- a/ee/config/metrics/counts_28d/20210216183832_dast_scans.yml
+++ b/ee/config/metrics/counts_28d/20210216183832_dast_scans.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183836_coverage_fuzzing_scans.yml b/ee/config/metrics/counts_28d/20210216183836_coverage_fuzzing_scans.yml
index 06d470fa6c66934ea476606bd6324d093bba8b2d..32b6c9b56cb5817f181e8469f59fb6af9303751a 100644
--- a/ee/config/metrics/counts_28d/20210216183836_coverage_fuzzing_scans.yml
+++ b/ee/config/metrics/counts_28d/20210216183836_coverage_fuzzing_scans.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183838_api_fuzzing_scans.yml b/ee/config/metrics/counts_28d/20210216183838_api_fuzzing_scans.yml
index acd2945583c6c61610504b6f117ad28bec2b86ef..4b64bf51cc37b13370db8e6d6d4650e5cf91d719 100644
--- a/ee/config/metrics/counts_28d/20210216183838_api_fuzzing_scans.yml
+++ b/ee/config/metrics/counts_28d/20210216183838_api_fuzzing_scans.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183916_compliance_unique_visits_for_any_target_monthly.yml b/ee/config/metrics/counts_28d/20210216183916_compliance_unique_visits_for_any_target_monthly.yml
index 65fb7684830eef210b5070bc8c3d2a3ebd39cc7b..e730825e2294db3a351f3afb7a89a6a46f53639c 100644
--- a/ee/config/metrics/counts_28d/20210216183916_compliance_unique_visits_for_any_target_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216183916_compliance_unique_visits_for_any_target_monthly.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183926_g_compliance_dashboard_monthly.yml b/ee/config/metrics/counts_28d/20210216183926_g_compliance_dashboard_monthly.yml
index 3c0cd76cc5b394c64489b7bac07a3a82580d8125..1d8459d6d598a2f98faff1b9762b88809f7c837b 100644
--- a/ee/config/metrics/counts_28d/20210216183926_g_compliance_dashboard_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216183926_g_compliance_dashboard_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183930_g_compliance_audit_events_monthly.yml b/ee/config/metrics/counts_28d/20210216183930_g_compliance_audit_events_monthly.yml
index c270edbb987dc0f9fcff22e5cbc86d736064e37a..a7fe0de1f9f44995e30cdb962e0ba1953224b53a 100644
--- a/ee/config/metrics/counts_28d/20210216183930_g_compliance_audit_events_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216183930_g_compliance_audit_events_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183934_i_compliance_audit_events_monthly.yml b/ee/config/metrics/counts_28d/20210216183934_i_compliance_audit_events_monthly.yml
index 31c8496d7bf254c72b5c4c166172bf0af928796c..885d8486fed576b861ac59c88adbf7457a2a21a7 100644
--- a/ee/config/metrics/counts_28d/20210216183934_i_compliance_audit_events_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216183934_i_compliance_audit_events_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183938_i_compliance_credential_inventory_monthly.yml b/ee/config/metrics/counts_28d/20210216183938_i_compliance_credential_inventory_monthly.yml
index d49773f0c7e735e2cb875c7279fc77ccb6647cc0..66d93e6547648f516b418de4d69995ff368ede32 100644
--- a/ee/config/metrics/counts_28d/20210216183938_i_compliance_credential_inventory_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216183938_i_compliance_credential_inventory_monthly.yml
@@ -19,3 +19,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183942_a_compliance_audit_events_api_monthly.yml b/ee/config/metrics/counts_28d/20210216183942_a_compliance_audit_events_api_monthly.yml
index d8877af4a091db31986ad623b017a1116d476fe2..84394a5f41556dfda5646cbb1118dc9d39d48da4 100644
--- a/ee/config/metrics/counts_28d/20210216183942_a_compliance_audit_events_api_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216183942_a_compliance_audit_events_api_monthly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216183946_compliance_total_unique_counts_monthly.yml b/ee/config/metrics/counts_28d/20210216183946_compliance_total_unique_counts_monthly.yml
index bfd1467859aca6f6443291bd44466a4558ed44c3..bc84e6ea6d05ce596fc8d46f5ff7256507058483 100644
--- a/ee/config/metrics/counts_28d/20210216183946_compliance_total_unique_counts_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216183946_compliance_total_unique_counts_monthly.yml
@@ -26,3 +26,4 @@ tier:
 performance_indicator_type:
 - gmau
 - paid_gmau
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216184251_i_ci_secrets_management_vault_build_created_monthly.yml b/ee/config/metrics/counts_28d/20210216184251_i_ci_secrets_management_vault_build_created_monthly.yml
index e85349bb23dc7035e20fb9f0e6bec39ec33f63f9..b7f808bab1f43c77ee57b8e40e4ca1f3d4b3960b 100644
--- a/ee/config/metrics/counts_28d/20210216184251_i_ci_secrets_management_vault_build_created_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216184251_i_ci_secrets_management_vault_build_created_monthly.yml
@@ -21,3 +21,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216184949_i_ecosystem_jira_service_list_issues_monthly.yml b/ee/config/metrics/counts_28d/20210216184949_i_ecosystem_jira_service_list_issues_monthly.yml
index a43392e5adb0e760b25ac5167eca5c52d28e53b5..4053b6b48c0c796bf2b2fba6a9dbb82a2486f93d 100644
--- a/ee/config/metrics/counts_28d/20210216184949_i_ecosystem_jira_service_list_issues_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216184949_i_ecosystem_jira_service_list_issues_monthly.yml
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_ecosystem_jira_service_list_issues
+  - i_ecosystem_jira_service_list_issues
 distribution:
 - ee
 tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_28d/20210216184953_i_ecosystem_jira_service_create_issue_monthly.yml b/ee/config/metrics/counts_28d/20210216184953_i_ecosystem_jira_service_create_issue_monthly.yml
index fe3af1b44fe8d83175aacdc82471e0df278c97cc..ae74211bd75b475ce5fa68061030fea613da9fe3 100644
--- a/ee/config/metrics/counts_28d/20210216184953_i_ecosystem_jira_service_create_issue_monthly.yml
+++ b/ee/config/metrics/counts_28d/20210216184953_i_ecosystem_jira_service_create_issue_monthly.yml
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_ecosystem_jira_service_create_issue
+  - i_ecosystem_jira_service_create_issue
 distribution:
 - ee
 tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216174912_g_analytics_contribution_weekly.yml b/ee/config/metrics/counts_7d/20210216174912_g_analytics_contribution_weekly.yml
index 0fe12ff590ad312a13d2c9ea03da08ac989a0422..01a034b567393b7113e43dacdf2e4ad2232a6c29 100644
--- a/ee/config/metrics/counts_7d/20210216174912_g_analytics_contribution_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174912_g_analytics_contribution_weekly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /groups/:group/-/contribution_analytics by week
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_analytics_contribution
+  - g_analytics_contribution
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216174916_g_analytics_insights_weekly.yml b/ee/config/metrics/counts_7d/20210216174916_g_analytics_insights_weekly.yml
index b8710cf99f636247748f37243fe1c7579939850d..093a21826f49a4faec842c8097487a0efd37b5bf 100644
--- a/ee/config/metrics/counts_7d/20210216174916_g_analytics_insights_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174916_g_analytics_insights_weekly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /groups/:group/-/insights/ by week
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_analytics_insights
+  - g_analytics_insights
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216174919_g_analytics_issues_weekly.yml b/ee/config/metrics/counts_7d/20210216174919_g_analytics_issues_weekly.yml
index 0eb17fe0ba54ec738b75a356173d92e569ff062d..1c133df3a5ba02e0ec4f2dab97d08ad5980f6080 100644
--- a/ee/config/metrics/counts_7d/20210216174919_g_analytics_issues_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174919_g_analytics_issues_weekly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /groups/:group/-/issues_analytics by week
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_analytics_issues
+  - g_analytics_issues
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216174923_g_analytics_productivity_weekly.yml b/ee/config/metrics/counts_7d/20210216174923_g_analytics_productivity_weekly.yml
index e8e1ed10007480f63e793410cd202876580e809e..0d14cb085c8163a01bafe4ae18ed45a897e94a6d 100644
--- a/ee/config/metrics/counts_7d/20210216174923_g_analytics_productivity_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174923_g_analytics_productivity_weekly.yml
@@ -1,11 +1,12 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.analytics.g_analytics_productivity_weekly
-description: Unique visitors to /groups/:group/-/analytics/productivity_analytics by week
+description: Unique visitors to /groups/:group/-/analytics/productivity_analytics
+  by week
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,9 +14,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_analytics_productivity
+  - g_analytics_productivity
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216174927_g_analytics_valuestream_weekly.yml b/ee/config/metrics/counts_7d/20210216174927_g_analytics_valuestream_weekly.yml
index 1d896afa80640b9f158daf3033b04a5779059199..8f043d5ffc38686bd8b8ff4b2cfb48ba0df7ff3b 100644
--- a/ee/config/metrics/counts_7d/20210216174927_g_analytics_valuestream_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174927_g_analytics_valuestream_weekly.yml
@@ -1,11 +1,12 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.analytics.g_analytics_valuestream_weekly
-description: Unique visitors to /groups/:group/-/analytics/value_stream_analytics by week
+description: Unique visitors to /groups/:group/-/analytics/value_stream_analytics
+  by week
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,9 +14,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_analytics_valuestream
+  - g_analytics_valuestream
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216174931_p_analytics_pipelines_weekly.yml b/ee/config/metrics/counts_7d/20210216174931_p_analytics_pipelines_weekly.yml
index 323c6c857464738625cc149c7a720844fe5e3a1d..42ded54980b64dc91ce6665576b2cdd0291ab46c 100644
--- a/ee/config/metrics/counts_7d/20210216174931_p_analytics_pipelines_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174931_p_analytics_pipelines_weekly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /groups/:group/-/analytics/ci_cd by week
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_analytics_pipelines
+  - p_analytics_pipelines
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216174935_p_analytics_code_reviews_weekly.yml b/ee/config/metrics/counts_7d/20210216174935_p_analytics_code_reviews_weekly.yml
index ebb29a0515558b899e4aba15e16f6b5d98c1f0ba..28b6e283f196eca4894e77832dbc10e78971b655 100644
--- a/ee/config/metrics/counts_7d/20210216174935_p_analytics_code_reviews_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174935_p_analytics_code_reviews_weekly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /:group/:project/-/analytics/code_reviews by wee
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_analytics_code_reviews
+  - p_analytics_code_reviews
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216174939_p_analytics_valuestream_weekly.yml b/ee/config/metrics/counts_7d/20210216174939_p_analytics_valuestream_weekly.yml
index af84d79e958a22d9ef71e7f8d4ce75adca5fa087..0416605b31aea28ddb88be92840c85b14b9fcbc8 100644
--- a/ee/config/metrics/counts_7d/20210216174939_p_analytics_valuestream_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174939_p_analytics_valuestream_weekly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /:group/:project/-/value_stream_analytics by wee
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_analytics_valuestream
+  - p_analytics_valuestream
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216174943_p_analytics_insights_weekly.yml b/ee/config/metrics/counts_7d/20210216174943_p_analytics_insights_weekly.yml
index ceb830f003cb14175f059a340411bac79326219d..02fd3d1f1ea1758ea8c6a987fd3ad2dbd873c64c 100644
--- a/ee/config/metrics/counts_7d/20210216174943_p_analytics_insights_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174943_p_analytics_insights_weekly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /:group/:project/insights/ by week
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_analytics_insights
+  - p_analytics_insights
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216174947_p_analytics_issues_weekly.yml b/ee/config/metrics/counts_7d/20210216174947_p_analytics_issues_weekly.yml
index 3735f225e3b8b7972cecccea33c16b58955e27e5..9b3adea7ee9e3a65cb2dd7110e773b39ac648d9e 100644
--- a/ee/config/metrics/counts_7d/20210216174947_p_analytics_issues_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174947_p_analytics_issues_weekly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /:group/:project/-/analytics/issues_analytics by
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_analytics_issues
+  - p_analytics_issues
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216174951_p_analytics_repo_weekly.yml b/ee/config/metrics/counts_7d/20210216174951_p_analytics_repo_weekly.yml
index b1cd418b9e78a78705e2e1e942d7e2315549a208..a0de4b49fc60eaed8759102ca3852d6c17204fff 100644
--- a/ee/config/metrics/counts_7d/20210216174951_p_analytics_repo_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174951_p_analytics_repo_weekly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /:group/:project/-/graphs/master/charts by week
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_analytics_repo
+  - p_analytics_repo
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216174955_i_analytics_cohorts_weekly.yml b/ee/config/metrics/counts_7d/20210216174955_i_analytics_cohorts_weekly.yml
index b4fa4946fc648cd20faed9f6cd47103c1a6162fc..e6cdc6d2663f9f2259bbf7053717ddcb05e40c36 100644
--- a/ee/config/metrics/counts_7d/20210216174955_i_analytics_cohorts_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174955_i_analytics_cohorts_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.analytics.i_analytics_cohorts_weekly
-description: 
+description:
 product_section: fulfillment
 product_stage: fulfillment
 product_group: group::utilization
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_analytics_cohorts
+  - i_analytics_cohorts
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216174958_i_analytics_dev_ops_score_weekly.yml b/ee/config/metrics/counts_7d/20210216174958_i_analytics_dev_ops_score_weekly.yml
index 12234d3f77921c2bba225cfc4d0533e4408b25b2..d42a46ac402979487bbdfb6a0e5bd57644a24078 100644
--- a/ee/config/metrics/counts_7d/20210216174958_i_analytics_dev_ops_score_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216174958_i_analytics_dev_ops_score_weekly.yml
@@ -5,7 +5,7 @@ description: Unique visitors to /admin/dev_ops_report by week
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_analytics_dev_ops_score
+  - i_analytics_dev_ops_score
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216175002_g_analytics_merge_request_weekly.yml b/ee/config/metrics/counts_7d/20210216175002_g_analytics_merge_request_weekly.yml
index a27b2109ab64468d2ca723f1c7a894a7c1fdac8c..4ad56e56efad07c7a4de0c085559db745cdb7f4b 100644
--- a/ee/config/metrics/counts_7d/20210216175002_g_analytics_merge_request_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216175002_g_analytics_merge_request_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.analytics.g_analytics_merge_request_weekly
-description: 
+description:
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: removed
 time_frame: 7d
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - g_analytics_merge_request
+  - g_analytics_merge_request
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216175006_p_analytics_merge_request_weekly.yml b/ee/config/metrics/counts_7d/20210216175006_p_analytics_merge_request_weekly.yml
index 96632bf3cea640e10937d90dd034112bdd6b519e..391c2700ecbe145a5f7a90f7211beb21f8d3aa97 100644
--- a/ee/config/metrics/counts_7d/20210216175006_p_analytics_merge_request_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216175006_p_analytics_merge_request_weekly.yml
@@ -1,11 +1,12 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.analytics.p_analytics_merge_request_weekly
-description: Unique visitors to /:group/:project/-/analytics/merge_request_analytics by week
+description: Unique visitors to /:group/:project/-/analytics/merge_request_analytics
+  by week
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -13,9 +14,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_analytics_merge_request
+  - p_analytics_merge_request
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216180425_i_search_advanced_weekly.yml b/ee/config/metrics/counts_7d/20210216180425_i_search_advanced_weekly.yml
index 9cef8476e935e50cd9b6190f4274150fce0936bc..a96f3d61ffb78a87e10f39d37154fea8218229fa 100644
--- a/ee/config/metrics/counts_7d/20210216180425_i_search_advanced_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216180425_i_search_advanced_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216180605_incident_management_incident_published_weekly.yml b/ee/config/metrics/counts_7d/20210216180605_incident_management_incident_published_weekly.yml
index 3eac7c750fd6a98553f2d0e4674f2b03e3eccdf8..3474783fbfd63ffb8e260375534fe8304e1cbdd9 100644
--- a/ee/config/metrics/counts_7d/20210216180605_incident_management_incident_published_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216180605_incident_management_incident_published_weekly.yml
@@ -5,7 +5,7 @@ description: Count of unique users that published incidents per week
 product_section: ops
 product_stage: monitor
 product_group: group::monitor
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: 7d
@@ -21,3 +21,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181339_g_project_management_issue_iteration_changed_weekly.yml b/ee/config/metrics/counts_7d/20210216181339_g_project_management_issue_iteration_changed_weekly.yml
index 0fc0892c60f23d0e7f349e8d81f556cf3450aa00..0bd568b2a2536ef2752c70bee5b52464ea15cc16 100644
--- a/ee/config/metrics/counts_7d/20210216181339_g_project_management_issue_iteration_changed_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181339_g_project_management_issue_iteration_changed_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181343_g_project_management_issue_weight_changed_weekly.yml b/ee/config/metrics/counts_7d/20210216181343_g_project_management_issue_weight_changed_weekly.yml
index 6da7314c1c26dcbb9209a681dc958503e229f49a..b706901015df2efb5d18eecaf69025dbbb399a35 100644
--- a/ee/config/metrics/counts_7d/20210216181343_g_project_management_issue_weight_changed_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181343_g_project_management_issue_weight_changed_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181413_g_project_management_issue_added_to_epic_weekly.yml b/ee/config/metrics/counts_7d/20210216181413_g_project_management_issue_added_to_epic_weekly.yml
index b4dea244d964bbaec03f0d7dc42da4406bfd5a68..a05b7df29c9bb42b63b30f052a6b860a66df1d95 100644
--- a/ee/config/metrics/counts_7d/20210216181413_g_project_management_issue_added_to_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181413_g_project_management_issue_added_to_epic_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181418_g_project_management_issue_changed_epic_weekly.yml b/ee/config/metrics/counts_7d/20210216181418_g_project_management_issue_changed_epic_weekly.yml
index 4cedb3f599e45980083a58f6de741160dbbc90ab..9ee07ae3493921adbcbb231d5dec6077cfc287a0 100644
--- a/ee/config/metrics/counts_7d/20210216181418_g_project_management_issue_changed_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181418_g_project_management_issue_changed_epic_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181455_g_project_management_issue_health_status_changed_weekly.yml b/ee/config/metrics/counts_7d/20210216181455_g_project_management_issue_health_status_changed_weekly.yml
index fca8ea5d53d8d75eb16a6440111eb0617188eeaa..c3fd557418bd49401833d36e16b3a6ab960edf46 100644
--- a/ee/config/metrics/counts_7d/20210216181455_g_project_management_issue_health_status_changed_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181455_g_project_management_issue_health_status_changed_weekly.yml
@@ -19,3 +19,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181514_i_quickactions_assign_multiple_weekly.yml b/ee/config/metrics/counts_7d/20210216181514_i_quickactions_assign_multiple_weekly.yml
index 4cc2e684dd0e96c276d78efef5a38d2161dbf284..3d864366b9a2ab800cb93095b3f4bb9036e22ef6 100644
--- a/ee/config/metrics/counts_7d/20210216181514_i_quickactions_assign_multiple_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181514_i_quickactions_assign_multiple_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181532_i_quickactions_child_epic_weekly.yml b/ee/config/metrics/counts_7d/20210216181532_i_quickactions_child_epic_weekly.yml
index e20086aed5aff625ea5e9f629362c7536fc2cbbb..ce8c36a266d53d10c3f09dbfafa312075e4e1e44 100644
--- a/ee/config/metrics/counts_7d/20210216181532_i_quickactions_child_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181532_i_quickactions_child_epic_weekly.yml
@@ -19,3 +19,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181536_i_quickactions_clear_weight_weekly.yml b/ee/config/metrics/counts_7d/20210216181536_i_quickactions_clear_weight_weekly.yml
index 79a0df5e4e875ef58c1d8c012be4aaf18a2950eb..e8d78ffbe341be90b3724b04f1b76affaa3a8aab 100644
--- a/ee/config/metrics/counts_7d/20210216181536_i_quickactions_clear_weight_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181536_i_quickactions_clear_weight_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181617_i_quickactions_epic_weekly.yml b/ee/config/metrics/counts_7d/20210216181617_i_quickactions_epic_weekly.yml
index ef79d9cf0650af587eac96b9dc6a78157bf73517..83845ba247cb6ca08f6cfd7030bbc19c1571ae3a 100644
--- a/ee/config/metrics/counts_7d/20210216181617_i_quickactions_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181617_i_quickactions_epic_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181624_i_quickactions_iteration_weekly.yml b/ee/config/metrics/counts_7d/20210216181624_i_quickactions_iteration_weekly.yml
index 69bce7cb132ec25068a59fd9d06476be8e3fb4c9..8cf14879853107ddb53f0e16966fad9bc0d21778 100644
--- a/ee/config/metrics/counts_7d/20210216181624_i_quickactions_iteration_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181624_i_quickactions_iteration_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181646_i_quickactions_parent_epic_weekly.yml b/ee/config/metrics/counts_7d/20210216181646_i_quickactions_parent_epic_weekly.yml
index e05eb21b91f3449c6da4fe5756eb4b05b5bfff2c..92907d48820de9a9d9dedc23d7f82bf8062bfb92 100644
--- a/ee/config/metrics/counts_7d/20210216181646_i_quickactions_parent_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181646_i_quickactions_parent_epic_weekly.yml
@@ -19,3 +19,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181650_i_quickactions_promote_weekly.yml b/ee/config/metrics/counts_7d/20210216181650_i_quickactions_promote_weekly.yml
index 7fb4fb6c3b0b104109ef4e667af743396c605059..d93801c4f75c6f16479be07abbce5d61d8d69586 100644
--- a/ee/config/metrics/counts_7d/20210216181650_i_quickactions_promote_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181650_i_quickactions_promote_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181654_i_quickactions_publish_weekly.yml b/ee/config/metrics/counts_7d/20210216181654_i_quickactions_publish_weekly.yml
index bea34880817abbe40f48a6c70c3ca4e37d8f10b2..cc5165556680c74a6bf7a624e4624af92a026e38 100644
--- a/ee/config/metrics/counts_7d/20210216181654_i_quickactions_publish_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181654_i_quickactions_publish_weekly.yml
@@ -19,3 +19,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181716_i_quickactions_remove_child_epic_weekly.yml b/ee/config/metrics/counts_7d/20210216181716_i_quickactions_remove_child_epic_weekly.yml
index a6e24f708d47b2bb0fcd9895e8ad33dee692864c..414d3ce0b7709f70e26fd8dfa3de6962c5e6898f 100644
--- a/ee/config/metrics/counts_7d/20210216181716_i_quickactions_remove_child_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181716_i_quickactions_remove_child_epic_weekly.yml
@@ -19,3 +19,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181723_i_quickactions_remove_epic_weekly.yml b/ee/config/metrics/counts_7d/20210216181723_i_quickactions_remove_epic_weekly.yml
index 16c17282def1b2cecc11f0f1e0cb1f69954369c2..ed4784d1c41361d4b7c272108bb399fa4d73ac89 100644
--- a/ee/config/metrics/counts_7d/20210216181723_i_quickactions_remove_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181723_i_quickactions_remove_epic_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181731_i_quickactions_remove_iteration_weekly.yml b/ee/config/metrics/counts_7d/20210216181731_i_quickactions_remove_iteration_weekly.yml
index 821f9830efab8874a5aaac8111add2dd7a068957..09abfe34eeb6e82bab6345b78bf526bf99ed7a3d 100644
--- a/ee/config/metrics/counts_7d/20210216181731_i_quickactions_remove_iteration_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181731_i_quickactions_remove_iteration_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181738_i_quickactions_remove_parent_epic_weekly.yml b/ee/config/metrics/counts_7d/20210216181738_i_quickactions_remove_parent_epic_weekly.yml
index d94cd38b0a4cf1477ee74242779db2af00779f0e..5840f7b8dbccb264e0ac0b258f2240f711e07f2f 100644
--- a/ee/config/metrics/counts_7d/20210216181738_i_quickactions_remove_parent_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181738_i_quickactions_remove_parent_epic_weekly.yml
@@ -19,3 +19,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216181856_i_quickactions_weight_weekly.yml b/ee/config/metrics/counts_7d/20210216181856_i_quickactions_weight_weekly.yml
index afad5a3316603a9e7d35b7e7dc766fa333368272..ed639f3d544755e6cfd7b07cf763a6aeb889a5ab 100644
--- a/ee/config/metrics/counts_7d/20210216181856_i_quickactions_weight_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216181856_i_quickactions_weight_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216182138_i_testing_metrics_report_widget_total_weekly.yml b/ee/config/metrics/counts_7d/20210216182138_i_testing_metrics_report_widget_total_weekly.yml
index bc7520430e1ca66b3c0f8a2df35b846371bfb274..693db5c2bfac2d2abb941f79a7e486157b8540ea 100644
--- a/ee/config/metrics/counts_7d/20210216182138_i_testing_metrics_report_widget_total_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216182138_i_testing_metrics_report_widget_total_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216182141_i_testing_group_code_coverage_visit_total_weekly.yml b/ee/config/metrics/counts_7d/20210216182141_i_testing_group_code_coverage_visit_total_weekly.yml
index a7489ffb08088dc7db48f8a03ccca6c642728dd7..50d356caf1264950650f4d602ca5df05831b3f44 100644
--- a/ee/config/metrics/counts_7d/20210216182141_i_testing_group_code_coverage_visit_total_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216182141_i_testing_group_code_coverage_visit_total_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216182145_i_testing_full_code_quality_report_total_weekly.yml b/ee/config/metrics/counts_7d/20210216182145_i_testing_full_code_quality_report_total_weekly.yml
index 02a85f0b9c64e7d786eb7628158a1d55f2cead49..7174dd13a459cc195ca1c3bed30196adcd5a5e3a 100644
--- a/ee/config/metrics/counts_7d/20210216182145_i_testing_full_code_quality_report_total_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216182145_i_testing_full_code_quality_report_total_weekly.yml
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216182149_i_testing_web_performance_widget_total_weekly.yml b/ee/config/metrics/counts_7d/20210216182149_i_testing_web_performance_widget_total_weekly.yml
index b02108482fc45860f954ebec64338a6639dc37e8..682ec1a9319a18fbf98b6daaa29ffc5b9753615e 100644
--- a/ee/config/metrics/counts_7d/20210216182149_i_testing_web_performance_widget_total_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216182149_i_testing_web_performance_widget_total_weekly.yml
@@ -21,3 +21,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216182154_i_testing_load_performance_widget_total_weekly.yml b/ee/config/metrics/counts_7d/20210216182154_i_testing_load_performance_widget_total_weekly.yml
index 581040b4473178ffc006335f4ca7f6d8998994fa..deed1facde7c11bd6fd4eed76e3e3abcfaec882e 100644
--- a/ee/config/metrics/counts_7d/20210216182154_i_testing_load_performance_widget_total_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216182154_i_testing_load_performance_widget_total_weekly.yml
@@ -21,3 +21,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216182158_i_testing_metrics_report_artifact_uploaders_weekly.yml b/ee/config/metrics/counts_7d/20210216182158_i_testing_metrics_report_artifact_uploaders_weekly.yml
index f05f1b29768560b38d4de6fa10ad2f5b6ddb0748..bc7c39e4cae917c3ea14ecaa88ec5e4a93983b4a 100644
--- a/ee/config/metrics/counts_7d/20210216182158_i_testing_metrics_report_artifact_uploaders_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216182158_i_testing_metrics_report_artifact_uploaders_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.testing.i_testing_metrics_report_artifact_uploaders_weekly
-description: Count of unique users per week who trigger a pipeline that uploads a metrics report.
+description: Count of unique users per week who trigger a pipeline that uploads a
+  metrics report.
 product_section: ops
 product_stage: verify
 product_group: group::testing
@@ -20,3 +21,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216183211_compliance_features_track_unique_visits_union.yml b/ee/config/metrics/counts_7d/20210216183211_compliance_features_track_unique_visits_union.yml
index 084a445b181ab79c32e3da67c153d74d6c77a276..7380041b67a45e9c3c42e5819e2ae44cfe91e798 100644
--- a/ee/config/metrics/counts_7d/20210216183211_compliance_features_track_unique_visits_union.yml
+++ b/ee/config/metrics/counts_7d/20210216183211_compliance_features_track_unique_visits_union.yml
@@ -1,11 +1,12 @@
 ---
 data_category: optional
 key_path: counts_weekly.aggregated_metrics.compliance_features_track_unique_visits_union
-description: 'Unique users that have used audit event screen, audit event API, compliance report, or credential inventory'
-product_section: 'dev'
-product_stage: 'manage'
-product_group: 'group::compliance'
-product_category: 'compliance_management'
+description: Unique users that have used audit event screen, audit event API, compliance
+  report, or credential inventory
+product_section: dev
+product_stage: manage
+product_group: group::compliance
+product_category: compliance_management
 value_type: number
 status: data_available
 time_frame: 7d
@@ -16,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216183219_i_testing_paid_monthly_active_user_total.yml b/ee/config/metrics/counts_7d/20210216183219_i_testing_paid_monthly_active_user_total.yml
index a7006a71e2d11a831933d5d8f92d15fb34a26eec..a9e5f253d4f30438d7673410dc346d8a7cee57fd 100644
--- a/ee/config/metrics/counts_7d/20210216183219_i_testing_paid_monthly_active_user_total.yml
+++ b/ee/config/metrics/counts_7d/20210216183219_i_testing_paid_monthly_active_user_total.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: counts_weekly.aggregated_metrics.i_testing_paid_monthly_active_user_total
-description: Aggregated count of users who have engaged with a Premium or Ultimate tier testing feature per week.
+description: Aggregated count of users who have engaged with a Premium or Ultimate
+  tier testing feature per week.
 product_section: ops
 product_stage: verify
 product_group: group::testing
@@ -16,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216183920_search_unique_visits_for_any_target_weekly.yml b/ee/config/metrics/counts_7d/20210216183920_search_unique_visits_for_any_target_weekly.yml
index 480e87a468d6df3edc4b9ad7bf85d2362873ff45..b18153967ed93b1c6d014a1a6b802f08f1ed4a0e 100644
--- a/ee/config/metrics/counts_7d/20210216183920_search_unique_visits_for_any_target_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216183920_search_unique_visits_for_any_target_weekly.yml
@@ -1,7 +1,10 @@
 ---
 data_category: optional
 key_path: search_unique_visits.search_unique_visits_for_any_target_weekly
-description: Total unique users for i_search_total, i_search_advanced, i_search_paid for recent 7 days. This metric is redundant because advanced will be a subset of paid and paid will be a subset of total. i_search_total is more appropriate if you just want the total
+description: Total unique users for i_search_total, i_search_advanced, i_search_paid
+  for recent 7 days. This metric is redundant because advanced will be a subset of
+  paid and paid will be a subset of total. i_search_total is more appropriate if you
+  just want the total
 product_section: enablement
 product_stage: enablement
 product_group: group::global search
@@ -24,3 +27,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216183924_g_compliance_dashboard_weekly.yml b/ee/config/metrics/counts_7d/20210216183924_g_compliance_dashboard_weekly.yml
index d746a3b2586a8ef36bfb2133313aad4a20578800..f40336b747aeae443eb7c4822b52d29fd3deac50 100644
--- a/ee/config/metrics/counts_7d/20210216183924_g_compliance_dashboard_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216183924_g_compliance_dashboard_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.compliance.g_compliance_dashboard_weekly
-description: 'Unique users who have looked at the compliance report in a given week'
-product_section: 'dev'
-product_stage: 'manage'
-product_group: 'group::compliance'
-product_category: 'compliance_management'
+description: Unique users who have looked at the compliance report in a given week
+product_section: dev
+product_stage: manage
+product_group: group::compliance
+product_category: compliance_management
 value_type: number
 status: data_available
 time_frame: 7d
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216183928_g_compliance_audit_events_weekly.yml b/ee/config/metrics/counts_7d/20210216183928_g_compliance_audit_events_weekly.yml
index 8b1db26a350dae7f6a90554f7d5841869677830c..1908273c1e34efbe340556763d019beb5e2be84a 100644
--- a/ee/config/metrics/counts_7d/20210216183928_g_compliance_audit_events_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216183928_g_compliance_audit_events_weekly.yml
@@ -1,11 +1,12 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.compliance.g_compliance_audit_events_weekly
-description: 'Number of unique visitors to group-level audit events screen in a given week'
-product_section: 'dev'
-product_stage: 'manage'
-product_group: 'group::compliance'
-product_category: 'audit_events'
+description: Number of unique visitors to group-level audit events screen in a given
+  week
+product_section: dev
+product_stage: manage
+product_group: group::compliance
+product_category: audit_events
 value_type: number
 status: data_available
 time_frame: 7d
@@ -20,3 +21,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216183932_i_compliance_audit_events_weekly.yml b/ee/config/metrics/counts_7d/20210216183932_i_compliance_audit_events_weekly.yml
index 3cd33dca3a45d09f6fa1d5f9b1c343cfb859491b..bd9360310a280c6dccd47d2108bb75ef7b611589 100644
--- a/ee/config/metrics/counts_7d/20210216183932_i_compliance_audit_events_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216183932_i_compliance_audit_events_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.compliance.i_compliance_audit_events_weekly
-description: 'Unique users that have viewed the instance-level audit events screen'
-product_section: 'dev'
-product_stage: 'manage'
-product_group: 'group::compliance'
-product_category: 'audit_events'
+description: Unique users that have viewed the instance-level audit events screen
+product_section: dev
+product_stage: manage
+product_group: group::compliance
+product_category: audit_events
 value_type: number
 status: data_available
 time_frame: 7d
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216183936_i_compliance_credential_inventory_weekly.yml b/ee/config/metrics/counts_7d/20210216183936_i_compliance_credential_inventory_weekly.yml
index 2c3d9c49d153b8b2c534f35b8133cb1f297a7c98..5c756f063c7c7046018554d07d731a2f08de6a1a 100644
--- a/ee/config/metrics/counts_7d/20210216183936_i_compliance_credential_inventory_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216183936_i_compliance_credential_inventory_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.compliance.i_compliance_credential_inventory_weekly
-description: 'Unique visitors to the credential inventory screen in a given week'
-product_section: 'dev'
-product_stage: 'manage'
-product_group: 'group::compliance'
-product_category: 'compliance_management'
+description: Unique visitors to the credential inventory screen in a given week
+product_section: dev
+product_stage: manage
+product_group: group::compliance
+product_category: compliance_management
 value_type: number
 status: data_available
 time_frame: 7d
@@ -19,3 +19,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216183940_a_compliance_audit_events_api_weekly.yml b/ee/config/metrics/counts_7d/20210216183940_a_compliance_audit_events_api_weekly.yml
index a775a0f8f950a408d55cf39428ebec8db4e03dce..c1bf961a44ab294b401210f6f519d864c5c3d919 100644
--- a/ee/config/metrics/counts_7d/20210216183940_a_compliance_audit_events_api_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216183940_a_compliance_audit_events_api_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.compliance.a_compliance_audit_events_api_weekly
-description: 'Unique users that have used the Audit Events API in a given week.'
-product_section: 'dev'
-product_stage: 'manage'
-product_group: 'group::compliance'
-product_category: 'audit_events'
+description: Unique users that have used the Audit Events API in a given week.
+product_section: dev
+product_stage: manage
+product_group: group::compliance
+product_category: audit_events
 value_type: number
 status: data_available
 time_frame: 7d
@@ -20,3 +20,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216183944_compliance_total_unique_counts_weekly.yml b/ee/config/metrics/counts_7d/20210216183944_compliance_total_unique_counts_weekly.yml
index 3c86d7df82277c0feca0477b972efe16915af5f6..5ab1fc445a3f76c1b955c571a53dfdb9b85044c9 100644
--- a/ee/config/metrics/counts_7d/20210216183944_compliance_total_unique_counts_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216183944_compliance_total_unique_counts_weekly.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.compliance.compliance_total_unique_counts_weekly
-description: 'Unique count of compliance actions in a given week'
-product_section: 'dev'
-product_stage: 'manage'
-product_group: 'group::compliance'
-product_category: 'compliance_management'
+description: Unique count of compliance actions in a given week
+product_section: dev
+product_stage: manage
+product_group: group::compliance
+product_category: compliance_management
 value_type: number
 status: data_available
 time_frame: 7d
@@ -24,3 +24,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184033_i_search_paid_weekly.yml b/ee/config/metrics/counts_7d/20210216184033_i_search_paid_weekly.yml
index 5d8a3be4909a80b29561a2c2ee93d13cf590787b..6989cdda04fa7fc750311e148f5325df33aa75d7 100644
--- a/ee/config/metrics/counts_7d/20210216184033_i_search_paid_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184033_i_search_paid_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.search.i_search_paid_weekly
-description: Calculated unique users to perform a search with a paid license enabled by week
+description: Calculated unique users to perform a search with a paid license enabled
+  by week
 product_section: enablement
 product_stage: enablement
 product_group: group::global search
@@ -20,3 +21,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184132_i_testing_group_code_coverage_project_click_total_weekly.yml b/ee/config/metrics/counts_7d/20210216184132_i_testing_group_code_coverage_project_click_total_weekly.yml
index ce82dad41a40742a6d8874c278e0ea1e714ed164..dde3586388ba516588dda7eb935ce9937835ae4b 100644
--- a/ee/config/metrics/counts_7d/20210216184132_i_testing_group_code_coverage_project_click_total_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184132_i_testing_group_code_coverage_project_click_total_weekly.yml
@@ -1,7 +1,8 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.testing.i_testing_group_code_coverage_project_click_total_weekly
-description: Aggregated count of unique users who have clicked from group code coverage page to an individual project page each week.
+description: Aggregated count of unique users who have clicked from group code coverage
+  page to an individual project page each week.
 product_section: ops
 product_stage: verify
 product_group: group::testing
@@ -20,3 +21,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184138_testing_total_unique_counts_weekly.yml b/ee/config/metrics/counts_7d/20210216184138_testing_total_unique_counts_weekly.yml
index 54c17e916eda6680bc7a23d82164d17ce2fe5477..70b5981b92bdff043b78039add9f1ed25654f29d 100644
--- a/ee/config/metrics/counts_7d/20210216184138_testing_total_unique_counts_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184138_testing_total_unique_counts_weekly.yml
@@ -30,3 +30,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184221_g_project_management_issue_removed_from_epic_weekly.yml b/ee/config/metrics/counts_7d/20210216184221_g_project_management_issue_removed_from_epic_weekly.yml
index 919e8caba28c8ffdafb85215c50c0c92162400c2..b563a65ee235eafaa5d593db6281b40b3381c5a1 100644
--- a/ee/config/metrics/counts_7d/20210216184221_g_project_management_issue_removed_from_epic_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184221_g_project_management_issue_removed_from_epic_weekly.yml
@@ -19,3 +19,4 @@ distribution:
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184249_i_ci_secrets_management_vault_build_created_weekly.yml b/ee/config/metrics/counts_7d/20210216184249_i_ci_secrets_management_vault_build_created_weekly.yml
index 192412deb32ed2faf8125a9f3529bbb1290bac6f..c7660dc5d483874901ce829dd68d03ea0a267f9a 100644
--- a/ee/config/metrics/counts_7d/20210216184249_i_ci_secrets_management_vault_build_created_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184249_i_ci_secrets_management_vault_build_created_weekly.yml
@@ -19,3 +19,4 @@ distribution:
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml b/ee/config/metrics/counts_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml
index 26de3a2d6051258347d9a0fab48d77b26b09d907..4c74e9a0d334507b2abc24b109eeabb7bd1bf9ac 100644
--- a/ee/config/metrics/counts_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184257_p_terraform_state_api_unique_users_weekly.yml
@@ -19,3 +19,4 @@ distribution:
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml b/ee/config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml
index 2ef0285fd1a88d804c27e060c086df75fad835e9..3c3fae23f8a4f1bf73e1a099a82d412058505ca9 100644
--- a/ee/config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184456_p_ci_templates_implicit_auto_devops_weekly.yml
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_implicit_auto_devops
+  - p_ci_templates_implicit_auto_devops
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml b/ee/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml
index 5eaf601df6d629195f7062a8be8cd562e7df0bbd..43798e1e97284b675b14ef5faaaf84fbce545835 100644
--- a/ee/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184500_p_ci_templates_implicit_auto_devops_build_weekly.yml
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_implicit_auto_devops_build
+  - p_ci_templates_implicit_auto_devops_build
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml b/ee/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml
index ab88e86d71734e5cbfc3ff840c12c911e85f5555..cb8793e73335613fe640aa9c895f77bb7d76cdf6 100644
--- a/ee/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184504_p_ci_templates_implicit_auto_devops_deploy_weekly.yml
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_implicit_auto_devops_deploy
+  - p_ci_templates_implicit_auto_devops_deploy
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184508_p_ci_templates_implicit_security_sast_weekly.yml b/ee/config/metrics/counts_7d/20210216184508_p_ci_templates_implicit_security_sast_weekly.yml
index 7157af96e2c867e0d703b9b40978d51fc23c89b8..892b41ad0a34e4d0817507bfbd0e44922d0da71b 100644
--- a/ee/config/metrics/counts_7d/20210216184508_p_ci_templates_implicit_security_sast_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184508_p_ci_templates_implicit_security_sast_weekly.yml
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_implicit_security_sast
+  - p_ci_templates_implicit_security_sast
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184512_p_ci_templates_implicit_security_secret_detection_weekly.yml b/ee/config/metrics/counts_7d/20210216184512_p_ci_templates_implicit_security_secret_detection_weekly.yml
index e796ff674e280bc29076e61e662fb53f05bc9f9a..7027eed82621580c91ff0863ae0253c1f16013eb 100644
--- a/ee/config/metrics/counts_7d/20210216184512_p_ci_templates_implicit_security_secret_detection_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184512_p_ci_templates_implicit_security_secret_detection_weekly.yml
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_implicit_security_secret_detection
+  - p_ci_templates_implicit_security_secret_detection
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml b/ee/config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml
index 2c5a80c07c3cd0c8b078f4740eb3d9f7a2513b89..719620e6e5f939fba9cf1a91229acc740e88d42f 100644
--- a/ee/config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184520_p_ci_templates_auto_devops_weekly.yml
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_auto_devops
+  - p_ci_templates_auto_devops
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184532_p_ci_templates_auto_devops_build_weekly.yml b/ee/config/metrics/counts_7d/20210216184532_p_ci_templates_auto_devops_build_weekly.yml
index 7d72c02f62642002c31076cf291a70079c7135a9..4e34a7b51a1b13825918f1f0328afe681a7ade7e 100644
--- a/ee/config/metrics/counts_7d/20210216184532_p_ci_templates_auto_devops_build_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184532_p_ci_templates_auto_devops_build_weekly.yml
@@ -13,13 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_auto_devops_build
-instrumentation_class: RedisHLLMetric
-options:
-  events:
-    - p_ci_templates_auto_devops
+  - p_ci_templates_auto_devops
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml b/ee/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml
index f2e5bfb43e4a16fb794228d61b1a6c75cf225051..99a1e6cd1adc4d80c7d12705fb36b0fc76f7fe4c 100644
--- a/ee/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184536_p_ci_templates_auto_devops_deploy_weekly.yml
@@ -13,13 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_auto_devops_deploy
-instrumentation_class: RedisHLLMetric
-options:
-  events:
-    - p_ci_templates_auto_devops
+  - p_ci_templates_auto_devops
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml b/ee/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml
index 8036f9b53e53b22bef971e502e0cbbd814ff3366..653f6c170f1ab7d7498a1fd7b69c579f527a2597 100644
--- a/ee/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184540_p_ci_templates_auto_devops_deploy_latest_weekly.yml
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_auto_devops_deploy_latest
+  - p_ci_templates_auto_devops_deploy_latest
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184544_p_ci_templates_security_sast_weekly.yml b/ee/config/metrics/counts_7d/20210216184544_p_ci_templates_security_sast_weekly.yml
index 5c5cc913626a2a2321830e565ce412cc1fc79928..f8074603cab1037e1949dc407502624d443e54ae 100644
--- a/ee/config/metrics/counts_7d/20210216184544_p_ci_templates_security_sast_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184544_p_ci_templates_security_sast_weekly.yml
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_security_sast
+  - p_ci_templates_security_sast
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184549_p_ci_templates_security_secret_detection_weekly.yml b/ee/config/metrics/counts_7d/20210216184549_p_ci_templates_security_secret_detection_weekly.yml
index ab97b382c0c311ce007149b440f05fcf654a8792..9a33ebe7c2c7e9b21352efe74751d8680cd9face 100644
--- a/ee/config/metrics/counts_7d/20210216184549_p_ci_templates_security_secret_detection_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184549_p_ci_templates_security_secret_detection_weekly.yml
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_security_secret_detection
+  - p_ci_templates_security_secret_detection
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml b/ee/config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml
index 44612b187a12bac6e07dcbcd3b38d4f17ddedd76..16bd874a6876df3ad77030e87455c40ec74e48d2 100644
--- a/ee/config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184553_p_ci_templates_terraform_base_latest_weekly.yml
@@ -13,9 +13,10 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - p_ci_templates_terraform_base_latest
+  - p_ci_templates_terraform_base_latest
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml b/ee/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml
index 6ca11d4c0bbd46d5a3ce0bd71fc3362205362874..af4ad5dd067e09138b7921e29005d6351dcf5191 100644
--- a/ee/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184801_quickactions_total_unique_counts_weekly.yml
@@ -86,3 +86,4 @@ distribution:
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184947_i_ecosystem_jira_service_list_issues_weekly.yml b/ee/config/metrics/counts_7d/20210216184947_i_ecosystem_jira_service_list_issues_weekly.yml
index 6ad80afb23b2c24eaee5b9800d34c9373c0689bd..ff929a2404a7364b44426083d2869093c45aa485 100644
--- a/ee/config/metrics/counts_7d/20210216184947_i_ecosystem_jira_service_list_issues_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184947_i_ecosystem_jira_service_list_issues_weekly.yml
@@ -1,7 +1,7 @@
 ---
 data_category: optional
 key_path: redis_hll_counters.ecosystem.i_ecosystem_jira_service_list_issues_weekly
-description: 'Count of Jira Issue List visits by week'
+description: Count of Jira Issue List visits by week
 product_section: dev
 product_stage: ecosystem
 product_group: group::integrations
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_ecosystem_jira_service_list_issues
+  - i_ecosystem_jira_service_list_issues
 distribution:
 - ee
 tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_7d/20210216184951_i_ecosystem_jira_service_create_issue_weekly.yml b/ee/config/metrics/counts_7d/20210216184951_i_ecosystem_jira_service_create_issue_weekly.yml
index 46656a0d333143e3f682e56021501fe5b3cb79c2..7bffbee82cd0f1de48955b0e5ba5be9bb97c54cf 100644
--- a/ee/config/metrics/counts_7d/20210216184951_i_ecosystem_jira_service_create_issue_weekly.yml
+++ b/ee/config/metrics/counts_7d/20210216184951_i_ecosystem_jira_service_create_issue_weekly.yml
@@ -13,10 +13,11 @@ data_source: redis_hll
 instrumentation_class: RedisHLLMetric
 options:
   events:
-    - i_ecosystem_jira_service_create_issue
+  - i_ecosystem_jira_service_create_issue
 distribution:
 - ee
 tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210204124854_license_management_jobs.yml b/ee/config/metrics/counts_all/20210204124854_license_management_jobs.yml
index 39db170756c709aef682d00e8ebce4b2a2814123..c690a5563e2ccceb50a96299904c25d1fea81862 100644
--- a/ee/config/metrics/counts_all/20210204124854_license_management_jobs.yml
+++ b/ee/config/metrics/counts_all/20210204124854_license_management_jobs.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216174822_ldap_group_links.yml b/ee/config/metrics/counts_all/20210216174822_ldap_group_links.yml
index 70e6a72f586cc1a97e0a5cb495520f60c59266a8..a494be75ad45f5a26ece0a207a546218551053ef 100644
--- a/ee/config/metrics/counts_all/20210216174822_ldap_group_links.yml
+++ b/ee/config/metrics/counts_all/20210216174822_ldap_group_links.yml
@@ -17,3 +17,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216174824_ldap_keys.yml b/ee/config/metrics/counts_all/20210216174824_ldap_keys.yml
index 848d634effb52d1604d1abeec88a716717825cdf..d15ac9d8273644d72c1d184071ceee9b5e318b6d 100644
--- a/ee/config/metrics/counts_all/20210216174824_ldap_keys.yml
+++ b/ee/config/metrics/counts_all/20210216174824_ldap_keys.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216174826_ldap_users.yml b/ee/config/metrics/counts_all/20210216174826_ldap_users.yml
index 7153e2cf2577229e428fdb07713d90e7385df859..58eae8c1606853176f973ead6a5e4b89545ef806 100644
--- a/ee/config/metrics/counts_all/20210216174826_ldap_users.yml
+++ b/ee/config/metrics/counts_all/20210216174826_ldap_users.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216174834_productivity_analytics_views.yml b/ee/config/metrics/counts_all/20210216174834_productivity_analytics_views.yml
index c8c690a0d6f6975b8c050d548f2b3c5d0c126a6f..3e017b39af0cba9bdd55f14e834f42d931d2da4e 100644
--- a/ee/config/metrics/counts_all/20210216174834_productivity_analytics_views.yml
+++ b/ee/config/metrics/counts_all/20210216174834_productivity_analytics_views.yml
@@ -6,7 +6,7 @@ description: Total visits to /groups/:group/-/analytics/productivity_analytics a
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
@@ -19,3 +19,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216174836_g_analytics_contribution.yml b/ee/config/metrics/counts_all/20210216174836_g_analytics_contribution.yml
index 11ef8347d1b7e523f05f7be705d49fffee009bc9..2e615e7d5e23f3a2bd774c35cd785d0ebf44ffd2 100644
--- a/ee/config/metrics/counts_all/20210216174836_g_analytics_contribution.yml
+++ b/ee/config/metrics/counts_all/20210216174836_g_analytics_contribution.yml
@@ -5,14 +5,15 @@ description: Unique visitors to /groups/:group/-/contribution_analytics
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source: 
+data_source:
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216174838_g_analytics_insights.yml b/ee/config/metrics/counts_all/20210216174838_g_analytics_insights.yml
index a6d66879d211e0e44ebd153a080937de8bbccf7d..4f1e89364cee8e5603e4f80f26b6721dab05c528 100644
--- a/ee/config/metrics/counts_all/20210216174838_g_analytics_insights.yml
+++ b/ee/config/metrics/counts_all/20210216174838_g_analytics_insights.yml
@@ -5,14 +5,15 @@ description: Unique visitors to /groups/:group/-/insights
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source: 
+data_source:
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216174840_g_analytics_issues.yml b/ee/config/metrics/counts_all/20210216174840_g_analytics_issues.yml
index 905a29442d7875e5446d9a9fc694d8a822a04d2f..f6c527ae0acefa02e6eecc6fdec9ee9fe3636ce3 100644
--- a/ee/config/metrics/counts_all/20210216174840_g_analytics_issues.yml
+++ b/ee/config/metrics/counts_all/20210216174840_g_analytics_issues.yml
@@ -5,14 +5,15 @@ description: Unique visitors to /groups/:group/-/issues_analytics
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source: 
+data_source:
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216174842_g_analytics_productivity.yml b/ee/config/metrics/counts_all/20210216174842_g_analytics_productivity.yml
index c5d8d1da42ae727c264b78e74481b7c1eb05dc5a..093c0e5fd980cdbbad21f381417fdcbf5efe8611 100644
--- a/ee/config/metrics/counts_all/20210216174842_g_analytics_productivity.yml
+++ b/ee/config/metrics/counts_all/20210216174842_g_analytics_productivity.yml
@@ -5,14 +5,15 @@ description: Unique visitors to /groups/:group/-/analytics/productivity_analytic
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source: 
+data_source:
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216174844_g_analytics_valuestream.yml b/ee/config/metrics/counts_all/20210216174844_g_analytics_valuestream.yml
index 454db04cdcee0fdb1baba0e8b930ed9bdedb16b4..f8f4594f99d6fa95ce8924cced0b91dbc786308f 100644
--- a/ee/config/metrics/counts_all/20210216174844_g_analytics_valuestream.yml
+++ b/ee/config/metrics/counts_all/20210216174844_g_analytics_valuestream.yml
@@ -5,14 +5,15 @@ description: Unique visitors to /groups/:group/-/analytics/value_stream_analytic
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source: 
+data_source:
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216174848_p_analytics_code_reviews.yml b/ee/config/metrics/counts_all/20210216174848_p_analytics_code_reviews.yml
index f4376f3dca8a4470548dd8ec6b727fea3c49344c..a09e447a5a4ca8e30ff121a6535c5770c6902c9a 100644
--- a/ee/config/metrics/counts_all/20210216174848_p_analytics_code_reviews.yml
+++ b/ee/config/metrics/counts_all/20210216174848_p_analytics_code_reviews.yml
@@ -5,14 +5,15 @@ description: Unique visitors to /:group/:project/-/analytics/code_reviews
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source: 
+data_source:
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216174852_p_analytics_insights.yml b/ee/config/metrics/counts_all/20210216174852_p_analytics_insights.yml
index fdf2ef882bda2726ba2de8a78feaad84e1298348..ebefb1ab9030f2974d2d63d99b88be3a0a70b8da 100644
--- a/ee/config/metrics/counts_all/20210216174852_p_analytics_insights.yml
+++ b/ee/config/metrics/counts_all/20210216174852_p_analytics_insights.yml
@@ -5,14 +5,15 @@ description: Unique visitors to /:group/:project/insights
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source: 
+data_source:
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216174854_p_analytics_issues.yml b/ee/config/metrics/counts_all/20210216174854_p_analytics_issues.yml
index 3acaf8557fb3d7c99ffffdd92920358f0588cff4..ba87977c8e9f2fddbe7a26ff02a491e92422ce72 100644
--- a/ee/config/metrics/counts_all/20210216174854_p_analytics_issues.yml
+++ b/ee/config/metrics/counts_all/20210216174854_p_analytics_issues.yml
@@ -5,14 +5,15 @@ description: Unique visitors to /:group/:project/-/analytics/issues_analytics
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source: 
+data_source:
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216174904_p_analytics_merge_request.yml b/ee/config/metrics/counts_all/20210216174904_p_analytics_merge_request.yml
index 098f80368c5cd07cc99167e8c2736531ac5b9888..62a1259d98029788b2365a1f9d0f033efec69377 100644
--- a/ee/config/metrics/counts_all/20210216174904_p_analytics_merge_request.yml
+++ b/ee/config/metrics/counts_all/20210216174904_p_analytics_merge_request.yml
@@ -5,14 +5,15 @@ description: Unique visitors to /:group/:project/-/analytics/merge_request_analy
 product_section: dev
 product_stage: manage
 product_group: group::optimize
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
-data_source: 
+data_source:
 distribution:
 - ce
 tier:
 - free
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175028_requirements_created.yml b/ee/config/metrics/counts_all/20210216175028_requirements_created.yml
index 7f6c56f4f85febaa3860f1abb39bf4e13ba2cad9..5fe7202e939e288935d45918153bfed9393bca61 100644
--- a/ee/config/metrics/counts_all/20210216175028_requirements_created.yml
+++ b/ee/config/metrics/counts_all/20210216175028_requirements_created.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175030_requirement_test_reports_manual.yml b/ee/config/metrics/counts_all/20210216175030_requirement_test_reports_manual.yml
index b1d1a4c0601648a5d4dd9b8293cdb003cfe50b78..b08c36e476289ec92aba19727fdb11eed94e1d2a 100644
--- a/ee/config/metrics/counts_all/20210216175030_requirement_test_reports_manual.yml
+++ b/ee/config/metrics/counts_all/20210216175030_requirement_test_reports_manual.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175032_requirement_test_reports_ci.yml b/ee/config/metrics/counts_all/20210216175032_requirement_test_reports_ci.yml
index dde08b308dd067b8c0c930e4644adc816034dde1..eaa710c685fdf23cb52cc7cd2f76bb1af129a244 100644
--- a/ee/config/metrics/counts_all/20210216175032_requirement_test_reports_ci.yml
+++ b/ee/config/metrics/counts_all/20210216175032_requirement_test_reports_ci.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175034_requirements_with_test_report.yml b/ee/config/metrics/counts_all/20210216175034_requirements_with_test_report.yml
index 43a83be75504cf8b93603ef466d53ae9b786570e..20c6c8c7b3d4a562f201d2558139ba2cff225d49 100644
--- a/ee/config/metrics/counts_all/20210216175034_requirements_with_test_report.yml
+++ b/ee/config/metrics/counts_all/20210216175034_requirements_with_test_report.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175047_merge_requests_with_added_rules.yml b/ee/config/metrics/counts_all/20210216175047_merge_requests_with_added_rules.yml
index 926f6520234ed5b4ae8c1b01943a8332d9fde5a7..7799b3d872767f1e1739e8476412217922689dc9 100644
--- a/ee/config/metrics/counts_all/20210216175047_merge_requests_with_added_rules.yml
+++ b/ee/config/metrics/counts_all/20210216175047_merge_requests_with_added_rules.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175049_merge_requests_with_optional_codeowners.yml b/ee/config/metrics/counts_all/20210216175049_merge_requests_with_optional_codeowners.yml
index 1dbc50d29f49d44b73d92ba1226352dc5e9d7377..8a0e2a03a6e95e493494068901b226f0ce698b89 100644
--- a/ee/config/metrics/counts_all/20210216175049_merge_requests_with_optional_codeowners.yml
+++ b/ee/config/metrics/counts_all/20210216175049_merge_requests_with_optional_codeowners.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175051_merge_requests_with_required_codeowners.yml b/ee/config/metrics/counts_all/20210216175051_merge_requests_with_required_codeowners.yml
index 34301c3a1b0f511500e71fb5a337b73f2b71dbe2..ca4021e3be39f6ca4f19dbf1756856e2b0a769d5 100644
--- a/ee/config/metrics/counts_all/20210216175051_merge_requests_with_required_codeowners.yml
+++ b/ee/config/metrics/counts_all/20210216175051_merge_requests_with_required_codeowners.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175211_dependency_list_usages_total.yml b/ee/config/metrics/counts_all/20210216175211_dependency_list_usages_total.yml
index dab5ba933db8c2ee70157c1bf3adb9acca9f826c..98b3d37263844ff53dedd2e6a1cdbe91f36a7b5d 100644
--- a/ee/config/metrics/counts_all/20210216175211_dependency_list_usages_total.yml
+++ b/ee/config/metrics/counts_all/20210216175211_dependency_list_usages_total.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175213_dependency_scanning_jobs.yml b/ee/config/metrics/counts_all/20210216175213_dependency_scanning_jobs.yml
index 42a383fcff329217395bef2b4efb0f66be122d13..d08151cd47370f409e22fd154785c7bd7af542d7 100644
--- a/ee/config/metrics/counts_all/20210216175213_dependency_scanning_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216175213_dependency_scanning_jobs.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175216_user_dependency_scanning_jobs.yml b/ee/config/metrics/counts_all/20210216175216_user_dependency_scanning_jobs.yml
index 3a603ac93a563bf3ca5f99bef960fb8b351a449f..205445ced68984c2bb05e0e33ff54d3b79d260b4 100644
--- a/ee/config/metrics/counts_all/20210216175216_user_dependency_scanning_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216175216_user_dependency_scanning_jobs.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175218_user_license_management_jobs.yml b/ee/config/metrics/counts_all/20210216175218_user_license_management_jobs.yml
index 8774e96514edd1a24bf4d8bd5dcff5ac55bcacea..df2702eda1e4f91b4511afaa35ba2a1bab0800d1 100644
--- a/ee/config/metrics/counts_all/20210216175218_user_license_management_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216175218_user_license_management_jobs.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175220_dependency_scanning_scans.yml b/ee/config/metrics/counts_all/20210216175220_dependency_scanning_scans.yml
index 374ea8b5665e04a5deae057c5116cb27f3b045bb..d1d1bb6f182308931a73d9f7b4143614544fa3f3 100644
--- a/ee/config/metrics/counts_all/20210216175220_dependency_scanning_scans.yml
+++ b/ee/config/metrics/counts_all/20210216175220_dependency_scanning_scans.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175316_kubernetes_agents.yml b/ee/config/metrics/counts_all/20210216175316_kubernetes_agents.yml
index be006554c5fccff41cdabaddceb8ffda92c1549b..e5210901083ab26695389316fa857efd21328ed1 100644
--- a/ee/config/metrics/counts_all/20210216175316_kubernetes_agents.yml
+++ b/ee/config/metrics/counts_all/20210216175316_kubernetes_agents.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml b/ee/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml
index 0f1c4ee234c2b95005abcbf87970fe9ebf1e0e90..a0bc5402cbff59a48456dcc521a7eac4de676f74 100644
--- a/ee/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml
+++ b/ee/config/metrics/counts_all/20210216175318_kubernetes_agents_with_token.yml
@@ -17,3 +17,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175328_kubernetes_agent_gitops_sync.yml b/ee/config/metrics/counts_all/20210216175328_kubernetes_agent_gitops_sync.yml
index 61b7f78f8b5ad2be2d5454a5a80736a765144a66..a60659293548e383d672c8337cb214e085985d99 100644
--- a/ee/config/metrics/counts_all/20210216175328_kubernetes_agent_gitops_sync.yml
+++ b/ee/config/metrics/counts_all/20210216175328_kubernetes_agent_gitops_sync.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175400_projects_slack_notifications_active.yml b/ee/config/metrics/counts_all/20210216175400_projects_slack_notifications_active.yml
index 70682d96b120442808f6d5d88a41d2966761bd4f..50b5eacad0c2c061e6b1fe3d79bc60f630abbcde 100644
--- a/ee/config/metrics/counts_all/20210216175400_projects_slack_notifications_active.yml
+++ b/ee/config/metrics/counts_all/20210216175400_projects_slack_notifications_active.yml
@@ -3,15 +3,16 @@ data_category: optional
 key_path: usage_activity_by_stage.configure.projects_slack_notifications_active
 description: Unique projects with Slack webhook enabled
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: chatops
 value_type: number
 status: data_available
 time_frame: all
-data_source: 
+data_source:
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175402_projects_slack_slash_active.yml b/ee/config/metrics/counts_all/20210216175402_projects_slack_slash_active.yml
index f7d70d7bf4b1a73afd10f09d072c6a2b37753294..a8076b23e157e67e0d5d207897e6006d5769ac3d 100644
--- a/ee/config/metrics/counts_all/20210216175402_projects_slack_slash_active.yml
+++ b/ee/config/metrics/counts_all/20210216175402_projects_slack_slash_active.yml
@@ -3,15 +3,16 @@ data_category: optional
 key_path: usage_activity_by_stage.configure.projects_slack_slash_active
 description: Unique projects with Slack ‘/’ commands enabled
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::configure
 product_category: chatops
 value_type: number
 status: data_available
 time_frame: all
-data_source: 
+data_source:
 distribution:
 - ee
 tier: []
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175441_ingress_modsecurity_statistics_unavailable.yml b/ee/config/metrics/counts_all/20210216175441_ingress_modsecurity_statistics_unavailable.yml
index 1acfff370d0937d1936ff6a1d44f097c7bac2bb4..176018d217b39ca12a1efa8a403063d5b7a38135 100644
--- a/ee/config/metrics/counts_all/20210216175441_ingress_modsecurity_statistics_unavailable.yml
+++ b/ee/config/metrics/counts_all/20210216175441_ingress_modsecurity_statistics_unavailable.yml
@@ -16,3 +16,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175458_container_scanning_jobs.yml b/ee/config/metrics/counts_all/20210216175458_container_scanning_jobs.yml
index a7049d65e033710262f5d7b69bdffcbe845f27e0..b9a04f046041a74a55e51ae46b4c7318d7f73c38 100644
--- a/ee/config/metrics/counts_all/20210216175458_container_scanning_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216175458_container_scanning_jobs.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175501_user_container_scanning_jobs.yml b/ee/config/metrics/counts_all/20210216175501_user_container_scanning_jobs.yml
index 9523e93bf8d7be540f647470e90ead4309749e7b..5cc7c13a079abc1e3106d456d4034574ad230440 100644
--- a/ee/config/metrics/counts_all/20210216175501_user_container_scanning_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216175501_user_container_scanning_jobs.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175503_container_scanning_scans.yml b/ee/config/metrics/counts_all/20210216175503_container_scanning_scans.yml
index 56a2516db96e8dfe80279ab933f406fd8cda9d41..3239085690f64fd02e0b25dc1061e23de08dc2bb 100644
--- a/ee/config/metrics/counts_all/20210216175503_container_scanning_scans.yml
+++ b/ee/config/metrics/counts_all/20210216175503_container_scanning_scans.yml
@@ -1,7 +1,7 @@
 ---
 data_category: operational
 key_path: usage_activity_by_stage.secure.container_scanning_scans
-description: 'Counts container scanning jobs'
+description: Counts container scanning jobs
 product_section: sec
 product_stage: protect
 product_group: group::container security
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175540_projects_reporting_ci_cd_back_to_github.yml b/ee/config/metrics/counts_all/20210216175540_projects_reporting_ci_cd_back_to_github.yml
index f4245d57557d653b73306df48c7b7c020e4f3566..2dc0069554555641d800eaa447ddde365cdcae44 100644
--- a/ee/config/metrics/counts_all/20210216175540_projects_reporting_ci_cd_back_to_github.yml
+++ b/ee/config/metrics/counts_all/20210216175540_projects_reporting_ci_cd_back_to_github.yml
@@ -9,7 +9,7 @@ product_category: continuous_integration
 value_type: number
 status: data_available
 time_frame: all
-data_source: 
+data_source:
 distribution:
 - ee
 tier:
@@ -17,3 +17,4 @@ tier:
 - ultimate
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175612_dast_jobs.yml b/ee/config/metrics/counts_all/20210216175612_dast_jobs.yml
index a2fdb0f76a5f9b2cf29975f99624553582d2f096..3d740b62b6a1b0066fd4adf1fce0caa74298c7fe 100644
--- a/ee/config/metrics/counts_all/20210216175612_dast_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216175612_dast_jobs.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175614_user_dast_jobs.yml b/ee/config/metrics/counts_all/20210216175614_user_dast_jobs.yml
index ab0ed503d62e6fa698aeff8fec7282b76d64e8cd..5853146b6f1676d23c54f5d136325405845a5e1b 100644
--- a/ee/config/metrics/counts_all/20210216175614_user_dast_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216175614_user_dast_jobs.yml
@@ -14,3 +14,4 @@ distribution:
 - ee
 tier:
 - ultimate
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175848_projects_github_active.yml b/ee/config/metrics/counts_all/20210216175848_projects_github_active.yml
index 2b705d4c6f8bb5a64125c852efd30980d3428b49..5e5dfe0116627e02d180485d19e2220bca629c20 100644
--- a/ee/config/metrics/counts_all/20210216175848_projects_github_active.yml
+++ b/ee/config/metrics/counts_all/20210216175848_projects_github_active.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175850_groups_github_active.yml b/ee/config/metrics/counts_all/20210216175850_groups_github_active.yml
index a4b0318b18f3b58718cd2b2d5b5cb870c6cf2902..c3dec0a2fc31d956b830db0924d5ec6f9ccc4865 100644
--- a/ee/config/metrics/counts_all/20210216175850_groups_github_active.yml
+++ b/ee/config/metrics/counts_all/20210216175850_groups_github_active.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175851_templates_github_active.yml b/ee/config/metrics/counts_all/20210216175851_templates_github_active.yml
index aab6af553dd47d9b0aacbb9142820318a76b9883..27c5a43df61c022e155db465b0143b41a71021fc 100644
--- a/ee/config/metrics/counts_all/20210216175851_templates_github_active.yml
+++ b/ee/config/metrics/counts_all/20210216175851_templates_github_active.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175853_instances_github_active.yml b/ee/config/metrics/counts_all/20210216175853_instances_github_active.yml
index a90f49c6b64d59459e35e1a516f2aca26bdd535c..9bd6b605edb0aba18a1ed5fee1a3283b9279d1fa 100644
--- a/ee/config/metrics/counts_all/20210216175853_instances_github_active.yml
+++ b/ee/config/metrics/counts_all/20210216175853_instances_github_active.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175855_projects_inheriting_github_active.yml b/ee/config/metrics/counts_all/20210216175855_projects_inheriting_github_active.yml
index 39c0b9177eccbe24f723cd3e608002698f2d8558..8fb2acf647b76e7925c3f21797054ff35495e7e4 100644
--- a/ee/config/metrics/counts_all/20210216175855_projects_inheriting_github_active.yml
+++ b/ee/config/metrics/counts_all/20210216175855_projects_inheriting_github_active.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216175857_groups_inheriting_github_active.yml b/ee/config/metrics/counts_all/20210216175857_groups_inheriting_github_active.yml
index 3ca868991b11698dd169e2185ec8057d84ac4557..d4ae732f6ce851d3f55e312508dbfc99c8d03a56 100644
--- a/ee/config/metrics/counts_all/20210216175857_groups_inheriting_github_active.yml
+++ b/ee/config/metrics/counts_all/20210216175857_groups_inheriting_github_active.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180236_projects_jira_issuelist_active.yml b/ee/config/metrics/counts_all/20210216180236_projects_jira_issuelist_active.yml
index f6b4f03961fa5dcd1fd95263dbe1bf8ae42dbbfb..e5e54ee1f01ca59db650cc86f88efc2652e2c693 100644
--- a/ee/config/metrics/counts_all/20210216180236_projects_jira_issuelist_active.yml
+++ b/ee/config/metrics/counts_all/20210216180236_projects_jira_issuelist_active.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180344_api_fuzzing_jobs.yml b/ee/config/metrics/counts_all/20210216180344_api_fuzzing_jobs.yml
index e18253d25d633e08122d3d51150e85938225fd27..59f68cf8c6efb8c3b7ec3ac20cc6f5d873d33369 100644
--- a/ee/config/metrics/counts_all/20210216180344_api_fuzzing_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216180344_api_fuzzing_jobs.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180346_api_fuzzing_dnd_jobs.yml b/ee/config/metrics/counts_all/20210216180346_api_fuzzing_dnd_jobs.yml
index 297f7ffca52fe7c424a61cb08868ddbbb624eb09..a0753565cde7ecf8d1296d39898625b5647d453f 100644
--- a/ee/config/metrics/counts_all/20210216180346_api_fuzzing_dnd_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216180346_api_fuzzing_dnd_jobs.yml
@@ -11,6 +11,7 @@ status: data_available
 time_frame: all
 data_source: database
 distribution:
-  - ee
+- ee
 tier:
-  - ultimate
+- ultimate
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180348_user_api_fuzzing_jobs.yml b/ee/config/metrics/counts_all/20210216180348_user_api_fuzzing_jobs.yml
index 3e417320910405ee96ec916688d98ea378a54049..aee60ee3d1418cf5bd713a87bcb5a606ca318ae0 100644
--- a/ee/config/metrics/counts_all/20210216180348_user_api_fuzzing_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216180348_user_api_fuzzing_jobs.yml
@@ -14,3 +14,4 @@ distribution:
 - ee
 tier:
 - ultimate
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180350_user_api_fuzzing_dnd_jobs.yml b/ee/config/metrics/counts_all/20210216180350_user_api_fuzzing_dnd_jobs.yml
index 1145622a968cef83bb8d492d26d9f7bdcdae1b81..928f05889899d8f1cc77b4c1612243a63e3546c8 100644
--- a/ee/config/metrics/counts_all/20210216180350_user_api_fuzzing_dnd_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216180350_user_api_fuzzing_dnd_jobs.yml
@@ -14,3 +14,4 @@ distribution:
 - ee
 tier:
 - ultimate
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180352_coverage_fuzzing_scans.yml b/ee/config/metrics/counts_all/20210216180352_coverage_fuzzing_scans.yml
index 18e1eb45777744881da4701598d87f57a9b5301d..e750df9a2c42bd84d62ecf589e02b7ed806a1779 100644
--- a/ee/config/metrics/counts_all/20210216180352_coverage_fuzzing_scans.yml
+++ b/ee/config/metrics/counts_all/20210216180352_coverage_fuzzing_scans.yml
@@ -11,7 +11,8 @@ status: data_available
 time_frame: all
 data_source: database
 distribution:
-  - ee
+- ee
 tier:
-  - ultimate
+- ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180353_api_fuzzing_scans.yml b/ee/config/metrics/counts_all/20210216180353_api_fuzzing_scans.yml
index f2af60fa22932bbea0657d396c4a2a4c20ab4d0f..dd710a02a975b3236209c86a73bc6381a73ecfc8 100644
--- a/ee/config/metrics/counts_all/20210216180353_api_fuzzing_scans.yml
+++ b/ee/config/metrics/counts_all/20210216180353_api_fuzzing_scans.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180405_geo_event_log_max_id.yml b/ee/config/metrics/counts_all/20210216180405_geo_event_log_max_id.yml
index 4710b92c32f95edad8ed115a8b0e692f552e893c..94abe7515b073341ffa93a2fa77f787bfcca4a62 100644
--- a/ee/config/metrics/counts_all/20210216180405_geo_event_log_max_id.yml
+++ b/ee/config/metrics/counts_all/20210216180405_geo_event_log_max_id.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180418_i_search_advanced.yml b/ee/config/metrics/counts_all/20210216180418_i_search_advanced.yml
index cf33b4a87c5e07bd238a543299f21ca5d0746885..82b4f5b231cd508f7acfee22f67e110cd017e074 100644
--- a/ee/config/metrics/counts_all/20210216180418_i_search_advanced.yml
+++ b/ee/config/metrics/counts_all/20210216180418_i_search_advanced.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180420_i_search_paid.yml b/ee/config/metrics/counts_all/20210216180420_i_search_paid.yml
index 5c48aad0fb3b3317358b2661d6514055aaa0ba8b..8a3e91b881aac3ada55a7c4148aedc72b4834eb4 100644
--- a/ee/config/metrics/counts_all/20210216180420_i_search_paid.yml
+++ b/ee/config/metrics/counts_all/20210216180420_i_search_paid.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180502_status_page_incident_publishes.yml b/ee/config/metrics/counts_all/20210216180502_status_page_incident_publishes.yml
index 0466db8a4db5e820c47040057aa3df330d0564ec..0e7c3ff66db6df7fca5b8f0ea185fc508952cd9e 100644
--- a/ee/config/metrics/counts_all/20210216180502_status_page_incident_publishes.yml
+++ b/ee/config/metrics/counts_all/20210216180502_status_page_incident_publishes.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180504_status_page_incident_unpublishes.yml b/ee/config/metrics/counts_all/20210216180504_status_page_incident_unpublishes.yml
index 3871a3df3d788e6eea6626e4993714e543c162d1..a242e21ac9d33feaae09a62fe693f6aed9b0ddb5 100644
--- a/ee/config/metrics/counts_all/20210216180504_status_page_incident_unpublishes.yml
+++ b/ee/config/metrics/counts_all/20210216180504_status_page_incident_unpublishes.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180506_status_page_projects.yml b/ee/config/metrics/counts_all/20210216180506_status_page_projects.yml
index 6028fca3fc2922838d8f74c5cf6fd85890c1d6e9..b175593570c225c1ac60fc8739fdcdf471b47af0 100644
--- a/ee/config/metrics/counts_all/20210216180506_status_page_projects.yml
+++ b/ee/config/metrics/counts_all/20210216180506_status_page_projects.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180507_status_page_issues.yml b/ee/config/metrics/counts_all/20210216180507_status_page_issues.yml
index 70622a5774327b2f7551a5195b0ef8f12418cbe9..f412d1e308929e5ae652019727624d81d9590cd6 100644
--- a/ee/config/metrics/counts_all/20210216180507_status_page_issues.yml
+++ b/ee/config/metrics/counts_all/20210216180507_status_page_issues.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180522_projects_incident_sla_enabled.yml b/ee/config/metrics/counts_all/20210216180522_projects_incident_sla_enabled.yml
index ea36c0efeb858df398ef6eba70985504297047b0..1e4e78588013cad06ea2ae50751e6414622c6b30 100644
--- a/ee/config/metrics/counts_all/20210216180522_projects_incident_sla_enabled.yml
+++ b/ee/config/metrics/counts_all/20210216180522_projects_incident_sla_enabled.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180800_ldap_keys.yml b/ee/config/metrics/counts_all/20210216180800_ldap_keys.yml
index faf2239e44404b63239d8b78ba318f7c30f97243..11d7e2ac2f94eccf814b2cf5b06413469bab4d08 100644
--- a/ee/config/metrics/counts_all/20210216180800_ldap_keys.yml
+++ b/ee/config/metrics/counts_all/20210216180800_ldap_keys.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180801_ldap_users.yml b/ee/config/metrics/counts_all/20210216180801_ldap_users.yml
index bcb71c5a31541ea34ab30369c7fe8572cbcb197e..aca927d966a4dcf9e1110214fbd51068deb4f41c 100644
--- a/ee/config/metrics/counts_all/20210216180801_ldap_users.yml
+++ b/ee/config/metrics/counts_all/20210216180801_ldap_users.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180803_value_stream_management_customized_group_stages.yml b/ee/config/metrics/counts_all/20210216180803_value_stream_management_customized_group_stages.yml
index 806dc0b1649e2db4bfbab75e34afddbf36276891..460d85651052ee1355ddd93378e73bfbbc3b4119 100644
--- a/ee/config/metrics/counts_all/20210216180803_value_stream_management_customized_group_stages.yml
+++ b/ee/config/metrics/counts_all/20210216180803_value_stream_management_customized_group_stages.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180805_projects_with_compliance_framework.yml b/ee/config/metrics/counts_all/20210216180805_projects_with_compliance_framework.yml
index 0dbda64d7e6e80c6211b751c26af69e64c2574ba..5fbf69aaa6e0a0a5305ddd6934f1d322ce632ec2 100644
--- a/ee/config/metrics/counts_all/20210216180805_projects_with_compliance_framework.yml
+++ b/ee/config/metrics/counts_all/20210216180805_projects_with_compliance_framework.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216180807_ldap_servers.yml b/ee/config/metrics/counts_all/20210216180807_ldap_servers.yml
index 85fcf7aa903cb2c2b6c630be7e015ce551f32213..64cc187b83f215c0cd7e6661248fc13c21a5dd08 100644
--- a/ee/config/metrics/counts_all/20210216180807_ldap_servers.yml
+++ b/ee/config/metrics/counts_all/20210216180807_ldap_servers.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216181100_assignee_lists.yml b/ee/config/metrics/counts_all/20210216181100_assignee_lists.yml
index a74fd3bd49a772aa2a4bb74f57e18f7809d1c03c..e7837157af725b3e789fd173c3cdc2f2b1b10391 100644
--- a/ee/config/metrics/counts_all/20210216181100_assignee_lists.yml
+++ b/ee/config/metrics/counts_all/20210216181100_assignee_lists.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216181106_milestone_lists.yml b/ee/config/metrics/counts_all/20210216181106_milestone_lists.yml
index 4a47690983236938102f02fa15d8f3997328562a..9e323fbc56a34575f24d0c24f3b680439e2b903f 100644
--- a/ee/config/metrics/counts_all/20210216181106_milestone_lists.yml
+++ b/ee/config/metrics/counts_all/20210216181106_milestone_lists.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216181132_assignee_lists.yml b/ee/config/metrics/counts_all/20210216181132_assignee_lists.yml
index 28170664f51d6613f449011a9b13007b5448c4bb..9a8603fb7494ae2ce97d5a902c2f040782f6432a 100644
--- a/ee/config/metrics/counts_all/20210216181132_assignee_lists.yml
+++ b/ee/config/metrics/counts_all/20210216181132_assignee_lists.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216181137_milestone_lists.yml b/ee/config/metrics/counts_all/20210216181137_milestone_lists.yml
index 6d7264029b91b27d109eafb27c595b0302c68ffd..f614ee26553c17666159780291b406eb2f69337c 100644
--- a/ee/config/metrics/counts_all/20210216181137_milestone_lists.yml
+++ b/ee/config/metrics/counts_all/20210216181137_milestone_lists.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216181205_confidential_epics.yml b/ee/config/metrics/counts_all/20210216181205_confidential_epics.yml
index c6ae7aabf3b286399eecb775abe0388931fe1d3d..6e31acca5ab85256ed061fb9120a744ec3086cc3 100644
--- a/ee/config/metrics/counts_all/20210216181205_confidential_epics.yml
+++ b/ee/config/metrics/counts_all/20210216181205_confidential_epics.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216181206_epics.yml b/ee/config/metrics/counts_all/20210216181206_epics.yml
index a6ffd66554dc5a0affe2f0429eb0204cf3b29806..3f1d43ea3513ad6507580436d2205c107582c0c9 100644
--- a/ee/config/metrics/counts_all/20210216181206_epics.yml
+++ b/ee/config/metrics/counts_all/20210216181206_epics.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216181208_epic_issues.yml b/ee/config/metrics/counts_all/20210216181208_epic_issues.yml
index fdf4558730897a05afe7bb981514f8a7aab9b2ea..0d988f1751a9e33adbe256400058be5f9be11214 100644
--- a/ee/config/metrics/counts_all/20210216181208_epic_issues.yml
+++ b/ee/config/metrics/counts_all/20210216181208_epic_issues.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216181210_issues_with_health_status.yml b/ee/config/metrics/counts_all/20210216181210_issues_with_health_status.yml
index 60f62997192004587b81fe929f698ab2334f19d2..7ee864b5c9c2e53031411cf8e3d0a62b11234ad3 100644
--- a/ee/config/metrics/counts_all/20210216181210_issues_with_health_status.yml
+++ b/ee/config/metrics/counts_all/20210216181210_issues_with_health_status.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216181212_epics_deepest_relationship_level.yml b/ee/config/metrics/counts_all/20210216181212_epics_deepest_relationship_level.yml
index a7b86b94f1f877a20a7811ab78a576ad63e9414c..e2592ab68e0dc8f8c425c7721e2e06834a3a15d7 100644
--- a/ee/config/metrics/counts_all/20210216181212_epics_deepest_relationship_level.yml
+++ b/ee/config/metrics/counts_all/20210216181212_epics_deepest_relationship_level.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216181920_projects_mirrored_with_pipelines_enabled.yml b/ee/config/metrics/counts_all/20210216181920_projects_mirrored_with_pipelines_enabled.yml
index 3a371616db794f88ea88635e0003310e7712e9ac..833e074dbf65cdef86e734ed3251413ec491ee4c 100644
--- a/ee/config/metrics/counts_all/20210216181920_projects_mirrored_with_pipelines_enabled.yml
+++ b/ee/config/metrics/counts_all/20210216181920_projects_mirrored_with_pipelines_enabled.yml
@@ -5,7 +5,7 @@ description: Projects with repository mirroring enabled
 product_section: ops
 product_stage: verify
 product_group: group::pipeline execution
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216181934_projects_mirrored_with_pipelines_enabled.yml b/ee/config/metrics/counts_all/20210216181934_projects_mirrored_with_pipelines_enabled.yml
index fe17de9b4eae6920f74a4d037b3e6a33b318627c..2c38ee9d320ecca726725dd6eda432675f573766 100644
--- a/ee/config/metrics/counts_all/20210216181934_projects_mirrored_with_pipelines_enabled.yml
+++ b/ee/config/metrics/counts_all/20210216181934_projects_mirrored_with_pipelines_enabled.yml
@@ -5,7 +5,7 @@ description: Count creator_id from projects with repository mirroring enabled.
 product_section: ops
 product_stage: verify
 product_group: group::pipeline execution
-product_category: 
+product_category:
 value_type: number
 status: data_available
 time_frame: all
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216181959_projects_with_repositories_enabled.yml b/ee/config/metrics/counts_all/20210216181959_projects_with_repositories_enabled.yml
index d58eb1e509edaec7ccb56fbab37786e62e74f435..cef1b7b26141f0ef09ac5def560e9e9f53084e27 100644
--- a/ee/config/metrics/counts_all/20210216181959_projects_with_repositories_enabled.yml
+++ b/ee/config/metrics/counts_all/20210216181959_projects_with_repositories_enabled.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182001_protected_branches.yml b/ee/config/metrics/counts_all/20210216182001_protected_branches.yml
index a19c88d8a7993ed83be5486dbf449ec36eae9468..6f1130517a18943f012cd058c3fe1a0942abddd9 100644
--- a/ee/config/metrics/counts_all/20210216182001_protected_branches.yml
+++ b/ee/config/metrics/counts_all/20210216182001_protected_branches.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182008_template_repositories.yml b/ee/config/metrics/counts_all/20210216182008_template_repositories.yml
index 30f277276740150c93f303fc1d27c89e2ca9f21a..b74bca7cfc9c8f2c590410b02a87bf5fe82e1e25 100644
--- a/ee/config/metrics/counts_all/20210216182008_template_repositories.yml
+++ b/ee/config/metrics/counts_all/20210216182008_template_repositories.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182019_projects_enforcing_code_owner_approval.yml b/ee/config/metrics/counts_all/20210216182019_projects_enforcing_code_owner_approval.yml
index 02c93956f075a1237ed0a12cda0c0c0e9aa29e98..7b360152e77f6500523b033a5f1bd72e8219514e 100644
--- a/ee/config/metrics/counts_all/20210216182019_projects_enforcing_code_owner_approval.yml
+++ b/ee/config/metrics/counts_all/20210216182019_projects_enforcing_code_owner_approval.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182021_projects_with_sectional_code_owner_rules.yml b/ee/config/metrics/counts_all/20210216182021_projects_with_sectional_code_owner_rules.yml
index 4bd0c2d11cbfaa9f4f574aa3d42aca976c247dc6..1d586e2316d64cd38a6403617f3fd9e30fe3cbb9 100644
--- a/ee/config/metrics/counts_all/20210216182021_projects_with_sectional_code_owner_rules.yml
+++ b/ee/config/metrics/counts_all/20210216182021_projects_with_sectional_code_owner_rules.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182023_projects_with_repositories_enabled.yml b/ee/config/metrics/counts_all/20210216182023_projects_with_repositories_enabled.yml
index f628bae594fad8fed2971d57b463fbd5dd2353c0..a3084398c796901e98a5b91de764d783045e4c45 100644
--- a/ee/config/metrics/counts_all/20210216182023_projects_with_repositories_enabled.yml
+++ b/ee/config/metrics/counts_all/20210216182023_projects_with_repositories_enabled.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182025_protected_branches.yml b/ee/config/metrics/counts_all/20210216182025_protected_branches.yml
index d7b5d76952a7d8c95aa6a83d53a50172042ebe77..8f66a1b970935247b63e0d2bb384ec1f6ccb88c5 100644
--- a/ee/config/metrics/counts_all/20210216182025_protected_branches.yml
+++ b/ee/config/metrics/counts_all/20210216182025_protected_branches.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182027_total_number_of_path_locks.yml b/ee/config/metrics/counts_all/20210216182027_total_number_of_path_locks.yml
index 4c8e38a01b1d8a0bcf1d6c655e1cf2d095448a1d..1bf56dc3120649c61e01241a1090e8093cdaa4d9 100644
--- a/ee/config/metrics/counts_all/20210216182027_total_number_of_path_locks.yml
+++ b/ee/config/metrics/counts_all/20210216182027_total_number_of_path_locks.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182028_total_number_of_locked_files.yml b/ee/config/metrics/counts_all/20210216182028_total_number_of_locked_files.yml
index 61e352cae9d38c5046d01b29b083f76855309f1a..6b231b9183e143622b611c64d92e4e72761e1b45 100644
--- a/ee/config/metrics/counts_all/20210216182028_total_number_of_locked_files.yml
+++ b/ee/config/metrics/counts_all/20210216182028_total_number_of_locked_files.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182030_approval_project_rules.yml b/ee/config/metrics/counts_all/20210216182030_approval_project_rules.yml
index 7c11a06a94d4fc0da1110e3b518a984c6f197ac0..cf6e42adae6add595830a5282e713d1e937eecc5 100644
--- a/ee/config/metrics/counts_all/20210216182030_approval_project_rules.yml
+++ b/ee/config/metrics/counts_all/20210216182030_approval_project_rules.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182032_approval_project_rules_with_target_branch.yml b/ee/config/metrics/counts_all/20210216182032_approval_project_rules_with_target_branch.yml
index e34b9c0faf542a868b27825d2764a6a8e7bad1fe..01e7e66093fef6818495a6dcad876b1e1cc48261 100644
--- a/ee/config/metrics/counts_all/20210216182032_approval_project_rules_with_target_branch.yml
+++ b/ee/config/metrics/counts_all/20210216182032_approval_project_rules_with_target_branch.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182120_sast_scans.yml b/ee/config/metrics/counts_all/20210216182120_sast_scans.yml
index bce8e3c17f06e119e35b8e1a696f62ea5f303df4..2c472f1073fe01cbbf1d4fdb20929da7d7ed01f1 100644
--- a/ee/config/metrics/counts_all/20210216182120_sast_scans.yml
+++ b/ee/config/metrics/counts_all/20210216182120_sast_scans.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182122_dast_scans.yml b/ee/config/metrics/counts_all/20210216182122_dast_scans.yml
index d643eec346d5805281e06f4144754e61956b494a..5be4811dd468ea1789a5dd27bbbd130c6529ce57 100644
--- a/ee/config/metrics/counts_all/20210216182122_dast_scans.yml
+++ b/ee/config/metrics/counts_all/20210216182122_dast_scans.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182123_secret_detection_scans.yml b/ee/config/metrics/counts_all/20210216182123_secret_detection_scans.yml
index 15b10171745e98a5368625e13bcd2de379e66071..871fb7b26faea80eb27408d29ff21eb0e2dd1036 100644
--- a/ee/config/metrics/counts_all/20210216182123_secret_detection_scans.yml
+++ b/ee/config/metrics/counts_all/20210216182123_secret_detection_scans.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182203_user_preferences_group_overview_details.yml b/ee/config/metrics/counts_all/20210216182203_user_preferences_group_overview_details.yml
index c599083b178fb4c54030420de56577742e72a20b..f830e232820e25f643774dd5031ada98739d56ee 100644
--- a/ee/config/metrics/counts_all/20210216182203_user_preferences_group_overview_details.yml
+++ b/ee/config/metrics/counts_all/20210216182203_user_preferences_group_overview_details.yml
@@ -16,3 +16,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182205_user_preferences_group_overview_security_dashboard.yml b/ee/config/metrics/counts_all/20210216182205_user_preferences_group_overview_security_dashboard.yml
index 6f673a8084e9f7ddd89d2a6556751550751a3404..d5633250b06a3ff5f3430d79c873221018eb327a 100644
--- a/ee/config/metrics/counts_all/20210216182205_user_preferences_group_overview_security_dashboard.yml
+++ b/ee/config/metrics/counts_all/20210216182205_user_preferences_group_overview_security_dashboard.yml
@@ -16,3 +16,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182207_user_preferences_group_overview_security_dashboard.yml b/ee/config/metrics/counts_all/20210216182207_user_preferences_group_overview_security_dashboard.yml
index ac88b9b67bb06215f2152a1bc23410628fd3c74e..f851804842663345bc28c42454a89ab7949e64c0 100644
--- a/ee/config/metrics/counts_all/20210216182207_user_preferences_group_overview_security_dashboard.yml
+++ b/ee/config/metrics/counts_all/20210216182207_user_preferences_group_overview_security_dashboard.yml
@@ -16,3 +16,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216182212_projects_reporting_ci_cd_back_to_github.yml b/ee/config/metrics/counts_all/20210216182212_projects_reporting_ci_cd_back_to_github.yml
index 9f050225d8fed1aaf4d8a9e08ec6ce16190e02bd..ea3e0b88f338a9f85d47c9d4832e42328a79fc4e 100644
--- a/ee/config/metrics/counts_all/20210216182212_projects_reporting_ci_cd_back_to_github.yml
+++ b/ee/config/metrics/counts_all/20210216182212_projects_reporting_ci_cd_back_to_github.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183146_coverage_fuzzing_jobs.yml b/ee/config/metrics/counts_all/20210216183146_coverage_fuzzing_jobs.yml
index 9118c50e96ee6a081317819c0a6ea8df6c163e69..3fb11c8a45fd11c811baed1869a5637ed0c009ff 100644
--- a/ee/config/metrics/counts_all/20210216183146_coverage_fuzzing_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216183146_coverage_fuzzing_jobs.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183149_dast_on_demand_pipelines.yml b/ee/config/metrics/counts_all/20210216183149_dast_on_demand_pipelines.yml
index c592d9356c966891d23f86f85c668193bd5ed56c..6c4d5d58df76d00b19e7d0f8652bfd2ef182768b 100644
--- a/ee/config/metrics/counts_all/20210216183149_dast_on_demand_pipelines.yml
+++ b/ee/config/metrics/counts_all/20210216183149_dast_on_demand_pipelines.yml
@@ -14,3 +14,4 @@ distribution:
 - ee
 tier:
 - ultimate
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183339_merge_requests_with_overridden_project_rules.yml b/ee/config/metrics/counts_all/20210216183339_merge_requests_with_overridden_project_rules.yml
index 732595b18351f141e3924cd7f45af765b1d1075a..67bd69a79ba8a5e9eb4b4c0755e98dd0438bf570 100644
--- a/ee/config/metrics/counts_all/20210216183339_merge_requests_with_overridden_project_rules.yml
+++ b/ee/config/metrics/counts_all/20210216183339_merge_requests_with_overridden_project_rules.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183344_users_using_path_locks.yml b/ee/config/metrics/counts_all/20210216183344_users_using_path_locks.yml
index 9c97d29a3b91ce2381ffea8a0d79e60c2baa12f9..dcf0da36fd5f1758ec054e924a28fd5ee6ac7a0e 100644
--- a/ee/config/metrics/counts_all/20210216183344_users_using_path_locks.yml
+++ b/ee/config/metrics/counts_all/20210216183344_users_using_path_locks.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183346_users_using_lfs_locks.yml b/ee/config/metrics/counts_all/20210216183346_users_using_lfs_locks.yml
index d20ca96469a423501e8465906e330a0f7b28a9da..b2344432fafbc78e545dd904b8589ab32d4550c6 100644
--- a/ee/config/metrics/counts_all/20210216183346_users_using_lfs_locks.yml
+++ b/ee/config/metrics/counts_all/20210216183346_users_using_lfs_locks.yml
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183352_approval_project_rules_with_more_approvers_than_required.yml b/ee/config/metrics/counts_all/20210216183352_approval_project_rules_with_more_approvers_than_required.yml
index f41a62a220f35be39f62a842abdd6f60a6713d94..8a1a5d7eaee72aa52fb6c277b9cb944c78fe9bbe 100644
--- a/ee/config/metrics/counts_all/20210216183352_approval_project_rules_with_more_approvers_than_required.yml
+++ b/ee/config/metrics/counts_all/20210216183352_approval_project_rules_with_more_approvers_than_required.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183354_approval_project_rules_with_less_approvers_than_required.yml b/ee/config/metrics/counts_all/20210216183354_approval_project_rules_with_less_approvers_than_required.yml
index 0d22e40f0877d45a46b786298a4f8acdece05228..b457fcf43b3283651c79a7d88141945e63a28a5d 100644
--- a/ee/config/metrics/counts_all/20210216183354_approval_project_rules_with_less_approvers_than_required.yml
+++ b/ee/config/metrics/counts_all/20210216183354_approval_project_rules_with_less_approvers_than_required.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183355_approval_project_rules_with_exact_required_approvers.yml b/ee/config/metrics/counts_all/20210216183355_approval_project_rules_with_exact_required_approvers.yml
index eda838a116d98353d70500ab219223fbee850ace..d6b639c8d03bed71807a7a39be5a3439cd2fccb8 100644
--- a/ee/config/metrics/counts_all/20210216183355_approval_project_rules_with_exact_required_approvers.yml
+++ b/ee/config/metrics/counts_all/20210216183355_approval_project_rules_with_exact_required_approvers.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183514_user_coverage_fuzzing_jobs.yml b/ee/config/metrics/counts_all/20210216183514_user_coverage_fuzzing_jobs.yml
index 081eaf1e84a367431cfdac533226b3ceeec4280c..36908c9ef43594206a90b4095196fc14ccea175c 100644
--- a/ee/config/metrics/counts_all/20210216183514_user_coverage_fuzzing_jobs.yml
+++ b/ee/config/metrics/counts_all/20210216183514_user_coverage_fuzzing_jobs.yml
@@ -14,3 +14,4 @@ distribution:
 - ee
 tier:
 - ultimate
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183753_projects_incident_sla_enabled.yml b/ee/config/metrics/counts_all/20210216183753_projects_incident_sla_enabled.yml
index 56c36a574290fd54906fa4436939425a069c38b5..725251299b0b8e34f0d0b3d10db205fe16fe5a97 100644
--- a/ee/config/metrics/counts_all/20210216183753_projects_incident_sla_enabled.yml
+++ b/ee/config/metrics/counts_all/20210216183753_projects_incident_sla_enabled.yml
@@ -3,7 +3,7 @@ data_category: optional
 key_path: usage_activity_by_stage_monthly.monitor.projects_incident_sla_enabled
 description: Count of projects with Incident SLA enabled
 product_section: ops
-product_stage: 
+product_stage:
 product_group: group::monitor
 product_category: metrics
 value_type: number
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183904_g_compliance_dashboard.yml b/ee/config/metrics/counts_all/20210216183904_g_compliance_dashboard.yml
index 19f0911ea79500bdd7d9160a322e26b3737c54e2..1adf1add5b512b785b796cd82b5eb15bb0881136 100644
--- a/ee/config/metrics/counts_all/20210216183904_g_compliance_dashboard.yml
+++ b/ee/config/metrics/counts_all/20210216183904_g_compliance_dashboard.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: compliance_unique_visits.g_compliance_dashboard
-description: 'Number of unique visitors to the compliance dashboard.'
-product_section: 'dev'
-product_stage: 'manage'
-product_group: 'group::compliance'
-product_category: 'compliance_management'
+description: Number of unique visitors to the compliance dashboard.
+product_section: dev
+product_stage: manage
+product_group: group::compliance
+product_category: compliance_management
 value_type: number
 status: data_available
 time_frame: all
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183906_g_compliance_audit_events.yml b/ee/config/metrics/counts_all/20210216183906_g_compliance_audit_events.yml
index 5b8ef30ec9482ce7ee0683f7978f941c6d8ad375..029fa642aaefc6e1fa878f14ed835970a2846b65 100644
--- a/ee/config/metrics/counts_all/20210216183906_g_compliance_audit_events.yml
+++ b/ee/config/metrics/counts_all/20210216183906_g_compliance_audit_events.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: compliance_unique_visits.g_compliance_audit_events
-description: 'Unique users who have viewed audit events'
-product_section: 'dev'
-product_stage: 'manage'
-product_group: 'group::compliance'
-product_category: 'audit_events'
+description: Unique users who have viewed audit events
+product_section: dev
+product_stage: manage
+product_group: group::compliance
+product_category: audit_events
 value_type: number
 status: data_available
 time_frame: all
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183908_i_compliance_audit_events.yml b/ee/config/metrics/counts_all/20210216183908_i_compliance_audit_events.yml
index e740c2f134f78faff8717cb35a06b974eb7dd648..723bd2a15cb37e2feb1ec295463ae421d9922c58 100644
--- a/ee/config/metrics/counts_all/20210216183908_i_compliance_audit_events.yml
+++ b/ee/config/metrics/counts_all/20210216183908_i_compliance_audit_events.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: compliance_unique_visits.i_compliance_audit_events
-description: 'Unique users that have viewed the instance-level audit events screen'
-product_section: 'dev'
-product_stage: 'manage'
-product_group: 'group::compliance'
-product_category: 'audit_events'
+description: Unique users that have viewed the instance-level audit events screen
+product_section: dev
+product_stage: manage
+product_group: group::compliance
+product_category: audit_events
 value_type: number
 status: data_available
 time_frame: all
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183910_i_compliance_credential_inventory.yml b/ee/config/metrics/counts_all/20210216183910_i_compliance_credential_inventory.yml
index 4c3c54d073cd04bc9ef88fe007f9ee732f171c5b..4a71e06ff0f208e579af50f1533e022e68e11d9e 100644
--- a/ee/config/metrics/counts_all/20210216183910_i_compliance_credential_inventory.yml
+++ b/ee/config/metrics/counts_all/20210216183910_i_compliance_credential_inventory.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: compliance_unique_visits.i_compliance_credential_inventory
-description: 'Unique users who have viewed the credential inventory'
-product_section: 'dev'
-product_stage: 'manage'
-product_group: 'group::compliance'
-product_category: 'compliance_management'
+description: Unique users who have viewed the credential inventory
+product_section: dev
+product_stage: manage
+product_group: group::compliance
+product_category: compliance_management
 value_type: number
 status: data_available
 time_frame: all
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183912_a_compliance_audit_events_api.yml b/ee/config/metrics/counts_all/20210216183912_a_compliance_audit_events_api.yml
index c1e13176c4a099ae304cd142254f03e823ff48e0..58f7f0ebf03ba3a469a51c1df2ab3f3a86d0eba8 100644
--- a/ee/config/metrics/counts_all/20210216183912_a_compliance_audit_events_api.yml
+++ b/ee/config/metrics/counts_all/20210216183912_a_compliance_audit_events_api.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: compliance_unique_visits.a_compliance_audit_events_api
-description: 'Unique users that have used the Audit Events API.'
-product_section: 'dev'
-product_stage: 'manage'
-product_group: 'group::compliance'
-product_category: 'audit_events'
+description: Unique users that have used the Audit Events API.
+product_section: dev
+product_stage: manage
+product_group: group::compliance
+product_category: audit_events
 value_type: number
 status: data_available
 time_frame: all
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216183914_compliance_unique_visits_for_any_target.yml b/ee/config/metrics/counts_all/20210216183914_compliance_unique_visits_for_any_target.yml
index 9311977622b5d1d54051b54d91f45298231053b1..d5f5c98bb380c149b40a892eaefd6bdfe89da357 100644
--- a/ee/config/metrics/counts_all/20210216183914_compliance_unique_visits_for_any_target.yml
+++ b/ee/config/metrics/counts_all/20210216183914_compliance_unique_visits_for_any_target.yml
@@ -1,11 +1,11 @@
 ---
 data_category: optional
 key_path: compliance_unique_visits.compliance_unique_visits_for_any_target
-description: 'Number of unique visits to any compliance page'
-product_section: 'dev'
-product_stage: 'manage'
-product_group: 'group::compliance'
-product_category: 'compliance_management'
+description: Number of unique visits to any compliance page
+product_section: dev
+product_stage: manage
+product_group: group::compliance
+product_category: compliance_management
 value_type: number
 status: data_available
 time_frame: all
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/counts_all/20210216184035_i_search_paid_monthly.yml b/ee/config/metrics/counts_all/20210216184035_i_search_paid_monthly.yml
index c998d8c4897cb2da25dbb21e9d6a936b542c6854..a80de39c6619dc6a7bafad8e8e90ed07395d7ac7 100644
--- a/ee/config/metrics/counts_all/20210216184035_i_search_paid_monthly.yml
+++ b/ee/config/metrics/counts_all/20210216184035_i_search_paid_monthly.yml
@@ -22,3 +22,4 @@ tier:
 - ultimate
 performance_indicator_type:
 - paid_gmau
+milestone: "<13.9"
diff --git a/ee/config/metrics/license/20210204124831_license_md5.yml b/ee/config/metrics/license/20210204124831_license_md5.yml
index 1b698d6cb718e357ee2c8deede8c87a127856682..4bc364e875f931ccb5f7fbe03fbfac8f0dbb4e86 100644
--- a/ee/config/metrics/license/20210204124831_license_md5.yml
+++ b/ee/config/metrics/license/20210204124831_license_md5.yml
@@ -9,7 +9,7 @@ value_type: string
 status: data_available
 time_frame: none
 data_source: license
-instrumentation_class: 'LicenseMdFiveMetric'
+instrumentation_class: LicenseMdFiveMetric
 data_category: standard
 distribution:
 - ee
@@ -18,3 +18,4 @@ tier:
 - ultimate
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/license/20210204124833_license_id.yml b/ee/config/metrics/license/20210204124833_license_id.yml
index a367c60adccd737bf2c8a0c1695ae998699427ef..d6a4d628f92d07cc821117f34fd431719374e179 100644
--- a/ee/config/metrics/license/20210204124833_license_id.yml
+++ b/ee/config/metrics/license/20210204124833_license_id.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/license/20210204124835_historical_max_users.yml b/ee/config/metrics/license/20210204124835_historical_max_users.yml
index 5e062967e4174994a21a9429f0dd19bd7f631292..a3b7b3bb848aa668e75a3fc7de9590da9773b1fc 100644
--- a/ee/config/metrics/license/20210204124835_historical_max_users.yml
+++ b/ee/config/metrics/license/20210204124835_historical_max_users.yml
@@ -17,3 +17,4 @@ tier:
 - ultimate
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/license/20210204124837_name.yml b/ee/config/metrics/license/20210204124837_name.yml
index 5f10a77dcd586a006a9afe8964e42f875eac737d..49cb3af39afc76aecb05044414c0525c92a50186 100644
--- a/ee/config/metrics/license/20210204124837_name.yml
+++ b/ee/config/metrics/license/20210204124837_name.yml
@@ -17,3 +17,4 @@ tier:
 - ultimate
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/license/20210204124839_email.yml b/ee/config/metrics/license/20210204124839_email.yml
index cdf650bb6fe0f3d4ccd87ee92d19e5d2ac275dab..af68e7311211637a59307261756c8b6a04dc31ca 100644
--- a/ee/config/metrics/license/20210204124839_email.yml
+++ b/ee/config/metrics/license/20210204124839_email.yml
@@ -17,3 +17,4 @@ tier:
 - ultimate
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/license/20210204124841_company.yml b/ee/config/metrics/license/20210204124841_company.yml
index 06bf1d5bed843b769258d7a893408bb5aa9789ce..61792160f9c28a07f0abf41b8d7d2538f7370ebc 100644
--- a/ee/config/metrics/license/20210204124841_company.yml
+++ b/ee/config/metrics/license/20210204124841_company.yml
@@ -17,3 +17,4 @@ tier:
 - ultimate
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/license/20210204124843_license_user_count.yml b/ee/config/metrics/license/20210204124843_license_user_count.yml
index f377003287dd2cc504cdd6d6683b9ef0a0006a92..6e8a83053db4188ae857273da9b2fd993d54f60d 100644
--- a/ee/config/metrics/license/20210204124843_license_user_count.yml
+++ b/ee/config/metrics/license/20210204124843_license_user_count.yml
@@ -17,3 +17,4 @@ tier:
 - ultimate
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/license/20210204124845_license_starts_at.yml b/ee/config/metrics/license/20210204124845_license_starts_at.yml
index bb7d2c05108118600214c3bf54df0043b60e265f..cfaba8fb95290389ca3ff7ff8b1b924e610e387a 100644
--- a/ee/config/metrics/license/20210204124845_license_starts_at.yml
+++ b/ee/config/metrics/license/20210204124845_license_starts_at.yml
@@ -17,3 +17,4 @@ tier:
 - ultimate
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/license/20210204124847_license_expires_at.yml b/ee/config/metrics/license/20210204124847_license_expires_at.yml
index 8079a4290301c8fcd489e77ef02fccb4c855547b..0d169968b5206670ba69ecfdb842f0932fcc8ddb 100644
--- a/ee/config/metrics/license/20210204124847_license_expires_at.yml
+++ b/ee/config/metrics/license/20210204124847_license_expires_at.yml
@@ -17,3 +17,4 @@ tier:
 - ultimate
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/557
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/license/20210204124849_license_plan.yml b/ee/config/metrics/license/20210204124849_license_plan.yml
index a7932f87ff1bfdb095c1fcd6d8d173aa48f43679..b5e3a2d8647c689f72d7617ad523a9e9042408dc 100644
--- a/ee/config/metrics/license/20210204124849_license_plan.yml
+++ b/ee/config/metrics/license/20210204124849_license_plan.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/license/20210204124851_license_trial.yml b/ee/config/metrics/license/20210204124851_license_trial.yml
index db3ee18dd8cfb6f021e5b573bd0835e260de724e..2c7de4eb6381165c2b485719a6dd20cb13b3c322 100644
--- a/ee/config/metrics/license/20210204124851_license_trial.yml
+++ b/ee/config/metrics/license/20210204124851_license_trial.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/license/20210204124852_license_subscription_id.yml b/ee/config/metrics/license/20210204124852_license_subscription_id.yml
index 65e745f0715fa2faf7509577fa160afa6bc00a6f..16798bd8c4394bf29bac478bccf53f44bcb754c1 100644
--- a/ee/config/metrics/license/20210204124852_license_subscription_id.yml
+++ b/ee/config/metrics/license/20210204124852_license_subscription_id.yml
@@ -9,7 +9,7 @@ value_type: string
 status: data_available
 time_frame: none
 data_source: license
-instrumentation_class: 'ZuoraSubscriptionIdMetric'
+instrumentation_class: ZuoraSubscriptionIdMetric
 data_category: standard
 distribution:
 - ee
@@ -17,3 +17,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/license/20210204124926_license_trial_ends_on.yml b/ee/config/metrics/license/20210204124926_license_trial_ends_on.yml
index 93b776cc3952d0240806c45be6853b6748294086..3809ad741f274058360841325c827ea96f84f7ff 100644
--- a/ee/config/metrics/license/20210204124926_license_trial_ends_on.yml
+++ b/ee/config/metrics/license/20210204124926_license_trial_ends_on.yml
@@ -18,3 +18,4 @@ tier:
 - ultimate
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/22279
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/license/20210216175210_licenses_list_views.yml b/ee/config/metrics/license/20210216175210_licenses_list_views.yml
index 00edac2c3caf9e2d8f0710a6f153f38e33ccc471..cb48cdf813e71dad606c46b4785766c63bba0924 100644
--- a/ee/config/metrics/license/20210216175210_licenses_list_views.yml
+++ b/ee/config/metrics/license/20210216175210_licenses_list_views.yml
@@ -15,3 +15,4 @@ distribution:
 tier:
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/settings/20210204124924_elasticsearch_enabled.yml b/ee/config/metrics/settings/20210204124924_elasticsearch_enabled.yml
index fbaf66db3677ef618bbe7d6ba87cdf88a7277806..a0959ebe90ef77e9849624c6b7e8b1ce6ffb86a1 100644
--- a/ee/config/metrics/settings/20210204124924_elasticsearch_enabled.yml
+++ b/ee/config/metrics/settings/20210204124924_elasticsearch_enabled.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/settings/20210216180406_geo_enabled.yml b/ee/config/metrics/settings/20210216180406_geo_enabled.yml
index f1a9857de8ca02a30a1f00f5405a96c715caf82d..893c33d4bb55e3157b7d86e55f76f7954f76d9e5 100644
--- a/ee/config/metrics/settings/20210216180406_geo_enabled.yml
+++ b/ee/config/metrics/settings/20210216180406_geo_enabled.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/settings/20210216180809_ldap_group_sync_enabled.yml b/ee/config/metrics/settings/20210216180809_ldap_group_sync_enabled.yml
index 97da30f36d344bb23771b8a2626d2b435b4fb8ee..182012949255d4bdb00bf60d36a228409f0abc6f 100644
--- a/ee/config/metrics/settings/20210216180809_ldap_group_sync_enabled.yml
+++ b/ee/config/metrics/settings/20210216180809_ldap_group_sync_enabled.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/settings/20210216180811_ldap_admin_sync_enabled.yml b/ee/config/metrics/settings/20210216180811_ldap_admin_sync_enabled.yml
index 859b723aab7dda93bf0a91a7420309985b91fbd2..a1bc21d79a9785018704dab053ac85c0f92dea15 100644
--- a/ee/config/metrics/settings/20210216180811_ldap_admin_sync_enabled.yml
+++ b/ee/config/metrics/settings/20210216180811_ldap_admin_sync_enabled.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/settings/20210216180813_group_saml_enabled.yml b/ee/config/metrics/settings/20210216180813_group_saml_enabled.yml
index ac18a0aafa82ce5db2cf37b427ebe832292b3dc1..b06df67b8fa446136ef51d0289f89a7ef357ed61 100644
--- a/ee/config/metrics/settings/20210216180813_group_saml_enabled.yml
+++ b/ee/config/metrics/settings/20210216180813_group_saml_enabled.yml
@@ -1,11 +1,12 @@
 ---
 data_category: optional
 key_path: usage_activity_by_stage.manage.group_saml_enabled
-description: Has the instance enabled Group SAML SSO `https://docs.gitlab.com/ee/user/group/saml_sso/` on at least 1 group?
+description: Has the instance enabled Group SAML SSO `https://docs.gitlab.com/ee/user/group/saml_sso/`
+  on at least 1 group?
 product_section: dev
-product_stage: 
+product_stage:
 product_group: group::manage
-product_category: 
+product_category:
 value_type: boolean
 status: data_available
 time_frame: none
@@ -16,3 +17,4 @@ tier:
 - premium
 skip_validation: true
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/settings/20210216180829_ldap_group_sync_enabled.yml b/ee/config/metrics/settings/20210216180829_ldap_group_sync_enabled.yml
index 568f7ddc8a3cc7734868d92489e183133345cc72..81e1068c18c212deefe28e86c23f85c7665c4538 100644
--- a/ee/config/metrics/settings/20210216180829_ldap_group_sync_enabled.yml
+++ b/ee/config/metrics/settings/20210216180829_ldap_group_sync_enabled.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/settings/20210216180831_ldap_admin_sync_enabled.yml b/ee/config/metrics/settings/20210216180831_ldap_admin_sync_enabled.yml
index 98bb69f2fcd62310582319655c05adbc5a4b3453..e22c1de8babb628e18a496810612d42780d6d2f5 100644
--- a/ee/config/metrics/settings/20210216180831_ldap_admin_sync_enabled.yml
+++ b/ee/config/metrics/settings/20210216180831_ldap_admin_sync_enabled.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"
diff --git a/ee/config/metrics/settings/20210216180833_group_saml_enabled.yml b/ee/config/metrics/settings/20210216180833_group_saml_enabled.yml
index eda55fcddca6ca4ac52c58eb211ad659048abf20..5cd5c850e28a3c850c22fe5dd3f0769016b87a38 100644
--- a/ee/config/metrics/settings/20210216180833_group_saml_enabled.yml
+++ b/ee/config/metrics/settings/20210216180833_group_saml_enabled.yml
@@ -16,3 +16,4 @@ tier:
 - premium
 - ultimate
 performance_indicator_type: []
+milestone: "<13.9"