diff --git a/buildSrc/src/main/kotlin/BuildConfig.kt b/buildSrc/src/main/kotlin/BuildConfig.kt
index dd5479d445..1027d7cf68 100644
--- a/buildSrc/src/main/kotlin/BuildConfig.kt
+++ b/buildSrc/src/main/kotlin/BuildConfig.kt
@@ -4,8 +4,8 @@ package com.unciv.build
 object BuildConfig {
     const val kotlinVersion = "1.8.21"
     const val appName = "Unciv"
-    const val appCodeNumber = 873
-    const val appVersion = "4.6.16"
+    const val appCodeNumber = 874
+    const val appVersion = "4.6.17"
 
     const val gdxVersion = "1.11.0"
     const val roboVMVersion = "2.3.1"
diff --git a/changelog.md b/changelog.md
index 9b7c2696d7..0f29d58a54 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,21 @@
+## 4.6.17
+
+Resolved  - badly configured era conditional no longer causes crashes
+
+Remove "does not support server feature set" error for uncivserver.xyz
+
+Trigger resource recalculation upon gaining a unit that requires resources
+
+Guard against '><' causing translation recursion
+
+By SomeTroglodyte:
+- More reapply CityFocus on yield changes 
+- Allow image overlay and changing world wrap in map editor 
+- Small File Chooser and Separator fixes 
+- Upgrading from Unit overview improved 
+
+More efficient use of the charts space  - By JackRainy
+
 ## 4.6.16
 
 By SomeTroglodyte:
diff --git a/core/src/com/unciv/UncivGame.kt b/core/src/com/unciv/UncivGame.kt
index 866927656c..97ef6973af 100644
--- a/core/src/com/unciv/UncivGame.kt
+++ b/core/src/com/unciv/UncivGame.kt
@@ -531,7 +531,7 @@ open class UncivGame(val isConsoleMode: Boolean = false) : Game(), PlatformSpeci
 
     companion object {
         //region AUTOMATICALLY GENERATED VERSION DATA - DO NOT CHANGE THIS REGION, INCLUDING THIS COMMENT
-        val VERSION = Version("4.6.16", 873)
+        val VERSION = Version("4.6.17", 874)
         //endregion
 
         lateinit var Current: UncivGame
diff --git a/fastlane/metadata/android/en-US/changelogs/874.txt b/fastlane/metadata/android/en-US/changelogs/874.txt
new file mode 100644
index 0000000000..1b12c5a66f
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/874.txt
@@ -0,0 +1,17 @@
+
+
+Resolved  - badly configured era conditional no longer causes crashes
+
+Remove "does not support server feature set" error for uncivserver.xyz
+
+Trigger resource recalculation upon gaining a unit that requires resources
+
+Guard against '><' causing translation recursion
+
+By SomeTroglodyte:
+- More reapply CityFocus on yield changes 
+- Allow image overlay and changing world wrap in map editor 
+- Small File Chooser and Separator fixes 
+- Upgrading from Unit overview improved 
+
+More efficient use of the charts space  - By JackRainy
\ No newline at end of file