diff --git a/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request.md b/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request.md
index d7a8eac187..2580c16023 100644
--- a/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request.md
+++ b/content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/merging-a-pull-request.md
@@ -63,7 +63,6 @@ If you decide you don't want the changes in a topic branch to be merged to the u
 2. If prompted, type a commit message, or accept the default message.
 
    {% data reusables.pull_requests.default-commit-message-squash-merge %}
-
 {% data reusables.files.choose-commit-email %}
 
    {% note %}
@@ -71,7 +70,6 @@ If you decide you don't want the changes in a topic branch to be merged to the u
    **Note:** The email selector is not available for rebase merges, which do not create a merge commit{% ifversion squash-merge-email %}. For squash merges, the email selector is only shown if you are the pull request author and you have more than one email address associated with your account.{% else %}, or for squash merges, which credit the user who created the pull request as the author of the squashed commit.{% endif %}
 
    {% endnote %}
-
 1. Click **Confirm merge**, **Confirm squash and merge**, or **Confirm rebase and merge**.
 2. Optionally, [delete the branch](/repositories/configuring-branches-and-merges-in-your-repository/managing-branches-in-your-repository/deleting-and-restoring-branches-in-a-pull-request). This keeps the list of branches in your repository tidy.
 
diff --git a/data/features/scim-for-ghes.yml b/data/features/scim-for-ghes.yml
index 89f6a77c79..77e211c2c9 100644
--- a/data/features/scim-for-ghes.yml
+++ b/data/features/scim-for-ghes.yml
@@ -1,4 +1,4 @@
 # Issue #7791: SCIM for GitHub Enterprise Server
 
 versions:
-  ghes: '>=3.6'
+  ghes: '>=3.7'
diff --git a/data/features/squash-merge-email.yml b/data/features/squash-merge-email.yml
index d46e0c3e9e..8b4a1708ed 100644
--- a/data/features/squash-merge-email.yml
+++ b/data/features/squash-merge-email.yml
@@ -3,5 +3,3 @@
 versions:
   fpt: '*'
   ghec: '*'
-  ghes: '>= 3.8'
-  ghae: '>= 3.8'
diff --git a/data/release-notes/enterprise-server/3-6/0.yml b/data/release-notes/enterprise-server/3-6/0.yml
index cf82ff1287..7bf5fc44f6 100644
--- a/data/release-notes/enterprise-server/3-6/0.yml
+++ b/data/release-notes/enterprise-server/3-6/0.yml
@@ -290,6 +290,7 @@ sections:
     - If a user refreshes the page while creating a new issue or pull request, the assignees, reviewers, labels and projects will all be preserved.
     - |
       VMware vSphere ESXi hypervisor version 7.0 is now supported. [Updated: 2022-09-07]
+    - '{% data reusables.release-notes.scim-in-3-6-series %} [Updated: 2023-04-17]'
 
   known_issues:
     - On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
@@ -308,7 +309,6 @@ sections:
     - |
       GitHub Pages builds may time out on instances in AWS that are configured for high availability. [Updated: 2022-11-28]
     - '{% data reusables.release-notes.babeld-max-threads-performance-issue %}'
-    - '{% data reusables.release-notes.scim-custom-mappings-known-issue %}'
     - '{% data reusables.release-notes.git-push-known-issue %}'
 
   deprecations:
diff --git a/data/release-notes/enterprise-server/3-6/1.yml b/data/release-notes/enterprise-server/3-6/1.yml
index 6621e53246..0c4aff837b 100644
--- a/data/release-notes/enterprise-server/3-6/1.yml
+++ b/data/release-notes/enterprise-server/3-6/1.yml
@@ -19,6 +19,7 @@ sections:
     - The enterprise audit log now includes more user-generated events, such as `project.create`. The REST API also returns additional user-generated events, such as `repo.create`. For more information, see "[AUTOTITLE](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/accessing-the-audit-log-for-your-enterprise)" and "[AUTOTITLE](/admin/monitoring-activity-in-your-enterprise/reviewing-audit-logs-for-your-enterprise/using-the-audit-log-api-for-your-enterprise#querying-the-audit-log-rest-api)."
     - In some cases, cache replicas could reject some Git operations on recently updated repositories. For more information about repository caching, see "[AUTOTITLE](/admin/enterprise-management/caching-repositories/about-repository-caching)." 
     - You can now configure the global announcement banner to be dismissable using the REST API. For more information, see "[AUTOTITLE](/admin/user-management/managing-users-in-your-enterprise/customizing-user-messages-for-your-enterprise#creating-a-global-announcement-banner)." 
+    - '{% data reusables.release-notes.scim-in-3-6-series %} [Updated: 2023-04-17]'
   known_issues:
     - On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
     - Custom firewall rules are removed during the upgrade process.
@@ -35,5 +36,4 @@ sections:
     - |
       GitHub Pages builds may time out on instances in AWS that are configured for high availability. [Updated: 2022-11-28]
     - '{% data reusables.release-notes.babeld-max-threads-performance-issue %}'
-    - '{% data reusables.release-notes.scim-custom-mappings-known-issue %}'
     - '{% data reusables.release-notes.git-push-known-issue %}'
\ No newline at end of file
diff --git a/data/release-notes/enterprise-server/3-6/10.yml b/data/release-notes/enterprise-server/3-6/10.yml
index c59b3096fa..32baec0999 100644
--- a/data/release-notes/enterprise-server/3-6/10.yml
+++ b/data/release-notes/enterprise-server/3-6/10.yml
@@ -8,6 +8,8 @@ sections:
     - |
       In the rare case when primary shards for Elasticsearch were located on a replica node, the `ghe-repl-stop` command would fail with `ERROR: Running migrations`.
     - The settings page for discussions in an organization returned a `500` error after a repository owned by the organization was deleted.
+  changes:
+    - '{% data reusables.release-notes.scim-in-3-6-series %} [Updated: 2023-04-17]'
   known_issues:
     - On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
     - Custom firewall rules are removed during the upgrade process.
diff --git a/data/release-notes/enterprise-server/3-6/11.yml b/data/release-notes/enterprise-server/3-6/11.yml
index af5f7e9413..bec31cb3e7 100644
--- a/data/release-notes/enterprise-server/3-6/11.yml
+++ b/data/release-notes/enterprise-server/3-6/11.yml
@@ -29,6 +29,7 @@ sections:
     - When a site administrator configures an outbound web proxy server for GitHub Enterprise Server, the instance now validates top-level domains (TLDs) excluded from the proxy configuration. By default, you can exclude public TLDs that the IANA specifies. Site administrators can specify a list of unregistered TLDs to exclude using `ghe-config`. The `.` prefix is required for any public TLDs. For example, `.example.com` is valid, but `example.com` is invalid. For more information, see "[AUTOTITLE](/admin/configuration/configuring-network-settings/configuring-an-outbound-web-proxy-server)." 
     - To avoid intermittent issues with the success of Git operations on an instance with multiple nodes, GitHub Enterprise Server checks the status of the MySQL container before attempting a SQL query. The timeout duration has also been reduced. 
     - The default path for output from `ghe-saml-mapping-csv -d` is `/data/user/tmp` instead of `/tmp`. For more information, see "[AUTOTITLE](/admin/configuration/configuring-your-enterprise/command-line-utilities#ghe-saml-mapping-csv)."
+    - '{% data reusables.release-notes.scim-in-3-6-series %} [Updated: 2023-04-17]'
   known_issues:
     - |
       On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
diff --git a/data/release-notes/enterprise-server/3-6/2.yml b/data/release-notes/enterprise-server/3-6/2.yml
index 583bd52a90..6bc60605a8 100644
--- a/data/release-notes/enterprise-server/3-6/2.yml
+++ b/data/release-notes/enterprise-server/3-6/2.yml
@@ -28,6 +28,8 @@ sections:
     - When viewing a pull request's diff for a large file with many lines between changes, it was not possible to expand the view to display all of the changes.
     - If branch protections were enabled, the `GITHUB_REF_PROTECTED` environment variable and `github.ref_protected` contexts for GitHub Actions workflow runs were incorrectly set as `false`.
     - Repositories for packages erroneously displayed a "Used by" section.
+  changes:
+    - '{% data reusables.release-notes.scim-in-3-6-series %} [Updated: 2023-04-17]'
   known_issues:
     - On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
     - Custom firewall rules are removed during the upgrade process.
@@ -45,5 +47,4 @@ sections:
     - |
       GitHub Pages builds may time out on instances in AWS that are configured for high availability. [Updated: 2022-11-28]
     - '{% data reusables.release-notes.babeld-max-threads-performance-issue %}'
-    - '{% data reusables.release-notes.scim-custom-mappings-known-issue %}'
     - '{% data reusables.release-notes.git-push-known-issue %}'
\ No newline at end of file
diff --git a/data/release-notes/enterprise-server/3-6/3.yml b/data/release-notes/enterprise-server/3-6/3.yml
index 854da32caa..e35a26f3e8 100644
--- a/data/release-notes/enterprise-server/3-6/3.yml
+++ b/data/release-notes/enterprise-server/3-6/3.yml
@@ -40,6 +40,7 @@ sections:
   changes:
     - |
       To ensure that site administrators can successfully complete an upgrade, the instance will now execute a preflight check to ensure that the virtual machine meets minimum hardware requirements. The check also verifies Elasticsearch's health. You can review the current requirements for CPU, memory, and storage for GitHub Enterprise Server in the "Minimum requirements" section within each article in "[AUTOTITLE](/admin/installation/setting-up-a-github-enterprise-server-instance)."
+    - '{% data reusables.release-notes.scim-in-3-6-series %} [Updated: 2023-04-17]'
   known_issues:
     - On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
     - Custom firewall rules are removed during the upgrade process.
@@ -54,5 +55,4 @@ sections:
     - |
       GitHub Pages builds may time out on instances in AWS that are configured for high availability. [Updated: 2022-11-28]
     - '{% data reusables.release-notes.babeld-max-threads-performance-issue %}'
-    - '{% data reusables.release-notes.scim-custom-mappings-known-issue %}'
     - '{% data reusables.release-notes.git-push-known-issue %}'
\ No newline at end of file
diff --git a/data/release-notes/enterprise-server/3-6/4.yml b/data/release-notes/enterprise-server/3-6/4.yml
index 8aa90adc9b..e12dd4dcd4 100644
--- a/data/release-notes/enterprise-server/3-6/4.yml
+++ b/data/release-notes/enterprise-server/3-6/4.yml
@@ -23,6 +23,7 @@ sections:
     - Zombie processes no longer accumulate in the `gitrpcd` container.
   changes:
     - If a site administrator has not yet configured GitHub Actions for the instance, the UI for setting up code scanning will prompt the user to configure GitHub Actions.
+    - '{% data reusables.release-notes.scim-in-3-6-series %} [Updated: 2023-04-17]'
   known_issues:
     - On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
     - Custom firewall rules are removed during the upgrade process.
@@ -36,5 +37,4 @@ sections:
     - Custom patterns for secret scanning have `.*` as an end delimiter, specifically in the "After secret" field. This delimiter causes inconsistencies in scans for secrets across repositories, and you may notice gaps in a repository's history where no scans completed. Incremental scans may also be impacted. To prevent issues with scans, modify the end of the pattern to remove the `.*` delimiter.
     - '{% data reusables.release-notes.repository-inconsistencies-errors %}'
     - '{% data reusables.release-notes.babeld-max-threads-performance-issue %}'
-    - '{% data reusables.release-notes.scim-custom-mappings-known-issue %}'
     - '{% data reusables.release-notes.git-push-known-issue %}'
\ No newline at end of file
diff --git a/data/release-notes/enterprise-server/3-6/5.yml b/data/release-notes/enterprise-server/3-6/5.yml
index 58784d2b24..f8fae61085 100644
--- a/data/release-notes/enterprise-server/3-6/5.yml
+++ b/data/release-notes/enterprise-server/3-6/5.yml
@@ -26,7 +26,7 @@ sections:
     - To avoid failing domain verification due to the 63-character limit enforced by DNS providers for DNS records, the GitHub-generated `TXT` record to verify domain ownership is now limited to 63 characters.
     - After an enterprise owner enables Dependabot alerts, GitHub Enterprise Server enqueues the synchronization of advisory data to ensure hourly updates from GitHub.com.
     - A user's list of recently accessed repositories no longer includes deleted repositories.
-    - '{% data reusables.release-notes.scim-custom-mappings-supported-change %}'
+    - '{% data reusables.release-notes.scim-in-3-6-series %} [Updated: 2023-04-17]'
   known_issues:
     - On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
     - Custom firewall rules are removed during the upgrade process.
@@ -40,5 +40,4 @@ sections:
     - Custom patterns for secret scanning have `.*` as an end delimiter, specifically in the "After secret" field. This delimiter causes inconsistencies in scans for secrets across repositories, and you may notice gaps in a repository's history where no scans completed. Incremental scans may also be impacted. To prevent issues with scans, modify the end of the pattern to remove the `.*` delimiter.
     - '{% data reusables.release-notes.repository-inconsistencies-errors %}'
     - '{% data reusables.release-notes.babeld-max-threads-performance-issue %}'
-    - '{% data reusables.release-notes.scim-saml-tokens-known-issue %}'
     - '{% data reusables.release-notes.git-push-known-issue %}'
\ No newline at end of file
diff --git a/data/release-notes/enterprise-server/3-6/6.yml b/data/release-notes/enterprise-server/3-6/6.yml
index f7784a03db..5fd7b32949 100644
--- a/data/release-notes/enterprise-server/3-6/6.yml
+++ b/data/release-notes/enterprise-server/3-6/6.yml
@@ -20,6 +20,7 @@ sections:
     - When upgrading an instance with a new root partition, running the `ghe-upgrade` command with the `-t/--target` option ensures the preflight check for the minimum disk storage size is executed against the target partition.
     - The performance of configuration runs started with `ghe-config-apply` has been improved.
     - When exporting account data, backing up a repository, or performing a migration, the link to a repository archive now expires after 1 hour. Previously the archive link expired after 5 minutes.
+    - '{% data reusables.release-notes.scim-in-3-6-series %} [Updated: 2023-04-17]'
   known_issues:
     - On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
     - Custom firewall rules are removed during the upgrade process.
diff --git a/data/release-notes/enterprise-server/3-6/7.yml b/data/release-notes/enterprise-server/3-6/7.yml
index 00e00b4c98..e8489c076e 100644
--- a/data/release-notes/enterprise-server/3-6/7.yml
+++ b/data/release-notes/enterprise-server/3-6/7.yml
@@ -3,6 +3,8 @@ sections:
   security_fixes:
     - |
       {% data reusables.release-notes.2023-01-git-vulnerabilities %}
+  changes:
+    - '{% data reusables.release-notes.scim-in-3-6-series %} [Updated: 2023-04-17]'
   known_issues:
     - On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
     - Custom firewall rules are removed during the upgrade process.
diff --git a/data/release-notes/enterprise-server/3-6/8.yml b/data/release-notes/enterprise-server/3-6/8.yml
index 6b5f354d5e..ce4861f462 100644
--- a/data/release-notes/enterprise-server/3-6/8.yml
+++ b/data/release-notes/enterprise-server/3-6/8.yml
@@ -10,6 +10,7 @@ sections:
     - In some cases, users were unable to convert existing issues to discussions. If an issue is stuck while being converted to a discussion, enterprise owners can review the "Known issues" section below for more information.
   changes:
     - When a timeout occurs during diff generation, such as when a commit displays an error that the diff is taking too long to generate, the `push` webhook event will deliver empty diff information. Previously, the `push` webhook event would fail to be delivered.
+    - '{% data reusables.release-notes.scim-in-3-6-series %} [Updated: 2023-04-17]'
   known_issues:
     - On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
     - Custom firewall rules are removed during the upgrade process.
diff --git a/data/release-notes/enterprise-server/3-6/9.yml b/data/release-notes/enterprise-server/3-6/9.yml
index e8bd949033..81d9a52c34 100644
--- a/data/release-notes/enterprise-server/3-6/9.yml
+++ b/data/release-notes/enterprise-server/3-6/9.yml
@@ -7,6 +7,8 @@ sections:
   bugs:
     - When using a VPC endpoint URL as an AWS S3 URL for GitHub Packages, publication and installation of packages failed.
     - On an instance with a GitHub Advanced Security license, if code scanning had been used while running GitHub Enterprise Server 3.4 or earlier, a subsequent upgrade from 3.5 to 3.6 or 3.7 could fail when attempting to add a unique index to a database table.
+  changes:
+    - '{% data reusables.release-notes.scim-in-3-6-series %} [Updated: 2023-04-17]'
   known_issues:
     - On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
     - Custom firewall rules are removed during the upgrade process.
diff --git a/data/release-notes/enterprise-server/3-7/1.yml b/data/release-notes/enterprise-server/3-7/1.yml
index cc71ab0d1d..3cde0eef5b 100644
--- a/data/release-notes/enterprise-server/3-7/1.yml
+++ b/data/release-notes/enterprise-server/3-7/1.yml
@@ -40,18 +40,3 @@ sections:
     - '{% data reusables.release-notes.new-subdomains-missing-from-management-console %}'
     - '{% data reusables.release-notes.git-push-known-issue %}'
     - '{% data reusables.release-notes.replication-commands-in-maintenance-mode-known-issue %}'
-
-  deprecations:
-    # https://github.com/github/enterprise-releases/issues/3217
-    - |
-      **Upcoming deprecation**: In GitHub Enterprise Server 3.8 and later, unsecure algorithms will be disabled for SSH connections to the administrative shell.
-
-    # https://github.com/github/releases/issues/2395
-    - Commit comments, which are comments that users add directly to a commit outside of a pull request, no longer appear in the pull request timeline. Users could not reply to or resolve these comments. The Timeline events REST API and the GraphQL API's `PullRequest` object also no longer return commit comments.
-
-    # https://github.com/github/releases/issues/2380
-    - Diffing GeoJSON, PSD, and STL files is no longer possible.
-
-    # https://github.com/github/releases/issues/2480
-    - |
-      Package registries on the new GitHub Packages architecture, including Container registry and npm packages, no longer expose data through the GraphQL API. In a coming release, other GitHub Packages registries will migrate to the new architecture, which will deprecate the GraphQL API for those registries as well.
diff --git a/data/release-notes/enterprise-server/3-7/2.yml b/data/release-notes/enterprise-server/3-7/2.yml
index 874665880d..641e03fb82 100644
--- a/data/release-notes/enterprise-server/3-7/2.yml
+++ b/data/release-notes/enterprise-server/3-7/2.yml
@@ -40,18 +40,3 @@ sections:
     - '{% data reusables.release-notes.scim-saml-tokens-known-issue %}'
     - '{% data reusables.release-notes.git-push-known-issue %}'
     - '{% data reusables.release-notes.replication-commands-in-maintenance-mode-known-issue %}'
-
-  deprecations:
-    # https://github.com/github/enterprise-releases/issues/3217
-    - |
-      **Upcoming deprecation**: In GitHub Enterprise Server 3.8 and later, unsecure algorithms will be disabled for SSH connections to the administrative shell.
-
-    # https://github.com/github/releases/issues/2395
-    - Commit comments, which are comments that users add directly to a commit outside of a pull request, no longer appear in the pull request timeline. Users could not reply to or resolve these comments. The Timeline events REST API and the GraphQL API's `PullRequest` object also no longer return commit comments.
-
-    # https://github.com/github/releases/issues/2380
-    - Diffing GeoJSON, PSD, and STL files is no longer possible.
-
-    # https://github.com/github/releases/issues/2480
-    - |
-      Package registries on the new GitHub Packages architecture, including Container registry and npm packages, no longer expose data through the GraphQL API. In a coming release, other GitHub Packages registries will migrate to the new architecture, which will deprecate the GraphQL API for those registries as well.
diff --git a/data/release-notes/enterprise-server/3-7/3.yml b/data/release-notes/enterprise-server/3-7/3.yml
index 634f606342..d95e6ff68f 100644
--- a/data/release-notes/enterprise-server/3-7/3.yml
+++ b/data/release-notes/enterprise-server/3-7/3.yml
@@ -34,18 +34,3 @@ sections:
     - '{% data reusables.release-notes.babeld-max-threads-performance-issue %}'
     - '{% data reusables.release-notes.git-push-known-issue %}'
     - '{% data reusables.release-notes.replication-commands-in-maintenance-mode-known-issue %}'
-
-  deprecations:
-    # https://github.com/github/enterprise-releases/issues/3217
-    - |
-      **Upcoming deprecation**: In GitHub Enterprise Server 3.8 and later, unsecure algorithms will be disabled for SSH connections to the administrative shell.
-
-    # https://github.com/github/releases/issues/2395
-    - Commit comments, which are comments that users add directly to a commit outside of a pull request, no longer appear in the pull request timeline. Users could not reply to or resolve these comments. The Timeline events REST API and the GraphQL API's `PullRequest` object also no longer return commit comments.
-
-    # https://github.com/github/releases/issues/2380
-    - Diffing GeoJSON, PSD, and STL files is no longer possible.
-
-    # https://github.com/github/releases/issues/2480
-    - |
-      Package registries on the new GitHub Packages architecture, including Container registry and npm packages, no longer expose data through the GraphQL API. In a coming release, other GitHub Packages registries will migrate to the new architecture, which will deprecate the GraphQL API for those registries as well.
diff --git a/data/release-notes/enterprise-server/3-7/8.yml b/data/release-notes/enterprise-server/3-7/8.yml
index 9c921dccc3..b1a81ff2dc 100644
--- a/data/release-notes/enterprise-server/3-7/8.yml
+++ b/data/release-notes/enterprise-server/3-7/8.yml
@@ -28,6 +28,8 @@ sections:
     - In some cases on an instance with multiple nodes, GitHub Enterprise Server erroneously stopped writing to replica fileservers, causing repository data to fall out of sync. 
     - GitHub Enterprise Server published distribution metrics that cannot be processed by collectd. The metrics included `pre_receive.lfsintegrity.dist.referenced_oids`, `pre_receive.lfsintegrity.dist.unknown_oids`, and `git.hooks.runtime`. 
     - On an instance with a GitHub Advanced Security license, if code scanning had been used while running GitHub Enterprise Server 3.4 or earlier, a subsequent upgrade from 3.5 to 3.6 or 3.7 could fail when attempting to add a unique index to a database table. 
+    - |
+      An enterprise owner could not enable two-factor authentication (2FA) for an instance if any enterprise owners had not enabled 2FA for their user accounts. [Updated: 2023-04-17]
   changes:
     - When the dependency submission API received a submission with one or more dependencies without a version, the dependency graph will now correctly report this fact. 
     - To avoid a failure during a configuration run on a cluster, validation of `cluster.conf` with the `ghe-cluster-config-check` utility ensures that the `consul-datacenter` field for each nodes matches the top-level `primary-datacenter` field. 
diff --git a/data/release-notes/enterprise-server/3-8/0.yml b/data/release-notes/enterprise-server/3-8/0.yml
index f40e6dc16c..f7ffd08468 100644
--- a/data/release-notes/enterprise-server/3-8/0.yml
+++ b/data/release-notes/enterprise-server/3-8/0.yml
@@ -270,12 +270,6 @@ sections:
           - "[createLinkedBranch](/graphql/reference/mutations#createlinkedbranch)" and "[deleteLinkedBranch](/graphql/reference/mutations#deletelinkedbranch)" in the "Mutations" GraphQL API documentation
           - "[Objects](/graphql/reference/objects#issue)" in the GraphQL API documentation
 
-    - heading: Pull requests
-      notes:
-        # https://github.com/github/releases/issues/2511
-        - |
-          Users with multiple email addresses associated with their accounts can better ensure that Git commits created by squash-merging are associated with the correct email address. When merging the pull request, a drop-down menu will appear, allowing the user to select the email address to use as the commit's author.
-
     - heading: Releases
       notes:
         # https://github.com/github/releases/issues/2584
@@ -439,7 +433,7 @@ sections:
 
     # https://github.com/github/releases/issues/2511
     - |
-      When squash-merging a pull request, the author of the Git commit is displayed before merging. Previously, the commit author was only displayed when merging with a merge commit.
+      Before squash-merging a pull request, the web UI displays the email address of the commit's author. Previously, the commit author was only displayed when merging with a merge commit.
 
   known_issues:
     - On a freshly set up {% data variables.product.prodname_ghe_server %} instance without any users, an attacker could create the first admin user.
diff --git a/data/release-notes/enterprise-server/3-8/1.yml b/data/release-notes/enterprise-server/3-8/1.yml
index c2d83e771e..350528d2fa 100644
--- a/data/release-notes/enterprise-server/3-8/1.yml
+++ b/data/release-notes/enterprise-server/3-8/1.yml
@@ -26,6 +26,8 @@ sections:
     - When users searched for gists, the text in the search field was not visible in some cases because the texts color was identical to the color of the fields background.
     - In some cases on an instance with multiple nodes, GitHub Enterprise Server erroneously stopped writing to replica fileservers, causing repository data to fall out of sync.
     - On an instance with GitHub Connect enabled, if "Users can search GitHub.com" was enabled, users would not see issues in private and internal repositories in search results for GitHub.com.
+    - |
+      An enterprise owner could not enable two-factor authentication (2FA) for an instance if any enterprise owners had not enabled 2FA for their user accounts. [Updated: 2023-04-17]
   changes:
     - When a site administrator configures an outbound web proxy server for GitHub Enterprise Server, the instance now validates top-level domains (TLDs) excluded from the proxy configuration. By default, you can exclude public TLDs that the IANA specifies. Site administrators can specify a list of unregistered TLDs to exclude using `ghe-config`. The `.` prefix is required for any public TLDs. For example, `.example.com` is valid, but `example.com` is invalid. For more information, see "[AUTOTITLE](/admin/configuration/configuring-network-settings/configuring-an-outbound-web-proxy-server)."
     - To avoid intermittent issues with the success of Git operations on an instance with multiple nodes, GitHub Enterprise Server checks the status of the MySQL container before attempting a SQL query. The timeout duration has also been reduced.
diff --git a/data/reusables/files/choose-commit-email.md b/data/reusables/files/choose-commit-email.md
index f7dc9608a9..63b379162f 100644
--- a/data/reusables/files/choose-commit-email.md
+++ b/data/reusables/files/choose-commit-email.md
@@ -1,4 +1,4 @@
-{% ifversion fpt or ghec %}
+{%- ifversion fpt or ghec %}
 1. If you have more than one email address associated with your account on {% data variables.location.product_location %}, click the email address drop-down menu and select the email address to use as the Git author email address. Only verified email addresses appear in this drop-down menu. If you enabled email address privacy, then `<username>@users.noreply.github.com` is the default commit author email address.  For more information, see "[AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-email-preferences/setting-your-commit-email-address)."
 ![Choose commit email addresses](/assets/images/help/repository/choose-commit-email-address.png)
-{% endif %}
+{%- endif %}
diff --git a/data/reusables/release-notes/scim-custom-mappings-known-issue.md b/data/reusables/release-notes/scim-custom-mappings-known-issue.md
index d1850bd328..448ec3f2b7 100644
--- a/data/reusables/release-notes/scim-custom-mappings-known-issue.md
+++ b/data/reusables/release-notes/scim-custom-mappings-known-issue.md
@@ -1 +1 @@
-For participants in the private beta of SCIM for GitHub Enterprise Server, custom mappings for SAML user attributes are not supported in this release. Custom mappings are supported in GitHub Enterprise Server 3.6.5 or 3.7.5 and later. [Updated: 2023-02-27]
\ No newline at end of file
+For participants in the private beta of SCIM for GitHub Enterprise Server, custom mappings for SAML user attributes are not supported in this release. Custom mappings are supported in GitHub Enterprise Server 3.7.5 and later. [Updated: 2023-04-17]
\ No newline at end of file
diff --git a/data/reusables/release-notes/scim-in-3-6-series.md b/data/reusables/release-notes/scim-in-3-6-series.md
new file mode 100644
index 0000000000..510e6bd589
--- /dev/null
+++ b/data/reusables/release-notes/scim-in-3-6-series.md
@@ -0,0 +1 @@
+Releases in the 3.6 series of GitHub Enterprise Server are no longer suitable for testing SCIM. To continue using the private beta of SCIM, upgrade your instance to version 3.7.3 or later. For more information, see "[Upgrading GitHub Enterprise Server](/admin/enterprise-management/updating-the-virtual-machine-and-physical-resources/upgrading-github-enterprise-server)."
\ No newline at end of file