diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86567202b..c913540d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## v0.17.9
+
+### Other Improvements
+
+* Implement CQL ToTime and rearrange ToDate and ToDateTime ([#747](https://github.com/samply/blaze/pull/747))
+* Improve CQL Error Message on Subtract ([#755](https://github.com/samply/blaze/pull/755))
+
+The full changelog can be found [here](https://github.com/samply/blaze/milestone/47?closed=1).
+
 ## v0.17.8
 
 ### Other
diff --git a/README.md b/README.md
index 8a48ee0ae..89d428c5f 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ The goal of this project is to provide a FHIR® Store with an internal CQL Evalu
 
 Blaze passes all [Touchstone FHIR 4.0.1 Basic Tests][12] and almost all [CQL Tests][3]. Please refer to the [Conformance](docs/conformance.md) section and report any issues you encounter during evaluation.
 
-Latest release: [v0.17.8][5]
+Latest release: [v0.17.9][5]
 
 ## Quick Start
 
@@ -72,7 +72,7 @@ Unless required by applicable law or agreed to in writing, software distributed
 
 [3]: <https://cql.hl7.org/tests.html>
 [4]: <https://alexanderkiel.gitbook.io/blaze/deployment>
-[5]: <https://github.com/samply/blaze/releases/tag/v0.17.8>
+[5]: <https://github.com/samply/blaze/releases/tag/v0.17.9>
 [6]: <https://www.yourkit.com/java/profiler/>
 [7]: <https://www.yourkit.com/.net/profiler/>
 [8]: <https://www.yourkit.com/youmonitor/>
diff --git a/docs/deployment/docker-deployment.md b/docs/deployment/docker-deployment.md
index f8ea6894c..b68d04a1b 100644
--- a/docs/deployment/docker-deployment.md
+++ b/docs/deployment/docker-deployment.md
@@ -27,7 +27,7 @@ Blaze should log something like this:
 2021-06-27T11:02:37.834Z ee086ef908c1 main INFO [blaze.core:64] - JVM version: 16.0.2
 2021-06-27T11:02:37.834Z ee086ef908c1 main INFO [blaze.core:65] - Maximum available memory: 1738 MiB
 2021-06-27T11:02:37.835Z ee086ef908c1 main INFO [blaze.core:66] - Number of available processors: 8
-2021-06-27T11:02:37.836Z ee086ef908c1 main INFO [blaze.core:67] - Successfully started Blaze version 0.17.8 in 8.2 seconds
+2021-06-27T11:02:37.836Z ee086ef908c1 main INFO [blaze.core:67] - Successfully started Blaze version 0.17.9 in 8.2 seconds
 ```
 
 In order to test connectivity, query the health endpoint:
@@ -47,7 +47,7 @@ that should return:
 ```json
 {
   "name": "Blaze",
-  "version": "0.17.8"
+  "version": "0.17.9"
 }
 ```
 
diff --git a/docs/deployment/manual-deployment.md b/docs/deployment/manual-deployment.md
index 299e7a41e..edc4ac528 100644
--- a/docs/deployment/manual-deployment.md
+++ b/docs/deployment/manual-deployment.md
@@ -2,12 +2,12 @@
 
 The installation works under Windows, Linux and macOS. The only dependency is an installed OpenJDK 11. Blaze is tested with [AdoptOpenJDK][1].
 
-Blaze runs on the JVM and comes as single JAR file. Download the most recent version [here](https://github.com/samply/blaze/releases/tag/v0.17.8). Look for `blaze-0.17.8-standalone.jar`.
+Blaze runs on the JVM and comes as single JAR file. Download the most recent version [here](https://github.com/samply/blaze/releases/tag/v0.17.9). Look for `blaze-0.17.9-standalone.jar`.
 
 After the download, you can start blaze with the following command (Linux, macOS):
 
 ```sh
-java -jar blaze-0.17.8-standalone.jar -m blaze.core
+java -jar blaze-0.17.9-standalone.jar -m blaze.core
 ```
 
 Blaze will run with an in-memory, volatile database for testing and demo purposes.
@@ -17,14 +17,14 @@ Blaze can be run with durable storage by setting the environment variables `STOR
 Under Linux/macOS:
 
 ```sh
-STORAGE=standalone java -jar blaze-0.17.8-standalone.jar -m blaze.core
+STORAGE=standalone java -jar blaze-0.17.9-standalone.jar -m blaze.core
 ```
 
 Under Windows, you need to set the Environment variables in the PowerShell before starting Blaze:
 
 ```powershell
 $Env:STORAGE="standalone"
-java -jar blaze-0.17.8-standalone.jar -m blaze.core
+java -jar blaze-0.17.9-standalone.jar -m blaze.core
 ```
 
 This will create three directories called `index`, `transaction` and `resource` inside the current working directory, one for each database part used.
@@ -42,7 +42,7 @@ The output should look like this:
 2021-06-27T11:02:37.834Z ee086ef908c1 main INFO [blaze.core:64] - JVM version: 16.0.2
 2021-06-27T11:02:37.834Z ee086ef908c1 main INFO [blaze.core:65] - Maximum available memory: 1738 MiB
 2021-06-27T11:02:37.835Z ee086ef908c1 main INFO [blaze.core:66] - Number of available processors: 8
-2021-06-27T11:02:37.836Z ee086ef908c1 main INFO [blaze.core:67] - Successfully started Blaze version 0.17.8 in 8.2 seconds
+2021-06-27T11:02:37.836Z ee086ef908c1 main INFO [blaze.core:67] - Successfully started Blaze version 0.17.9 in 8.2 seconds
 ```
 
 In order to test connectivity, query the health endpoint:
@@ -62,7 +62,7 @@ that should return:
 ```json
 {
   "name": "Blaze",
-  "version": "0.17.8"
+  "version": "0.17.9"
 }
 ```
 
diff --git a/perf-test/gatling/pom.xml b/perf-test/gatling/pom.xml
index 6464d4f17..766e2c7f0 100644
--- a/perf-test/gatling/pom.xml
+++ b/perf-test/gatling/pom.xml
@@ -5,7 +5,7 @@
 
   <groupId>samply.blaze</groupId>
   <artifactId>gatling</artifactId>
-  <version>0.17.8</version>
+  <version>0.17.9</version>
 
   <properties>
     <maven.compiler.source>1.8</maven.compiler.source>
diff --git a/pom.xml b/pom.xml
index 633f6e89e..b61e43b73 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>samply</groupId>
     <artifactId>blaze</artifactId>
-    <version>0.17.8</version>
+    <version>0.17.9</version>
     <name>blaze</name>
 
     <description>A FHIR Store with internal, fast CQL Evaluation Engine</description>
diff --git a/src/blaze/system.clj b/src/blaze/system.clj
index bac30e8c3..18f72cf9a 100644
--- a/src/blaze/system.clj
+++ b/src/blaze/system.clj
@@ -85,7 +85,7 @@
 
 
 (def ^:private root-config
-  {:blaze/version "0.17.8"
+  {:blaze/version "0.17.9"
 
    :blaze/clock {}