diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1048fe6a1..bd266c339a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [1.517.0](https://github.com/windmill-labs/windmill/compare/v1.516.0...v1.517.0) (2025-07-31)
+
+
+### Features
+
+* **cli:** wmill-lock.yaml v2 for easier git merge diffs ([ef3e235](https://github.com/windmill-labs/windmill/commit/ef3e2353a76d096847b3f10b1daa6767fc4baa0d))
+
+
+### Bug Fixes
+
+* use with_capacity back presusre for tantivy directory multipart writes ([#6313](https://github.com/windmill-labs/windmill/issues/6313)) ([8887707](https://github.com/windmill-labs/windmill/commit/8887707d41456889371e471c996773e605088a88))
+
 ## [1.516.0](https://github.com/windmill-labs/windmill/compare/v1.515.1...v1.516.0) (2025-07-31)
 
 
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index ddacc8e655..29c605982a 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -4600,7 +4600,7 @@ checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
 dependencies = [
  "libc",
  "option-ext",
- "redox_users 0.5.1",
+ "redox_users 0.5.2",
  "windows-sys 0.60.2",
 ]
 
@@ -7361,9 +7361,9 @@ dependencies = [
 
 [[package]]
 name = "libredox"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "360e552c93fa0e8152ab463bc4c4837fce76a225df11dfaeea66c313de5e61f7"
+checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3"
 dependencies = [
  "bitflags 2.9.1",
  "libc",
@@ -8039,9 +8039,9 @@ dependencies = [
 
 [[package]]
 name = "mysql_common"
-version = "0.35.4"
+version = "0.35.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e0ec195e788c95f36b7cf88127d538465fc2f7773e6e47af01834738eab0aee"
+checksum = "fbb9f371618ce723f095c61fbcdc36e8936956d2b62832f9c7648689b338e052"
 dependencies = [
  "base64 0.22.1",
  "bitflags 2.9.1",
@@ -10243,9 +10243,9 @@ dependencies = [
 
 [[package]]
 name = "redox_users"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78eaea1f52c56d57821be178b2d47e09ff26481a6042e8e042fcb0ced068b470"
+checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
 dependencies = [
  "getrandom 0.2.16",
  "libredox",
@@ -14749,7 +14749,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.516.0"
+version = "1.517.0"
 dependencies = [
  "anyhow",
  "axum",
@@ -14801,7 +14801,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.516.0"
+version = "1.517.0"
 dependencies = [
  "anyhow",
  "argon2",
@@ -14916,7 +14916,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.516.0"
+version = "1.517.0"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -14931,7 +14931,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.516.0"
+version = "1.517.0"
 dependencies = [
  "chrono",
  "serde",
@@ -14944,7 +14944,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-autoscaling"
-version = "1.516.0"
+version = "1.517.0"
 dependencies = [
  "anyhow",
  "serde",
@@ -14958,7 +14958,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.516.0"
+version = "1.517.0"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -15037,7 +15037,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.516.0"
+version = "1.517.0"
 dependencies = [
  "regex",
  "serde",
@@ -15052,7 +15052,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.516.0"
+version = "1.517.0"
 dependencies = [
  "anyhow",
  "bytes",
@@ -15076,7 +15076,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.516.0"
+version = "1.517.0"
 dependencies = [
  "itertools 0.14.0",
  "lazy_static",
@@ -15088,7 +15088,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser"
-version = "1.516.0"
+version = "1.517.0"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -15097,7 +15097,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.516.0"
+version = "1.517.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -15109,7 +15109,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-csharp"
-version = "1.516.0"
+version = "1.517.0"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -15121,7 +15121,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.516.0"
+version = "1.517.0"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -15133,7 +15133,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.516.0"
+version = "1.517.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -15145,7 +15145,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-java"
-version = "1.516.0"
+version = "1.517.0"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -15157,7 +15157,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-nu"
-version = "1.516.0"
+version = "1.517.0"
 dependencies = [
  "anyhow",
  "nu-parser",
@@ -15168,7 +15168,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.516.0"
+version = "1.517.0"
 dependencies = [
  "anyhow",
  "itertools 0.14.0",
@@ -15179,7 +15179,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.516.0"
+version = "1.517.0"
 dependencies = [
  "anyhow",
  "itertools 0.14.0",
@@ -15191,7 +15191,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.516.0"
+version = "1.517.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -15214,7 +15214,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.516.0"
+version = "1.517.0"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -15231,7 +15231,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.516.0"
+version = "1.517.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -15245,7 +15245,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.516.0"
+version = "1.517.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -15263,7 +15263,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.516.0"
+version = "1.517.0"
 dependencies = [
  "anyhow",
  "getrandom 0.2.16",
@@ -15287,7 +15287,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.516.0"
+version = "1.517.0"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -15297,7 +15297,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.516.0"
+version = "1.517.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -15330,7 +15330,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.516.0"
+version = "1.517.0"
 dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-test",
@@ -15340,7 +15340,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.516.0"
+version = "1.517.0"
 dependencies = [
  "anyhow",
  "async-recursion",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 493b40835c..bdfe50c5d3 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.516.0"
+version = "1.517.0"
 authors.workspace = true
 edition.workspace = true
 
@@ -32,7 +32,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.516.0"
+version = "1.517.0"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index 9d13f907fa..72c0209d62 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.516.0
+  version: 1.517.0
   title: Windmill API
 
   contact:
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index b3015a3105..017b0cbc00 100644
--- a/benchmarks/lib.ts
+++ b/benchmarks/lib.ts
@@ -2,7 +2,7 @@ import { sleep } from "https://deno.land/x/sleep@v1.2.1/mod.ts";
 import * as windmill from "https://deno.land/x/windmill@v1.174.0/mod.ts";
 import * as api from "https://deno.land/x/windmill@v1.174.0/windmill-api/index.ts";
 
-export const VERSION = "v1.516.0";
+export const VERSION = "v1.517.0";
 
 export async function login(email: string, password: string): Promise<string> {
   return await windmill.UserService.login({
diff --git a/cli/main.ts b/cli/main.ts
index 0469846e68..257f6ef834 100644
--- a/cli/main.ts
+++ b/cli/main.ts
@@ -69,7 +69,7 @@ export {
 //   }
 // });
 
-export const VERSION = "1.516.0";
+export const VERSION = "1.517.0";
 
 const command = new Command()
   .name("wmill")
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index c6c1290fa0..04cb7d33a0 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.516.0",
+	"version": "1.517.0",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.516.0",
+			"version": "1.517.0",
 			"hasInstallScript": true,
 			"license": "AGPL-3.0",
 			"dependencies": {
diff --git a/frontend/package.json b/frontend/package.json
index ca5168a4db..219c25ff9a 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.516.0",
+	"version": "1.517.0",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
diff --git a/lsp/Pipfile b/lsp/Pipfile
index b8cab756f6..bf03421ebb 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.516.0"
-wmill_pg = ">=1.516.0"
+wmill = ">=1.517.0"
+wmill_pg = ">=1.517.0"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index 6e12aeafe7..8163e0f020 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.516.0
+  version: 1.517.0
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index 063e6841a3..85123a27f3 100644
--- a/powershell-client/WindmillClient/WindmillClient.psd1
+++ b/powershell-client/WindmillClient/WindmillClient.psd1
@@ -12,7 +12,7 @@
     RootModule        = 'WindmillClient.psm1'
 
     # Version number of this module.
-    ModuleVersion     = '1.516.0'
+    ModuleVersion     = '1.517.0'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index ea3c878be3..9506571bd3 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.516.0"
+version = "1.517.0"
 description = "A client library for accessing Windmill server wrapping the Windmill client API"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
diff --git a/python-client/wmill_pg/pyproject.toml b/python-client/wmill_pg/pyproject.toml
index 4e7787b640..f876ffbb59 100644
--- a/python-client/wmill_pg/pyproject.toml
+++ b/python-client/wmill_pg/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill-pg"
-version = "1.516.0"
+version = "1.517.0"
 description = "An extension client for the wmill client library focused on pg"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
diff --git a/typescript-client/jsr.json b/typescript-client/jsr.json
index e758911ed5..14565ff80b 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.516.0",
+  "version": "1.517.0",
   "exports": "./src/index.ts",
   "publish": {
     "exclude": ["!src", "./s3Types.ts", "./client.ts"]
diff --git a/typescript-client/package.json b/typescript-client/package.json
index 13b703d7d3..36871410c4 100644
--- a/typescript-client/package.json
+++ b/typescript-client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "windmill-client",
   "description": "Windmill SDK client for browsers and Node.js",
-  "version": "1.516.0",
+  "version": "1.517.0",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {
diff --git a/version.txt b/version.txt
index c5eae85882..aa95067d86 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.516.0
+1.517.0