diff --git a/custom_components/gree_controller/manifest.json b/custom_components/gree_controller/manifest.json
index a5097d9..2dd93a0 100644
--- a/custom_components/gree_controller/manifest.json
+++ b/custom_components/gree_controller/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "gree_controller",
   "name": "GREE Controller",
-  "version": "0.16.3",
+  "version": "0.16.4",
   "config_flow": true,
   "integration_type": "hub",
   "iot_class": "local_polling",
diff --git a/gree-controller/CHANGELOG.md b/gree-controller/CHANGELOG.md
index 0e8c50a..aeff2e6 100644
--- a/gree-controller/CHANGELOG.md
+++ b/gree-controller/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.16.4
+
+- Fixes a race in stateful Flow checkpoint saving: no stale condition evaluation can re-enable, overwrite or resurrect a disabled/deleted/recompiled automation.
+- Requires both the generated automation/schedule and its parent Flow to be enabled before participating in the engine, control plan, next-event timeline or API enabled status, including mismatched imported/legacy data.
+- Adds a second enable/revision check under the execution lock immediately before sending an action. No newly initiated Flow actions after disabling it.
+- Releases orphaned thermostat intent and pending compressor tasks when a Flow is disabled, deleted, or its action is removed; preserves real manual ownership and avoids retroactively undoing already sent external commands.
+- Resets Flow timer, change-detection, rolling-window and cooldown state after an OFF → ON transition, so disabled intervals never advance timing conditions.
+- Filters the dashboard's recent-Flow and simulation cards against the parent state, including the moment between a WebSocket Flow update and a rebuilt control plan.
+- Adds database and engine regression tests for disabled parents, stale writes, orphaned rules, zone handback and manual takeover.
+- Restores the three ready-to-import simple heating Flow JSON examples missing from the prior source package and updates the static verification script for the new ownership checker.
+
 ## 0.16.3
 
 - Adds expandable, per-room examples for nighttime 19/21/23°C modulation, daytime OFF/boost/30-minute stability, zone temperature-source fallback and Flow vs manual ownership.
diff --git a/gree-controller/config.yaml b/gree-controller/config.yaml
index 2e79fa5..c81b1bb 100644
--- a/gree-controller/config.yaml
+++ b/gree-controller/config.yaml
@@ -1,5 +1,5 @@
 name: "GREE Controller"
-version: "0.16.3"
+version: "0.16.4"
 slug: "gree_controller"
 description: "Local GREE HVAC controller with Web UI, API, and Home Assistant integration"
 url: "https://git.linuxiarz.pl/gru/gree-controller-ha-addon/"