diff --git a/.changeset/brown-eagles-fry.md b/.changeset/brown-eagles-fry.md
deleted file mode 100644
index d2fc287685..0000000000
--- a/.changeset/brown-eagles-fry.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-"@hashicorp/design-system-components": minor
----
-
-`Modal` - added `returnFocusTo` argument to control where the browser focus is returned once the modal is closed
-
-`Flyout` - added `returnFocusTo` argument to control where the browser focus is returned once the flyout is closed
diff --git a/.changeset/curly-apples-share.md b/.changeset/curly-apples-share.md
deleted file mode 100644
index 3b8faaf2dc..0000000000
--- a/.changeset/curly-apples-share.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-"@hashicorp/design-system-components": patch
----
-
-`Dropdown`
-
-- Fixed content being preserved in the DOM when closed
-- Removed the `isOpen` yielded argument
-- Added `@preserveContentInDom` to optionally control rendering of the content
diff --git a/.changeset/eighty-geese-camp.md b/.changeset/eighty-geese-camp.md
deleted file mode 100644
index 96b5b19ffe..0000000000
--- a/.changeset/eighty-geese-camp.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-"@hashicorp/design-system-components": patch
----
-
-`Modal` - Fixed `isDismissDisabled` functionality
-`Flyout` - Removed `isDismissDisabled` from signature (not an actual argument)
diff --git a/.changeset/new-days-enjoy.md b/.changeset/new-days-enjoy.md
deleted file mode 100644
index 20999f3e42..0000000000
--- a/.changeset/new-days-enjoy.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@hashicorp/design-system-components": patch
----
-
-`SuperSelect` - Update the the default state of selected list items to `Foreground / Primary` to match other list items and the `Dropdown`.
diff --git a/.changeset/nice-llamas-tap.md b/.changeset/nice-llamas-tap.md
deleted file mode 100644
index 00ec2dae53..0000000000
--- a/.changeset/nice-llamas-tap.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@hashicorp/design-system-components": patch
----
-
-`SuperSelect::Multiple` - Fixed placeholder style and layout
diff --git a/.changeset/odd-poets-complain.md b/.changeset/odd-poets-complain.md
deleted file mode 100644
index 4ca5898d11..0000000000
--- a/.changeset/odd-poets-complain.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@hashicorp/design-system-components": patch
----
-
-`Dropdown` - Update the color of the text and icons in the selected state checkmark list item to match the styling of the ListItems (`Radio` and `Checkbox`).
diff --git a/.changeset/orange-mice-tease.md b/.changeset/orange-mice-tease.md
deleted file mode 100644
index eb804ca558..0000000000
--- a/.changeset/orange-mice-tease.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@hashicorp/flight-icons": minor
----
-
-Confluent icon added
diff --git a/.changeset/rich-lemons-think.md b/.changeset/rich-lemons-think.md
deleted file mode 100644
index 23fcd61691..0000000000
--- a/.changeset/rich-lemons-think.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@hashicorp/design-system-components": patch
----
-
-`CodeBlock` - Decoupled the display of line numbers from `highlightLines`
diff --git a/.changeset/seven-taxis-develop.md b/.changeset/seven-taxis-develop.md
deleted file mode 100644
index 5681fb84b7..0000000000
--- a/.changeset/seven-taxis-develop.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@hashicorp/design-system-components": patch
----
-
-`Dropdown` - Fixed dropdown content not being preserved when interacted with
diff --git a/.changeset/spicy-grapes-happen.md b/.changeset/spicy-grapes-happen.md
deleted file mode 100644
index f34200bb72..0000000000
--- a/.changeset/spicy-grapes-happen.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@hashicorp/design-system-components": minor
----
-
-`CodeBlock` - Added `lineNumberStart` option to set custom starting number for line numbering`
diff --git a/.changeset/spotty-boxes-do.md b/.changeset/spotty-boxes-do.md
deleted file mode 100644
index fe50aed9ef..0000000000
--- a/.changeset/spotty-boxes-do.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@hashicorp/design-system-components": minor
----
-
-`SuperSelect::Multiple` - Added `@resultCountMessage` argument to enable override
diff --git a/.changeset/spotty-experts-repair.md b/.changeset/spotty-experts-repair.md
deleted file mode 100644
index 13f59ea677..0000000000
--- a/.changeset/spotty-experts-repair.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@hashicorp/design-system-components": patch
----
-
-Upgraded `ember-style-modifier` to `4.4.0`
diff --git a/.changeset/young-buckets-glow.md b/.changeset/young-buckets-glow.md
deleted file mode 100644
index d2fd4e8977..0000000000
--- a/.changeset/young-buckets-glow.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@hashicorp/flight-icons": minor
----
-
-Updated `okta` and `okta-color` to reflect updated branding.
diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index e30fb075b2..a1623c9dc7 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -1,5 +1,90 @@
 # @hashicorp/design-system-components
 
+## 4.13.0
+
+[4.13.0 documentation](https://hds-website-4-13-0.vercel.app/)
+
+### Minor Changes
+
+`Modal` - Added `returnFocusTo` argument to control where the browser focus is returned once the modal is closed
+
+`Flyout` - Added `returnFocusTo` argument to control where the browser focus is returned once the flyout is closed
+
+<small class="doc-whats-new-changelog-metadata">[#2497](https://github.com/hashicorp/design-system/pull/2497)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
+`CodeBlock` - Added `lineNumberStart` option to set custom starting number for line numbering
+
+<small class="doc-whats-new-changelog-metadata">[#2467](https://github.com/hashicorp/design-system/pull/2467)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
+`SuperSelect::Multiple` - Added `@resultCountMessage` argument to enable override
+
+<small class="doc-whats-new-changelog-metadata">[#2502](https://github.com/hashicorp/design-system/pull/2502)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
+### Patch Changes
+
+`Dropdown`
+
+- Fixed content being preserved in the DOM when closed
+- Removed the `isOpen` yielded argument
+- Added `@preserveContentInDom` to optionally control rendering of the content
+
+<small class="doc-whats-new-changelog-metadata">[#2490](https://github.com/hashicorp/design-system/pull/2490)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
+`Modal` - Fixed `isDismissDisabled` functionality
+`Flyout` - Removed `isDismissDisabled` from signature (not an actual argument)
+
+<small class="doc-whats-new-changelog-metadata">[#2485](https://github.com/hashicorp/design-system/pull/2485)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
+`SuperSelect` - Update the the default state of selected list items to `Foreground / Primary` to match other list items and the `Dropdown`.
+
+<small class="doc-whats-new-changelog-metadata">[#2479](https://github.com/hashicorp/design-system/pull/2479)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
+`SuperSelect::Multiple` - Fixed placeholder style and layout
+
+<small class="doc-whats-new-changelog-metadata">[#2473](https://github.com/hashicorp/design-system/pull/2473)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
+`Dropdown` - Update the color of the text and icons in the selected state checkmark list item to match the styling of the ListItems (`Radio` and `Checkbox`).
+
+<small class="doc-whats-new-changelog-metadata">[#2464](https://github.com/hashicorp/design-system/pull/2464)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
+`CodeBlock` - Decoupled the display of line numbers from `highlightLines`
+
+<small class="doc-whats-new-changelog-metadata">[#2474](https://github.com/hashicorp/design-system/pull/2474)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
+`Dropdown` - Fixed dropdown content not being preserved when interacted with
+
+<small class="doc-whats-new-changelog-metadata">[#2506](https://github.com/hashicorp/design-system/pull/2506)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
+Upgraded `ember-style-modifier` to `4.4.0`
+
+<small class="doc-whats-new-changelog-metadata">[#2482](https://github.com/hashicorp/design-system/pull/2482)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
+**🔄 Updated dependencies:**
+
+- @hashicorp/flight-icons@3.7.0
+
 ## 4.12.0
 
 [4.12.0 documentation](https://hds-website-4-12-0.vercel.app/)
diff --git a/packages/components/package.json b/packages/components/package.json
index f14d5b62dc..5818d9478f 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hashicorp/design-system-components",
-  "version": "4.12.0",
+  "version": "4.13.0",
   "description": "Helios Design System Components",
   "keywords": [
     "hashicorp",
@@ -41,7 +41,7 @@
     "@embroider/addon-shim": "^1.8.7",
     "@floating-ui/dom": "^1.6.3",
     "@hashicorp/design-system-tokens": "^2.2.1",
-    "@hashicorp/flight-icons": "^3.6.0",
+    "@hashicorp/flight-icons": "^3.7.0",
     "decorator-transforms": "^1.1.0",
     "ember-a11y-refocus": "^4.1.3",
     "ember-cli-sass": "^11.0.1",
diff --git a/packages/ember-flight-icons/package.json b/packages/ember-flight-icons/package.json
index 592304963d..af93d426ab 100644
--- a/packages/ember-flight-icons/package.json
+++ b/packages/ember-flight-icons/package.json
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@embroider/addon-shim": "^1.8.7",
-    "@hashicorp/flight-icons": "^3.6.0",
+    "@hashicorp/flight-icons": "^3.7.0",
     "decorator-transforms": "^1.1.0",
     "ember-get-config": "^2.1.1"
   },
diff --git a/packages/flight-icons/CHANGELOG.md b/packages/flight-icons/CHANGELOG.md
index 20c6694621..503941bf08 100644
--- a/packages/flight-icons/CHANGELOG.md
+++ b/packages/flight-icons/CHANGELOG.md
@@ -1,5 +1,21 @@
 # @hashicorp/flight-icons
 
+## 3.7.0
+
+### Minor Changes
+
+Confluent icon added
+
+<small class="doc-whats-new-changelog-metadata">[#2505](https://github.com/hashicorp/design-system/pull/2505)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
+Updated `okta` and `okta-color` to reflect updated branding.
+
+<small class="doc-whats-new-changelog-metadata">[#2489](https://github.com/hashicorp/design-system/pull/2489)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
 ## 3.6.0
 
 ### Minor Changes
diff --git a/packages/flight-icons/package.json b/packages/flight-icons/package.json
index dd58f7ab19..e015f6b7a0 100644
--- a/packages/flight-icons/package.json
+++ b/packages/flight-icons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hashicorp/flight-icons",
-  "version": "3.6.0",
+  "version": "3.7.0",
   "description": "Flight: HashiCorp SVG icon set",
   "keywords": [
     "hashicorp",
diff --git a/website/docs/components/accordion/index.md b/website/docs/components/accordion/index.md
index 5c60192c79..51c5b7d4c3 100644
--- a/website/docs/components/accordion/index.md
+++ b/website/docs/components/accordion/index.md
@@ -10,8 +10,6 @@ previewImage: assets/illustrations/components/accordion.jpg
 navigation:
   hidden: false
   keywords: ['toggle', 'disclosure', 'details', 'reveal', 'list', 'summary', 'expand', 'collapse']
-status:
-  updated: 4.10.0
 ---
 
 <section data-tab="Guidelines">
diff --git a/website/docs/components/alert/index.md b/website/docs/components/alert/index.md
index 3b9beed83c..ef7d13e637 100644
--- a/website/docs/components/alert/index.md
+++ b/website/docs/components/alert/index.md
@@ -9,8 +9,6 @@ related: ['components/modal', 'components/toast']
 previewImage: assets/illustrations/components/alert.jpg
 navigation:
   keywords: ['alert', 'toast', 'notification', 'banner', 'message']
-status:
-  updated: 4.10.0
 ---
 
 <section data-tab="Guidelines">
diff --git a/website/docs/components/app-header/index.md b/website/docs/components/app-header/index.md
index c873c69912..47b5ed3e6a 100644
--- a/website/docs/components/app-header/index.md
+++ b/website/docs/components/app-header/index.md
@@ -9,8 +9,6 @@ related: ['components/side-nav', 'components/app-footer', 'layouts/app-frame']
 previewImage: assets/illustrations/components/app-header.jpg
 navigation:
   keywords: ['navigation', 'header', 'navbar', 'menubar', 'topbar']
-status:
-  updated: 4.10.0
 ---
 
 <section data-tab="Guidelines">
diff --git a/website/docs/components/application-state/index.md b/website/docs/components/application-state/index.md
index 7b3f75d56a..7f97720d0f 100644
--- a/website/docs/components/application-state/index.md
+++ b/website/docs/components/application-state/index.md
@@ -8,8 +8,6 @@ links:
 previewImage: assets/illustrations/components/application-state.jpg
 navigation:
   keywords: ['empty state', 'error state', 'message']
-status:
-  updated: 4.10.0
 ---
 
 <section data-tab="Guidelines">
diff --git a/website/docs/components/breadcrumb/index.md b/website/docs/components/breadcrumb/index.md
index 02f89d6a57..4b1f29ef64 100644
--- a/website/docs/components/breadcrumb/index.md
+++ b/website/docs/components/breadcrumb/index.md
@@ -9,8 +9,6 @@ related: ['components/side-nav', 'components/tabs']
 previewImage: assets/illustrations/components/breadcrumb.jpg
 navigation:
   keywords: ['navigation', 'crumb', 'path']
-status:
-  updated: 4.10.0
 ---
 
 <section data-tab="Guidelines">
diff --git a/website/docs/components/card/index.md b/website/docs/components/card/index.md
index f53b841b87..ca1923716a 100644
--- a/website/docs/components/card/index.md
+++ b/website/docs/components/card/index.md
@@ -8,8 +8,6 @@ links:
 previewImage: assets/illustrations/components/card.jpg
 navigation:
   keywords: ['tile', 'container', 'box']
-status:
-  updated: 4.10.0
 ---
 
 <section data-tab="Guidelines">
diff --git a/website/docs/components/code-block/index.md b/website/docs/components/code-block/index.md
index 070fa8d9f8..3e0994c630 100644
--- a/website/docs/components/code-block/index.md
+++ b/website/docs/components/code-block/index.md
@@ -10,7 +10,7 @@ previewImage: assets/illustrations/components/code-block.jpg
 navigation:
   keywords: ['code', 'snippet', 'copy', 'text', 'editor', 'language', 'example', 'syntax', 'highlight']
 status:
-  updated: 4.12.0
+  updated: 4.13.0
 ---
 
 <section data-tab="Guidelines">
@@ -33,6 +33,7 @@ status:
 </section>
 
 <section data-tab="Version history">
+  @include "partials/version-history/4.13.0.md"
   @include "partials/version-history/4.12.0.md"
   @include "partials/version-history/4.10.0.md"
 </section>
diff --git a/website/docs/components/code-block/partials/version-history/4.13.0.md b/website/docs/components/code-block/partials/version-history/4.13.0.md
new file mode 100644
index 0000000000..9e06a2d273
--- /dev/null
+++ b/website/docs/components/code-block/partials/version-history/4.13.0.md
@@ -0,0 +1,7 @@
+## 4.13.0
+
+### Updated
+
+Added `lineNumberStart` option to set custom starting number for line numbering
+
+Decoupled the display of line numbers from `highlightLines`
diff --git a/website/docs/components/dropdown/index.md b/website/docs/components/dropdown/index.md
index 71a22386d6..2ffd1aa6fa 100644
--- a/website/docs/components/dropdown/index.md
+++ b/website/docs/components/dropdown/index.md
@@ -10,7 +10,7 @@ previewImage: assets/illustrations/components/dropdown.jpg
 navigation:
   keywords: ['select', 'menu', 'action menu', 'list']
 status:
-  updated: 4.12.0
+  updated: 4.13.0
 ---
 
 <section data-tab="Guidelines">
@@ -33,6 +33,7 @@ status:
 </section>
 
 <section data-tab="Version history">
+  @include "partials/version-history/4.13.0.md"
   @include "partials/version-history/4.12.0.md"
   @include "partials/version-history/4.10.0.md"
 </section>
diff --git a/website/docs/components/dropdown/partials/version-history/4.13.0.md b/website/docs/components/dropdown/partials/version-history/4.13.0.md
new file mode 100644
index 0000000000..7a1b10825e
--- /dev/null
+++ b/website/docs/components/dropdown/partials/version-history/4.13.0.md
@@ -0,0 +1,13 @@
+## 4.13.0
+
+### Updated
+
+Fixed content being preserved in the DOM when closed
+
+Removed the `isOpen` yielded argument
+
+Added `@preserveContentInDom` to optionally control rendering of the content
+
+Fixed dropdown content not being preserved when interacted with
+
+Updated the color of the text and icons in the selected state checkmark list item to match the styling of the ListItems (`Radio` and `Checkbox`)
diff --git a/website/docs/components/flyout/index.md b/website/docs/components/flyout/index.md
index 18e644bffa..28bbe9cd0b 100644
--- a/website/docs/components/flyout/index.md
+++ b/website/docs/components/flyout/index.md
@@ -10,7 +10,7 @@ previewImage: assets/illustrations/components/flyout.jpg
 navigation:
   keywords: ['drawer', 'panel', 'side', 'modal']
 status:
-  updated: 4.12.0
+  updated: 4.13.0
 ---
 
 <section data-tab="Guidelines">
@@ -32,6 +32,7 @@ status:
 </section>
 
 <section data-tab="Version history">
+  @include "partials/version-history/4.13.0.md"
   @include "partials/version-history/4.12.0.md"
   @include "partials/version-history/4.10.0.md"
   @include "partials/version-history/4.7.0.md"
diff --git a/website/docs/components/flyout/partials/version-history/4.13.0.md b/website/docs/components/flyout/partials/version-history/4.13.0.md
new file mode 100644
index 0000000000..8cf673f9a8
--- /dev/null
+++ b/website/docs/components/flyout/partials/version-history/4.13.0.md
@@ -0,0 +1,7 @@
+## 4.13.0
+
+### Updated
+
+Added `returnFocusTo` argument to control where the browser focus is returned once the flyout is closed
+
+Removed `isDismissDisabled` from signature (not an actual argument)
diff --git a/website/docs/components/form/super-select/index.md b/website/docs/components/form/super-select/index.md
index 3264e7aa53..f860a514b2 100644
--- a/website/docs/components/form/super-select/index.md
+++ b/website/docs/components/form/super-select/index.md
@@ -10,7 +10,7 @@ previewImage: assets/illustrations/components/form/super-select.jpg
 navigation:
   keywords: ['dropdown', 'powerselect']
 status:
-  updated: 4.10.0
+  updated: 4.13.0
 ---
 
 <section data-tab="Guidelines">
@@ -33,5 +33,6 @@ status:
 </section>
 
 <section data-tab="Version history">
+  @include "partials/version-history/4.13.0.md"
   @include "partials/version-history/4.10.0.md"
 </section>
diff --git a/website/docs/components/form/super-select/partials/version-history/4.13.0.md b/website/docs/components/form/super-select/partials/version-history/4.13.0.md
new file mode 100644
index 0000000000..97ff9fb519
--- /dev/null
+++ b/website/docs/components/form/super-select/partials/version-history/4.13.0.md
@@ -0,0 +1,9 @@
+## 4.13.0
+
+### Updated
+
+Update the the default state of selected list items to Foreground / Primary to match other list items and the Dropdown
+
+Fixed placeholder style and layout in `SuperSelect::Multiple`
+
+Added `@resultCountMessage` argument to enable override in `SuperSelect::Multiple`
diff --git a/website/docs/components/modal/index.md b/website/docs/components/modal/index.md
index 9dd20419aa..66bdd0bd0c 100644
--- a/website/docs/components/modal/index.md
+++ b/website/docs/components/modal/index.md
@@ -10,7 +10,7 @@ previewImage: assets/illustrations/components/modal.jpg
 navigation:
   keywords: ['flyout', 'popover', 'popup', 'dialog']
 status:
-  updated: 4.12.0
+  updated: 4.13.0
 ---
 
 <section data-tab="Guidelines">
@@ -32,6 +32,7 @@ status:
 </section>
 
 <section data-tab="Version history">
+  @include "partials/version-history/4.13.0.md"
   @include "partials/version-history/4.12.0.md"
   @include "partials/version-history/4.10.0.md"
   @include "partials/version-history/4.7.0.md"
diff --git a/website/docs/components/modal/partials/version-history/4.13.0.md b/website/docs/components/modal/partials/version-history/4.13.0.md
new file mode 100644
index 0000000000..986867ecd0
--- /dev/null
+++ b/website/docs/components/modal/partials/version-history/4.13.0.md
@@ -0,0 +1,7 @@
+## 4.13.0
+
+### Updated
+
+Added `returnFocusTo` argument to control where the browser focus is returned once the modal is closed
+
+Fixed `isDismissDisabled` functionality
diff --git a/website/docs/components/pagination/index.md b/website/docs/components/pagination/index.md
index a45baaf634..5a128709eb 100644
--- a/website/docs/components/pagination/index.md
+++ b/website/docs/components/pagination/index.md
@@ -7,8 +7,6 @@ links:
   github: https://github.com/hashicorp/design-system/tree/main/packages/components/src/components/hds/pagination
 related: ['components/table','patterns/filter-patterns', 'patterns/table-multi-select']
 previewImage: assets/illustrations/components/pagination.jpg
-status:
-  updated: 4.10.0
 ---
 
 <section data-tab="Guidelines">
diff --git a/website/docs/components/side-nav/index.md b/website/docs/components/side-nav/index.md
index 7d7272a598..234d124650 100644
--- a/website/docs/components/side-nav/index.md
+++ b/website/docs/components/side-nav/index.md
@@ -10,8 +10,6 @@ previewImage: assets/illustrations/components/side-nav.jpg
 navigation:
   hidden: false
   keywords: ['navigation', 'side navigation', 'sidenav', 'sidebar']
-status:
-  updated: 4.10.0
 ---
 
 <section data-tab="Guidelines">
diff --git a/website/docs/layouts/app-frame/index.md b/website/docs/layouts/app-frame/index.md
index c6c5c12c7e..fbe21b0858 100644
--- a/website/docs/layouts/app-frame/index.md
+++ b/website/docs/layouts/app-frame/index.md
@@ -7,8 +7,6 @@ links:
 previewImage: assets/illustrations/layouts/app-frame.jpg
 navigation:
   keywords: ['layout', 'application', 'frame', 'header', 'sidebar', 'sidenav', 'footer', 'modal']
-status:
-  updated: 4.10.0
 ---
 
 <section data-tab="Code">
diff --git a/website/docs/whats-new/release-notes/partials/components.md b/website/docs/whats-new/release-notes/partials/components.md
index 7acb618d44..d5da1f7747 100644
--- a/website/docs/whats-new/release-notes/partials/components.md
+++ b/website/docs/whats-new/release-notes/partials/components.md
@@ -12,6 +12,89 @@
   </a>
 </p>
 
+## 4.13.0
+
+**Minor changes**
+
+`Modal` - added `returnFocusTo` argument to control where the browser focus is returned once the modal is closed
+
+`Flyout` - added `returnFocusTo` argument to control where the browser focus is returned once the flyout is closed
+
+<small class="doc-whats-new-changelog-metadata">[#2497](https://github.com/hashicorp/design-system/pull/2497)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
+`CodeBlock` - Added `lineNumberStart` option to set custom starting number for line numbering`
+
+<small class="doc-whats-new-changelog-metadata">[#2467](https://github.com/hashicorp/design-system/pull/2467)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
+`SuperSelect::Multiple` - Added `@resultCountMessage` argument to enable override
+
+<small class="doc-whats-new-changelog-metadata">[#2502](https://github.com/hashicorp/design-system/pull/2502)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
+**Patch changes**
+
+`Dropdown`
+
+- Fixed content being preserved in the DOM when closed
+- Removed the `isOpen` yielded argument
+- Added `@preserveContentInDom` to optionally control rendering of the content
+
+<small class="doc-whats-new-changelog-metadata">[#2490](https://github.com/hashicorp/design-system/pull/2490)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
+`Modal` - Fixed `isDismissDisabled` functionality
+`Flyout` - Removed `isDismissDisabled` from signature (not an actual argument)
+
+<small class="doc-whats-new-changelog-metadata">[#2485](https://github.com/hashicorp/design-system/pull/2485)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
+`SuperSelect` - Update the the default state of selected list items to `Foreground / Primary` to match other list items and the `Dropdown`.
+
+<small class="doc-whats-new-changelog-metadata">[#2479](https://github.com/hashicorp/design-system/pull/2479)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
+`SuperSelect::Multiple` - Fixed placeholder style and layout
+
+<small class="doc-whats-new-changelog-metadata">[#2473](https://github.com/hashicorp/design-system/pull/2473)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
+`Dropdown` - Update the color of the text and icons in the selected state checkmark list item to match the styling of the ListItems (`Radio` and `Checkbox`).
+
+<small class="doc-whats-new-changelog-metadata">[#2464](https://github.com/hashicorp/design-system/pull/2464)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
+`CodeBlock` - Decoupled the display of line numbers from `highlightLines`
+
+<small class="doc-whats-new-changelog-metadata">[#2474](https://github.com/hashicorp/design-system/pull/2474)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
+`Dropdown` - Fixed dropdown content not being preserved when interacted with
+
+<small class="doc-whats-new-changelog-metadata">[#2506](https://github.com/hashicorp/design-system/pull/2506)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
+Upgraded `ember-style-modifier` to `4.4.0`
+
+<small class="doc-whats-new-changelog-metadata">[#2482](https://github.com/hashicorp/design-system/pull/2482)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
+**🔄 Updated dependencies:**
+
+- @hashicorp/flight-icons@3.7.0
+
 ## 4.12.0
 
 [4.12.0 documentation](https://hds-website-4-12-0.vercel.app/)
@@ -1178,19 +1261,6 @@ Removed `ember-deep-tracked` dependency that was not used
 - @hashicorp/ember-flight-icons@5.0.0
 - @hashicorp/design-system-tokens@2.0.0
 
-## 3.6.0
-
-[3.6.0 documentation](https://hds-website-3-6-0.vercel.app/)
-
-**Minor changes**
-
-_Since this is an update brand colors and product icons, we consider this a `minor` version release_
-
-**🔄 Updated dependencies:**
-
-- @hashicorp/design-system-tokens@1.11.0
-- @hashicorp/ember-flight-icons@4.1.0
-
 
 ---
 
diff --git a/website/docs/whats-new/release-notes/partials/flight-icons.md b/website/docs/whats-new/release-notes/partials/flight-icons.md
index bfee9c6018..352ce323c7 100644
--- a/website/docs/whats-new/release-notes/partials/flight-icons.md
+++ b/website/docs/whats-new/release-notes/partials/flight-icons.md
@@ -12,6 +12,22 @@
   </a>
 </p>
 
+## 3.7.0
+
+**Minor changes**
+
+Confluent icon added
+
+<small class="doc-whats-new-changelog-metadata">[#2505](https://github.com/hashicorp/design-system/pull/2505)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
+Updated `okta` and `okta-color` to reflect updated branding.
+
+<small class="doc-whats-new-changelog-metadata">[#2489](https://github.com/hashicorp/design-system/pull/2489)</small>
+
+<div class="doc-whats-new-changelog-separator"></div>
+
 ## 3.6.0
 
 **Minor changes**
@@ -228,14 +244,6 @@ Added `robot` icon (for Service Principals)
 
 <small class="doc-whats-new-changelog-metadata">[#1428](https://github.com/hashicorp/design-system/pull/1428)</small>
 
-## 2.13.1
-
-**Patch changes**
-
-Fix color for `connection-gateway` icon
-
-<small class="doc-whats-new-changelog-metadata">[#1420](https://github.com/hashicorp/design-system/pull/1420)</small>
-
 
 ---
 
diff --git a/yarn.lock b/yarn.lock
index c2b9226a54..b7b2744a01 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4271,7 +4271,7 @@ __metadata:
     "@glint/environment-ember-loose": "npm:^1.4.0"
     "@glint/template": "npm:^1.4.0"
     "@hashicorp/design-system-tokens": "npm:^2.2.1"
-    "@hashicorp/flight-icons": "npm:^3.6.0"
+    "@hashicorp/flight-icons": "npm:^3.7.0"
     "@rollup/plugin-babel": "npm:^6.0.4"
     "@tsconfig/ember": "npm:^3.0.8"
     "@types/ember-qunit": "npm:^6.1.1"
@@ -4375,7 +4375,7 @@ __metadata:
     "@glint/environment-ember-loose": "npm:^1.2.1"
     "@glint/environment-ember-template-imports": "npm:^1.2.1"
     "@glint/template": "npm:^1.2.1"
-    "@hashicorp/flight-icons": "npm:^3.6.0"
+    "@hashicorp/flight-icons": "npm:^3.7.0"
     "@rollup/plugin-babel": "npm:^6.0.4"
     "@tsconfig/ember": "npm:^3.0.6"
     "@typescript-eslint/eslint-plugin": "npm:^8.5.0"
@@ -4400,7 +4400,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@hashicorp/flight-icons@npm:^3.6.0, @hashicorp/flight-icons@workspace:^, @hashicorp/flight-icons@workspace:packages/flight-icons":
+"@hashicorp/flight-icons@npm:^3.7.0, @hashicorp/flight-icons@workspace:^, @hashicorp/flight-icons@workspace:packages/flight-icons":
   version: 0.0.0-use.local
   resolution: "@hashicorp/flight-icons@workspace:packages/flight-icons"
   dependencies: