diff --git a/.changeset/odd-dots-laugh.md b/.changeset/odd-dots-laugh.md
deleted file mode 100644
index 8667f57324..0000000000
--- a/.changeset/odd-dots-laugh.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@primer/view-components': minor
----
-
-Support leading and trailing icons for Links
diff --git a/.changeset/seven-experts-return.md b/.changeset/seven-experts-return.md
deleted file mode 100644
index 27c4dc91c7..0000000000
--- a/.changeset/seven-experts-return.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@primer/view-components': patch
----
-
-Ensure `full_width:` option is respected by the auto_complete input
diff --git a/.changeset/two-badgers-suffer.md b/.changeset/two-badgers-suffer.md
deleted file mode 100644
index 6e00104a91..0000000000
--- a/.changeset/two-badgers-suffer.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-'@primer/view-components': patch
----
-
-Prevent hidden inputs from taking up space on the page
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17d796414f..0750c355b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # CHANGELOG
 
+## 0.36.0
+
+### Minor Changes
+
+- [#3041](https://github.com/primer/view_components/pull/3041) [`14dd0d3`](https://github.com/primer/view_components/commit/14dd0d3c4cbf2e6ce46f4d80ed94ccc06374299e) Thanks [@HDinger](https://github.com/HDinger)! - Support leading and trailing icons for Links
+
+### Patch Changes
+
+- [#3205](https://github.com/primer/view_components/pull/3205) [`79ca4f9`](https://github.com/primer/view_components/commit/79ca4f91a67ac79623584a89d4afe5931ae0bbd6) Thanks [@camertron](https://github.com/camertron)! - Ensure `full_width:` option is respected by the auto_complete input
+
+- [#3202](https://github.com/primer/view_components/pull/3202) [`a574b0e`](https://github.com/primer/view_components/commit/a574b0e2becdc057c23aa6e26230851f90976605) Thanks [@camertron](https://github.com/camertron)! - Prevent hidden inputs from taking up space on the page
+
 ## 0.35.2
 
 ### Patch Changes
diff --git a/Gemfile.lock b/Gemfile.lock
index a76455775a..cd5fbfc160 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    primer_view_components (0.35.2)
+    primer_view_components (0.36.0)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
       octicons (>= 18.0.0)
diff --git a/demo/Gemfile.lock b/demo/Gemfile.lock
index e6a923f767..b13f66f8ac 100644
--- a/demo/Gemfile.lock
+++ b/demo/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    primer_view_components (0.35.2)
+    primer_view_components (0.36.0)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
       octicons (>= 18.0.0)
diff --git a/lib/primer/view_components/version.rb b/lib/primer/view_components/version.rb
index f32780fe65..2e9b07cb42 100644
--- a/lib/primer/view_components/version.rb
+++ b/lib/primer/view_components/version.rb
@@ -5,8 +5,8 @@ module Primer
   module ViewComponents
     module VERSION
       MAJOR = 0
-      MINOR = 35
-      PATCH = 2
+      MINOR = 36
+      PATCH = 0
 
       STRING = [MAJOR, MINOR, PATCH].join(".")
     end
diff --git a/package-lock.json b/package-lock.json
index 2cc347d9d9..94c5d30c2d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@primer/view-components",
-  "version": "0.35.2",
+  "version": "0.36.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@primer/view-components",
-      "version": "0.35.2",
+      "version": "0.36.0",
       "license": "MIT",
       "dependencies": {
         "@github/auto-check-element": "^5.2.0",
diff --git a/package.json b/package.json
index 6f9492458d..6f6e085c8f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@primer/view-components",
-  "version": "0.35.2",
+  "version": "0.36.0",
   "description": "ViewComponents for the Primer Design System",
   "main": "app/assets/javascripts/primer_view_components.js",
   "module": "app/components/primer/primer.js",
diff --git a/static/classes.json b/static/classes.json
index bcd8c93cc9..4e46c9161d 100644
--- a/static/classes.json
+++ b/static/classes.json
@@ -404,6 +404,9 @@
   "Link--underline": [
     "Primer::Beta::Link"
   ],
+  "Link-content": [
+    "Primer::Beta::Link"
+  ],
   "Overlay": [
     "Primer::Alpha::Dialog",
     "Primer::Alpha::Overlay"