diff --git a/.gemini/skills/android-maps-compose/SKILL.md b/.gemini/skills/android-maps-compose/SKILL.md
index c78024a9..d7096a68 100644
--- a/.gemini/skills/android-maps-compose/SKILL.md
+++ b/.gemini/skills/android-maps-compose/SKILL.md
@@ -15,13 +15,13 @@ Verify the latest versions if possible, but use these as a baseline:
 ```kotlin
 dependencies {
     // Google Maps Compose library
-    implementation("com.google.maps.android:maps-compose:8.3.1") // x-release-please-version
+    implementation("com.google.maps.android:maps-compose:8.4.0") // x-release-please-version
 
     // Optional: Maps Compose Utilities (for clustering, etc.)
-    // implementation("com.google.maps.android:maps-compose-utils:8.3.1") // x-release-please-version
+    // implementation("com.google.maps.android:maps-compose-utils:8.4.0") // x-release-please-version
 
     // Optional: Maps Compose Widgets (for UI components)
-    // implementation("com.google.maps.android:maps-compose-widgets:8.3.1") // x-release-please-version
+    // implementation("com.google.maps.android:maps-compose-widgets:8.4.0") // x-release-please-version
 }
 ```
 
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 4aa808c4..3f8f1831 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-    ".": "8.3.1"
+    ".": "8.4.0"
 }
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0647011..1a48b4e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## [8.4.0](https://github.com/googlemaps/android-maps-compose/compare/v8.3.1...v8.4.0) (2026-07-10)
+
+
+### Features
+
+* add rotation support to cluster item API ([#943](https://github.com/googlemaps/android-maps-compose/issues/943)) ([3430231](https://github.com/googlemaps/android-maps-compose/commit/343023171d583a52426cc53513e264e8ccbfa788))
+
+
+### Bug Fixes
+
+* keep ComposeView attached while info window is shown for compose-ui 1.10+ compat ([#931](https://github.com/googlemaps/android-maps-compose/issues/931)) ([995ff38](https://github.com/googlemaps/android-maps-compose/commit/995ff3822e98df2707e9e5f2b43339d6cee27517))
+* prevent ComposeUiClusterRenderer crash on fast back gesture with compose-ui 1.10+ ([#930](https://github.com/googlemaps/android-maps-compose/issues/930)) ([3882afa](https://github.com/googlemaps/android-maps-compose/commit/3882afa582fda77b08c50587b4192f6205309cf0))
+
 ## [8.3.1](https://github.com/googlemaps/android-maps-compose/compare/v8.3.0...v8.3.1) (2026-07-07)
 
 
diff --git a/README.md b/README.md
index 5355c158..75f7f8ed 100644
--- a/README.md
+++ b/README.md
@@ -29,12 +29,12 @@ You no longer need to specify the Maps SDK for Android or its Utility Library as
 
 ```groovy
 dependencies {
-    implementation 'com.google.maps.android:maps-compose:8.3.1' // {x-release-please-version}
+    implementation 'com.google.maps.android:maps-compose:8.4.0' // {x-release-please-version}
     // Optionally, you can include the Compose utils library for Clustering,
     // Street View metadata checks, etc.
-    implementation 'com.google.maps.android:maps-compose-utils:8.3.1' // {x-release-please-version}
+    implementation 'com.google.maps.android:maps-compose-utils:8.4.0' // {x-release-please-version}
     // Optionally, you can include the widgets library for ScaleBar, etc.
-    implementation 'com.google.maps.android:maps-compose-widgets:8.3.1' // {x-release-please-version}
+    implementation 'com.google.maps.android:maps-compose-widgets:8.4.0' // {x-release-please-version}
 }
 ```
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 3e306372..8cf92c3d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -49,7 +49,7 @@ val projectArtifactId by extra { project: Project ->
 allprojects {
     group = "com.google.maps.android"
     // {x-release-please-start-version}
-    version = "8.3.1"
+    version = "8.4.0"
     // {x-release-please-end}
 }
 
diff --git a/llm-integration-prompt.md b/llm-integration-prompt.md
index 514c12ae..d4031b68 100644
--- a/llm-integration-prompt.md
+++ b/llm-integration-prompt.md
@@ -14,7 +14,7 @@ Add the following to your `gradle/libs.versions.toml` file:
 
 ```toml
 [versions]
-mapsCompose = "8.3.1" # x-release-please-version
+mapsCompose = "8.4.0" # x-release-please-version
 
 [libraries]
 maps-compose = { group = "com.google.maps.android", name = "maps-compose", version.ref = "mapsCompose" }
@@ -44,13 +44,13 @@ If you are not using version catalogs, add the dependencies directly to your app
 ```kotlin
 dependencies {
     // Google Maps Compose library
-    implementation("com.google.maps.android:maps-compose:8.3.1") // x-release-please-version
+    implementation("com.google.maps.android:maps-compose:8.4.0") // x-release-please-version
 
     // Optional: Maps Compose Utilities (for clustering, etc.)
-    // implementation("com.google.maps.android:maps-compose-utils:8.3.1") // x-release-please-version
+    // implementation("com.google.maps.android:maps-compose-utils:8.4.0") // x-release-please-version
 
     // Optional: Maps Compose Widgets (for UI components)
-    // implementation("com.google.maps.android:maps-compose-widgets:8.3.1") // x-release-please-version
+    // implementation("com.google.maps.android:maps-compose-widgets:8.4.0") // x-release-please-version
 }
 ```