diff --git a/CHANGELOG.md b/CHANGELOG.md
index 474533d914..62749c0973 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## [1.501.4](https://github.com/windmill-labs/windmill/compare/v1.501.3...v1.501.4) (2025-06-26)
+
+
+### Bug Fixes
+
+* add windows paths to uv install to find git/ssh ([#6063](https://github.com/windmill-labs/windmill/issues/6063)) ([835f1d2](https://github.com/windmill-labs/windmill/commit/835f1d2ec945145942deaa41cb3bd176ed276279))
+* optionally enable CSP headers ([#6033](https://github.com/windmill-labs/windmill/issues/6033)) ([d933648](https://github.com/windmill-labs/windmill/commit/d933648d3666b2ca9d813e04b9f19ddc3c7efda3))
+* schemaform reorder ([#6069](https://github.com/windmill-labs/windmill/issues/6069)) ([1a4b096](https://github.com/windmill-labs/windmill/commit/1a4b096f3ce40e238f1724aa4fd26649d70cb62a))
+
 ## [1.501.3](https://github.com/windmill-labs/windmill/compare/v1.501.2...v1.501.3) (2025-06-25)
 
 
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index a9f7a2d86a..27b967ac4e 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -10450,7 +10450,7 @@ dependencies = [
 [[package]]
 name = "rmcp"
 version = "0.1.5"
-source = "git+https://github.com/modelcontextprotocol/rust-sdk#e6effb327883d0a8a91f5efbb527194747eee57b"
+source = "git+https://github.com/modelcontextprotocol/rust-sdk#b9d7d61ebd6e8385cbc4aa105d4e25774fc1a59c"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -10479,7 +10479,7 @@ dependencies = [
 [[package]]
 name = "rmcp-macros"
 version = "0.1.5"
-source = "git+https://github.com/modelcontextprotocol/rust-sdk#e6effb327883d0a8a91f5efbb527194747eee57b"
+source = "git+https://github.com/modelcontextprotocol/rust-sdk#b9d7d61ebd6e8385cbc4aa105d4e25774fc1a59c"
 dependencies = [
  "darling 0.20.11",
  "proc-macro2",
@@ -14616,7 +14616,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.501.3"
+version = "1.501.4"
 dependencies = [
  "anyhow",
  "axum",
@@ -14668,7 +14668,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.501.3"
+version = "1.501.4"
 dependencies = [
  "anyhow",
  "argon2",
@@ -14779,7 +14779,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.501.3"
+version = "1.501.4"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -14794,7 +14794,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.501.3"
+version = "1.501.4"
 dependencies = [
  "chrono",
  "serde",
@@ -14807,7 +14807,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-autoscaling"
-version = "1.501.3"
+version = "1.501.4"
 dependencies = [
  "anyhow",
  "serde",
@@ -14821,7 +14821,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.501.3"
+version = "1.501.4"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -14898,7 +14898,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.501.3"
+version = "1.501.4"
 dependencies = [
  "regex",
  "serde",
@@ -14912,7 +14912,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.501.3"
+version = "1.501.4"
 dependencies = [
  "anyhow",
  "bytes",
@@ -14935,7 +14935,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.501.3"
+version = "1.501.4"
 dependencies = [
  "itertools 0.14.0",
  "lazy_static",
@@ -14947,7 +14947,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser"
-version = "1.501.3"
+version = "1.501.4"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -14956,7 +14956,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.501.3"
+version = "1.501.4"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -14968,7 +14968,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-csharp"
-version = "1.501.3"
+version = "1.501.4"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -14980,7 +14980,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.501.3"
+version = "1.501.4"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -14992,7 +14992,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.501.3"
+version = "1.501.4"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -15004,7 +15004,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-java"
-version = "1.501.3"
+version = "1.501.4"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -15016,7 +15016,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-nu"
-version = "1.501.3"
+version = "1.501.4"
 dependencies = [
  "anyhow",
  "nu-parser",
@@ -15027,7 +15027,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.501.3"
+version = "1.501.4"
 dependencies = [
  "anyhow",
  "itertools 0.14.0",
@@ -15038,7 +15038,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.501.3"
+version = "1.501.4"
 dependencies = [
  "anyhow",
  "itertools 0.14.0",
@@ -15049,7 +15049,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.501.3"
+version = "1.501.4"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -15072,7 +15072,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.501.3"
+version = "1.501.4"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -15089,7 +15089,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.501.3"
+version = "1.501.4"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -15101,7 +15101,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.501.3"
+version = "1.501.4"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -15119,7 +15119,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.501.3"
+version = "1.501.4"
 dependencies = [
  "anyhow",
  "getrandom 0.2.16",
@@ -15143,7 +15143,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.501.3"
+version = "1.501.4"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -15153,7 +15153,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.501.3"
+version = "1.501.4"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -15186,7 +15186,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.501.3"
+version = "1.501.4"
 dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-test",
@@ -15196,7 +15196,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.501.3"
+version = "1.501.4"
 dependencies = [
  "anyhow",
  "async-recursion",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 5f1b540cd3..3aebd08d16 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.501.3"
+version = "1.501.4"
 authors.workspace = true
 edition.workspace = true
 
@@ -32,7 +32,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.501.3"
+version = "1.501.4"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index 489ae6a954..8c1496b3a0 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.501.3
+  version: 1.501.4
   title: Windmill API
 
   contact:
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index 820516e7cc..b965a83b6c 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.501.3";
+export const VERSION = "v1.501.4";
 
 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 598eb8ab3e..71e3acd75f 100644
--- a/cli/main.ts
+++ b/cli/main.ts
@@ -63,7 +63,7 @@ export {
 //   }
 // });
 
-export const VERSION = "1.501.3";
+export const VERSION = "1.501.4";
 
 const command = new Command()
   .name("wmill")
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 1cc16f94e1..d1a943c27a 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.501.3",
+	"version": "1.501.4",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.501.3",
+			"version": "1.501.4",
 			"hasInstallScript": true,
 			"license": "AGPL-3.0",
 			"dependencies": {
diff --git a/frontend/package.json b/frontend/package.json
index 2aea83328b..3aa2c1bcba 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.501.3",
+	"version": "1.501.4",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
diff --git a/frontend/src/lib/components/SchemaForm.svelte b/frontend/src/lib/components/SchemaForm.svelte
index c3dbbf347b..d65c224924 100644
--- a/frontend/src/lib/components/SchemaForm.svelte
+++ b/frontend/src/lib/components/SchemaForm.svelte
@@ -173,7 +173,10 @@
 					.forEach((x) => {
 						n[x] = schema.properties[x]
 					})
-				if (!deepEqual(schema.properties, n) || !deepEqual(schema.properties, Object.keys(n))) {
+				if (
+					!deepEqual(schema.properties, n) ||
+					!deepEqual(Object.keys(schema.properties), Object.keys(n))
+				) {
 					schema.properties = n
 				}
 			}
diff --git a/frontend/src/lib/components/ScriptPicker.svelte b/frontend/src/lib/components/ScriptPicker.svelte
index c4fe27167a..4f44f22396 100644
--- a/frontend/src/lib/components/ScriptPicker.svelte
+++ b/frontend/src/lib/components/ScriptPicker.svelte
@@ -29,6 +29,7 @@
 		allowRefresh?: boolean
 		allowEdit?: boolean
 		allowView?: boolean
+		clearable?: boolean
 	}
 
 	let {
@@ -40,7 +41,8 @@
 		disabled = false,
 		allowRefresh = false,
 		allowEdit = true,
-		allowView = true
+		allowView = true,
+		clearable = false
 	}: Props = $props()
 
 	let items: { value: string; label: string }[] = $state([])
@@ -128,6 +130,7 @@
 			}
 			class="grow shrink max-w-full"
 			{items}
+			{clearable}
 			placeholder="Pick {itemKind === 'app' ? 'an' : 'a'} {itemKind}"
 		/>
 	{/if}
diff --git a/frontend/src/lib/components/runs/RunsTable.svelte b/frontend/src/lib/components/runs/RunsTable.svelte
index 8872941349..753f62129b 100644
--- a/frontend/src/lib/components/runs/RunsTable.svelte
+++ b/frontend/src/lib/components/runs/RunsTable.svelte
@@ -285,7 +285,6 @@
 			{stickyIndices}
 			{scrollToIndex}
 			scrollToAlignment="center"
-			scrollToBehaviour="smooth"
 		>
 			{#snippet header()}{/snippet}
 			{#snippet children({ index, style })}
diff --git a/frontend/src/lib/components/triggers/gcp/GcpTriggerEditorInner.svelte b/frontend/src/lib/components/triggers/gcp/GcpTriggerEditorInner.svelte
index eede2f1960..fce2fe2f0b 100644
--- a/frontend/src/lib/components/triggers/gcp/GcpTriggerEditorInner.svelte
+++ b/frontend/src/lib/components/triggers/gcp/GcpTriggerEditorInner.svelte
@@ -348,6 +348,7 @@
 							bind:scriptPath={script_path}
 							allowRefresh={can_write}
 							allowEdit={!$userStore?.operator}
+							clearable
 						/>
 						{#if emptyString(script_path)}
 							<Button
diff --git a/frontend/src/lib/components/triggers/http/RouteEditorInner.svelte b/frontend/src/lib/components/triggers/http/RouteEditorInner.svelte
index dda278f7fe..31d927bb03 100644
--- a/frontend/src/lib/components/triggers/http/RouteEditorInner.svelte
+++ b/frontend/src/lib/components/triggers/http/RouteEditorInner.svelte
@@ -538,6 +538,7 @@
 									bind:scriptPath={script_path}
 									allowRefresh={can_write}
 									allowEdit={!$userStore?.operator}
+									clearable
 								/>
 
 								{#if emptyString(script_path)}
diff --git a/frontend/src/lib/components/triggers/kafka/KafkaTriggerEditorInner.svelte b/frontend/src/lib/components/triggers/kafka/KafkaTriggerEditorInner.svelte
index 94a31bf439..f677059d9c 100644
--- a/frontend/src/lib/components/triggers/kafka/KafkaTriggerEditorInner.svelte
+++ b/frontend/src/lib/components/triggers/kafka/KafkaTriggerEditorInner.svelte
@@ -349,6 +349,7 @@
 							bind:scriptPath={script_path}
 							allowRefresh={can_write}
 							allowEdit={!$userStore?.operator}
+							clearable
 						/>
 						{#if emptyString(script_path)}
 							<Button
diff --git a/frontend/src/lib/components/triggers/mqtt/MqttTriggerEditorInner.svelte b/frontend/src/lib/components/triggers/mqtt/MqttTriggerEditorInner.svelte
index 33444b0eaa..1a18df0bf3 100644
--- a/frontend/src/lib/components/triggers/mqtt/MqttTriggerEditorInner.svelte
+++ b/frontend/src/lib/components/triggers/mqtt/MqttTriggerEditorInner.svelte
@@ -360,6 +360,7 @@
 							bind:scriptPath={script_path}
 							allowRefresh={can_write}
 							allowEdit={!$userStore?.operator}
+							clearable
 						/>
 						{#if emptyString(script_path)}
 							<Button
diff --git a/frontend/src/lib/components/triggers/nats/NatsTriggerEditorInner.svelte b/frontend/src/lib/components/triggers/nats/NatsTriggerEditorInner.svelte
index aa24034488..3746b87d97 100644
--- a/frontend/src/lib/components/triggers/nats/NatsTriggerEditorInner.svelte
+++ b/frontend/src/lib/components/triggers/nats/NatsTriggerEditorInner.svelte
@@ -351,6 +351,7 @@
 							bind:scriptPath={script_path}
 							allowRefresh={can_write}
 							allowEdit={!$userStore?.operator}
+							clearable
 						/>
 						{#if emptyString(script_path)}
 							<Button
diff --git a/frontend/src/lib/components/triggers/postgres/PostgresTriggerEditorInner.svelte b/frontend/src/lib/components/triggers/postgres/PostgresTriggerEditorInner.svelte
index 9d81985fd6..32a31fd75b 100644
--- a/frontend/src/lib/components/triggers/postgres/PostgresTriggerEditorInner.svelte
+++ b/frontend/src/lib/components/triggers/postgres/PostgresTriggerEditorInner.svelte
@@ -526,6 +526,7 @@
 							bind:scriptPath={script_path}
 							allowRefresh={can_write}
 							allowEdit={!$userStore?.operator}
+							clearable
 						/>
 
 						{#if emptyString(script_path) && is_flow === false}
diff --git a/frontend/src/lib/components/triggers/schedules/ScheduleEditorInner.svelte b/frontend/src/lib/components/triggers/schedules/ScheduleEditorInner.svelte
index fe53af4ad7..d1baf41444 100644
--- a/frontend/src/lib/components/triggers/schedules/ScheduleEditorInner.svelte
+++ b/frontend/src/lib/components/triggers/schedules/ScheduleEditorInner.svelte
@@ -875,6 +875,7 @@
 							on:select={(e) => {
 								loadScript(e.detail.path)
 							}}
+							clearable
 						/>
 					{:else}
 						<Alert type="info" title="Runnable path cannot be edited" collapsible>
diff --git a/frontend/src/lib/components/triggers/sqs/SqsTriggerEditorInner.svelte b/frontend/src/lib/components/triggers/sqs/SqsTriggerEditorInner.svelte
index 155e44dede..876b233559 100644
--- a/frontend/src/lib/components/triggers/sqs/SqsTriggerEditorInner.svelte
+++ b/frontend/src/lib/components/triggers/sqs/SqsTriggerEditorInner.svelte
@@ -343,6 +343,7 @@
 							bind:scriptPath={script_path}
 							allowRefresh={can_write}
 							allowEdit={!$userStore?.operator}
+							clearable
 						/>
 						{#if emptyString(script_path)}
 							<Button
diff --git a/frontend/src/lib/components/triggers/websocket/WebsocketTriggerEditorInner.svelte b/frontend/src/lib/components/triggers/websocket/WebsocketTriggerEditorInner.svelte
index 157c1843a5..8ece9a99fa 100644
--- a/frontend/src/lib/components/triggers/websocket/WebsocketTriggerEditorInner.svelte
+++ b/frontend/src/lib/components/triggers/websocket/WebsocketTriggerEditorInner.svelte
@@ -412,6 +412,7 @@
 								bind:scriptPath={script_path}
 								allowRefresh={can_write}
 								allowEdit={!$userStore?.operator}
+								clearable
 							/>
 							{#if emptyString(script_path)}
 								<Button
diff --git a/frontend/src/routes/(root)/(logged)/folders/+page.svelte b/frontend/src/routes/(root)/(logged)/folders/+page.svelte
index 1ce2796033..c5ae49fbcc 100644
--- a/frontend/src/routes/(root)/(logged)/folders/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/folders/+page.svelte
@@ -197,6 +197,7 @@
 															workspace: $workspaceStore ?? '',
 															name
 														})
+														folders = folders?.filter((f) => f.name !== name)
 													} catch (e) {
 														sendUserToast(e.body, true)
 														loadFolders()
diff --git a/lsp/Pipfile b/lsp/Pipfile
index 4be1f82a96..dbcac776c9 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.501.3"
-wmill_pg = ">=1.501.3"
+wmill = ">=1.501.4"
+wmill_pg = ">=1.501.4"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index 1849aba49f..a18b15103d 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.501.3
+  version: 1.501.4
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index 2e077d3b45..9fe07229d2 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.501.3'
+    ModuleVersion     = '1.501.4'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index a658e5b29f..95a01d1f87 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.501.3"
+version = "1.501.4"
 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 14e7135428..2a2b92180b 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.501.3"
+version = "1.501.4"
 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 28a6233958..b255b5ccee 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.501.3",
+  "version": "1.501.4",
   "exports": "./src/index.ts",
   "publish": {
     "exclude": ["!src", "./s3Types.ts", "./client.ts"]
diff --git a/typescript-client/package.json b/typescript-client/package.json
index d39e265a09..86ffaf7726 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.501.3",
+  "version": "1.501.4",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {
diff --git a/version.txt b/version.txt
index 1319376aa7..c9cdde1203 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.501.3
+1.501.4