diff --git a/.github/scripts/check-tests.mjs b/.github/scripts/check-tests.mjs
deleted file mode 100644
index 1e2e38e05b064..0000000000000
--- a/.github/scripts/check-tests.mjs
+++ /dev/null
@@ -1,103 +0,0 @@
-import { readFile } from 'fs/promises';
-import path from 'path';
-import util from 'util';
-import { exec } from 'child_process';
-import { glob } from 'glob';
-import ts from 'typescript';
-
-const execAsync = util.promisify(exec);
-
-const filterAsync = async (asyncPredicate, arr) => {
-	const filterResults = await Promise.all(
-		arr.map(async (item) => ({
-			item,
-			shouldKeep: await asyncPredicate(item),
-		})),
-	);
-
-	return filterResults.filter(({ shouldKeep }) => shouldKeep).map(({ item }) => item);
-};
-
-const isAbstractClass = (node) => {
-	if (ts.isClassDeclaration(node)) {
-		return (
-			node.modifiers?.some((modifier) => modifier.kind === ts.SyntaxKind.AbstractKeyword) || false
-		);
-	}
-	return false;
-};
-
-const isAbstractMethod = (node) => {
-	return (
-		ts.isMethodDeclaration(node) &&
-		Boolean(node.modifiers?.find((modifier) => modifier.kind === ts.SyntaxKind.AbstractKeyword))
-	);
-};
-
-// Function to check if a file has a function declaration, function expression, object method or class
-const hasFunctionOrClass = async (filePath) => {
-	const fileContent = await readFile(filePath, 'utf-8');
-	const sourceFile = ts.createSourceFile(filePath, fileContent, ts.ScriptTarget.Latest, true);
-
-	let hasFunctionOrClass = false;
-	const visit = (node) => {
-		if (
-			ts.isFunctionDeclaration(node) ||
-			ts.isFunctionExpression(node) ||
-			ts.isArrowFunction(node) ||
-			(ts.isMethodDeclaration(node) && !isAbstractMethod(node)) ||
-			(ts.isClassDeclaration(node) && !isAbstractClass(node))
-		) {
-			hasFunctionOrClass = true;
-		}
-		node.forEachChild(visit);
-	};
-
-	visit(sourceFile);
-
-	return hasFunctionOrClass;
-};
-
-const main = async () => {
-	// Run a git command to get a list of all changed files in the branch (branch has to be up to date with master)
-	const changedFiles = await execAsync(
-		'git diff --name-only --diff-filter=d origin/master..HEAD',
-	).then(({ stdout }) => stdout.trim().split('\n').filter(Boolean));
-
-	// Get all .spec.ts and .test.ts files from the packages
-	const specAndTestTsFiles = await glob('packages/*/**/{test,__tests__}/**/*.{spec,test}.ts');
-	const specAndTestTsFilesNames = specAndTestTsFiles.map((file) =>
-		path.parse(file).name.replace(/\.(test|spec)/, ''),
-	);
-
-	// Filter out the .ts and .vue files from the changed files
-	const changedVueFiles = changedFiles.filter((file) => file.endsWith('.vue'));
-	// .ts files with any kind of function declaration or class and not in any of the test folders
-	const changedTsFilesWithFunction = await filterAsync(
-		async (filePath) =>
-			filePath.endsWith('.ts') &&
-			!(await glob('packages/*/**/{test,__tests__}/*.ts')).includes(filePath) &&
-			(await hasFunctionOrClass(filePath)),
-		changedFiles,
-	);
-
-	// For each .ts or .vue file, check if there's a corresponding .test.ts or .spec.ts file in the repository
-	const missingTests = changedVueFiles
-		.concat(changedTsFilesWithFunction)
-		.reduce((filesList, nextFile) => {
-			const fileName = path.parse(nextFile).name;
-
-			if (!specAndTestTsFilesNames.includes(fileName)) {
-				filesList.push(nextFile);
-			}
-
-			return filesList;
-		}, []);
-
-	if (missingTests.length) {
-		console.error(`Missing tests for:\n${missingTests.join('\n')}`);
-		process.exit(1);
-	}
-};
-
-main();
diff --git a/.github/scripts/package.json b/.github/scripts/package.json
index 80bf0baf11043..7640790f2d59f 100644
--- a/.github/scripts/package.json
+++ b/.github/scripts/package.json
@@ -7,7 +7,6 @@
     "p-limit": "3.1.0",
     "picocolors": "1.0.1",
     "semver": "7.5.4",
-    "tempfile": "5.0.0",
-    "typescript": "*"
+    "tempfile": "5.0.0"
   }
 }
diff --git a/.github/workflows/check-tests.yml b/.github/workflows/check-tests.yml
deleted file mode 100644
index 97f380974a172..0000000000000
--- a/.github/workflows/check-tests.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Check Test Files
-
-on:
-  pull_request:
-    branches:
-      - '**'
-      - '!release/*'
-  pull_request_target:
-    branches:
-      - master
-
-jobs:
-  check-tests:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4.1.1
-        with:
-          fetch-depth: 0
-
-      - name: Use Node.js
-        uses: actions/setup-node@v4.0.2
-        with:
-          node-version: 20.x
-
-      - run: npm install --prefix=.github/scripts --no-package-lock
-
-      - name: Check for test files
-        run: node .github/scripts/check-tests.mjs
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7d455c95d251..9e5ffd4e1b12a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,96 @@
+# [1.73.0](https://github.com/n8n-io/n8n/compare/n8n@1.72.0...n8n@1.73.0) (2024-12-19)
+
+
+### Bug Fixes
+
+* **core:** Ensure runners do not throw on unsupported console methods ([#12167](https://github.com/n8n-io/n8n/issues/12167)) ([57c6a61](https://github.com/n8n-io/n8n/commit/57c6a6167dd2b30f0082a416daefce994ecad33a))
+* **core:** Fix `$getWorkflowStaticData` on task runners ([#12153](https://github.com/n8n-io/n8n/issues/12153)) ([b479f14](https://github.com/n8n-io/n8n/commit/b479f14ef5012551b823bea5d2ffbddedfd50a77))
+* **core:** Fix binary data helpers (like `prepareBinaryData`) with task runner ([#12259](https://github.com/n8n-io/n8n/issues/12259)) ([0f1461f](https://github.com/n8n-io/n8n/commit/0f1461f2d5d7ec34236ed7fcec3e2f9ee7eb73c4))
+* **core:** Fix race condition in AI tool invocation with multiple items from the parent ([#12169](https://github.com/n8n-io/n8n/issues/12169)) ([dce0c58](https://github.com/n8n-io/n8n/commit/dce0c58f8605c33fc50ec8aa422f0fb5eee07637))
+* **core:** Fix serialization of circular json with task runner ([#12288](https://github.com/n8n-io/n8n/issues/12288)) ([a99d726](https://github.com/n8n-io/n8n/commit/a99d726f42d027b64f94eda0d385b597c5d5be2e))
+* **core:** Upgrade nanoid to address CVE-2024-55565 ([#12171](https://github.com/n8n-io/n8n/issues/12171)) ([8c0bd02](https://github.com/n8n-io/n8n/commit/8c0bd0200c386b122f495c453ccc97a001e4729c))
+* **editor:** Add new create first project CTA ([#12189](https://github.com/n8n-io/n8n/issues/12189)) ([878b419](https://github.com/n8n-io/n8n/commit/878b41904d76eda3ee230f850127b4d56993de24))
+* **editor:** Fix canvas ready opacity transition on new canvas ([#12264](https://github.com/n8n-io/n8n/issues/12264)) ([5d33a6b](https://github.com/n8n-io/n8n/commit/5d33a6ba8a2bccea097402fd04c0e2b00e423e76))
+* **editor:** Fix rendering of code-blocks in sticky notes ([#12227](https://github.com/n8n-io/n8n/issues/12227)) ([9b59035](https://github.com/n8n-io/n8n/commit/9b5903524b95bd21d5915908780942790cf88d27))
+* **editor:** Fix sticky color picker getting covered by nodes on new canvas ([#12263](https://github.com/n8n-io/n8n/issues/12263)) ([27bd3c8](https://github.com/n8n-io/n8n/commit/27bd3c85b3a4ddcf763a543b232069bb108130cf))
+* **editor:** Improve commit modal user facing messaging ([#12161](https://github.com/n8n-io/n8n/issues/12161)) ([ad39243](https://github.com/n8n-io/n8n/commit/ad392439826b17bd0b84f981e0958d88f09e7fe9))
+* **editor:** Prevent connection line from showing when clicking the plus button of a node ([#12265](https://github.com/n8n-io/n8n/issues/12265)) ([9180b46](https://github.com/n8n-io/n8n/commit/9180b46b52302b203eecf3bb81c3f2132527a1e6))
+* **editor:** Prevent stickies from being edited in preview mode in the new canvas ([#12222](https://github.com/n8n-io/n8n/issues/12222)) ([6706dcd](https://github.com/n8n-io/n8n/commit/6706dcdf72d54f33c1cf4956602c3a64a1578826))
+* **editor:** Reduce cases for Auto-Add of ChatTrigger for AI Agents ([#12154](https://github.com/n8n-io/n8n/issues/12154)) ([365e82d](https://github.com/n8n-io/n8n/commit/365e82d2008dff2f9c91664ee04d7a78363a8b30))
+* **editor:** Remove invalid connections after node handles change ([#12247](https://github.com/n8n-io/n8n/issues/12247)) ([6330bec](https://github.com/n8n-io/n8n/commit/6330bec4db0175b558f2747837323fdbb25b634a))
+* **editor:** Set dangerouslyUseHTMLString in composable ([#12280](https://github.com/n8n-io/n8n/issues/12280)) ([6ba91b5](https://github.com/n8n-io/n8n/commit/6ba91b5e1ed197c67146347a6f6e663ecdf3de48))
+* **editor:** Set RunData outputIndex based on incoming data ([#12182](https://github.com/n8n-io/n8n/issues/12182)) ([dc4261a](https://github.com/n8n-io/n8n/commit/dc4261ae7eca6cf277404cd514c90fad42f14ae0))
+* **editor:** Update the universal create button interaction ([#12105](https://github.com/n8n-io/n8n/issues/12105)) ([5300e0a](https://github.com/n8n-io/n8n/commit/5300e0ac45bf832b3d2957198a49a1c687f3fe1f))
+* **Elasticsearch Node:** Fix issue stopping search queries being sent ([#11464](https://github.com/n8n-io/n8n/issues/11464)) ([388a83d](https://github.com/n8n-io/n8n/commit/388a83dfbdc6ac301e4df704666df9f09fb7d0b3))
+* **Extract from File Node:** Detect file encoding  ([#12081](https://github.com/n8n-io/n8n/issues/12081)) ([92af245](https://github.com/n8n-io/n8n/commit/92af245d1aab5bfad8618fda69b2405f5206875d))
+* **Github Node:** Fix fetch of file names with ? character ([#12206](https://github.com/n8n-io/n8n/issues/12206)) ([39462ab](https://github.com/n8n-io/n8n/commit/39462abe1fde7e82b5e5b8f3ceebfcadbfd7c925))
+* **Invoice Ninja Node:** Fix actions for bank transactions ([#11511](https://github.com/n8n-io/n8n/issues/11511)) ([80eea49](https://github.com/n8n-io/n8n/commit/80eea49cf0bf9db438eb85af7cd22aeb11fbfed2))
+* **Linear Node:** Fix issue with error handling ([#12191](https://github.com/n8n-io/n8n/issues/12191)) ([b8eae5f](https://github.com/n8n-io/n8n/commit/b8eae5f28a7d523195f4715cd8da77b3a884ae4c))
+* **MongoDB Node:** Fix checks on projection feature call ([#10563](https://github.com/n8n-io/n8n/issues/10563)) ([58bab46](https://github.com/n8n-io/n8n/commit/58bab461c4c5026b2ca5ea143cbcf98bf3a4ced8))
+* **Postgres Node:** Allow users to wrap strings with $$  ([#12034](https://github.com/n8n-io/n8n/issues/12034)) ([0c15e30](https://github.com/n8n-io/n8n/commit/0c15e30778cc5cb10ed368df144d6fbb2504ec70))
+* **Redis Node:** Add support for username auth ([#12274](https://github.com/n8n-io/n8n/issues/12274)) ([64c0414](https://github.com/n8n-io/n8n/commit/64c0414ef28acf0f7ec42b4b0bb21cbf2921ebe7))
+
+
+### Features
+
+* Add solarwinds ipam credentials ([#12005](https://github.com/n8n-io/n8n/issues/12005)) ([882484e](https://github.com/n8n-io/n8n/commit/882484e8ee7d1841d5d600414ca48e9915abcfa8))
+* Add SolarWinds Observability node credentials ([#11805](https://github.com/n8n-io/n8n/issues/11805)) ([e8a5db5](https://github.com/n8n-io/n8n/commit/e8a5db5beb572edbb61dd9100b70827ccc4cca58))
+* **AI Agent Node:** Update descriptions and titles for Chat Trigger options in AI Agents and Memory ([#12155](https://github.com/n8n-io/n8n/issues/12155)) ([07a6ae1](https://github.com/n8n-io/n8n/commit/07a6ae11b3291c1805553d55ba089fe8dd919fd8))
+* **API:** Exclude pinned data from workflows ([#12261](https://github.com/n8n-io/n8n/issues/12261)) ([e0dc385](https://github.com/n8n-io/n8n/commit/e0dc385f8bc8ee13fbc5bbf35e07654e52b193e9))
+* **editor:** Params pane collection improvements ([#11607](https://github.com/n8n-io/n8n/issues/11607)) ([6e44c71](https://github.com/n8n-io/n8n/commit/6e44c71c9ca82cce20eb55bb9003930bbf66a16c))
+* **editor:** Support adding nodes via drag and drop from node creator on new canvas ([#12197](https://github.com/n8n-io/n8n/issues/12197)) ([1bfd9c0](https://github.com/n8n-io/n8n/commit/1bfd9c0e913f3eefc4593f6c344db1ae1f6e4df4))
+* **Facebook Graph API Node:** Update node to support API v21.0 ([#12116](https://github.com/n8n-io/n8n/issues/12116)) ([14c33f6](https://github.com/n8n-io/n8n/commit/14c33f666fe92f7173e4f471fb478e629e775c62))
+* **Linear Trigger Node:** Add support for admin scope ([#12211](https://github.com/n8n-io/n8n/issues/12211)) ([410ea9a](https://github.com/n8n-io/n8n/commit/410ea9a2ef2e14b5e8e4493e5db66cfc2290d8f6))
+* **MailerLite Node:** Update node to support new api ([#11933](https://github.com/n8n-io/n8n/issues/11933)) ([d6b8e65](https://github.com/n8n-io/n8n/commit/d6b8e65abeb411f86538c1630dcce832ee0846a9))
+* Send and wait operation - freeText and customForm response types ([#12106](https://github.com/n8n-io/n8n/issues/12106)) ([e98c7f1](https://github.com/n8n-io/n8n/commit/e98c7f160b018243dc88490d46fb1047a4d7fcdc))
+
+
+### Performance Improvements
+
+* **editor:** SchemaView performance improvement by ≈90% 🚀  ([#12180](https://github.com/n8n-io/n8n/issues/12180)) ([6a58309](https://github.com/n8n-io/n8n/commit/6a5830959f5fb493a4119869b8298d8ed702c84a))
+
+
+
+# [1.72.0](https://github.com/n8n-io/n8n/compare/n8n@1.71.0...n8n@1.72.0) (2024-12-11)
+
+
+### Bug Fixes
+
+* Allow disabling MFA with recovery codes ([#12014](https://github.com/n8n-io/n8n/issues/12014)) ([95d56fe](https://github.com/n8n-io/n8n/commit/95d56fee8d0168b75fca6dcf41702d2f10c930a8))
+* Chat triggers don't work with the new partial execution flow ([#11952](https://github.com/n8n-io/n8n/issues/11952)) ([2b6a72f](https://github.com/n8n-io/n8n/commit/2b6a72f1289c01145edf2b88e5027d2b9b2ed624))
+* **core:** Execute nodes after loops correctly with the new partial execution flow ([#11978](https://github.com/n8n-io/n8n/issues/11978)) ([891dd7f](https://github.com/n8n-io/n8n/commit/891dd7f995c78a2355a049b7ced981a5f6b1c40c))
+* **core:** Fix support for multiple invocation of AI tools ([#12141](https://github.com/n8n-io/n8n/issues/12141)) ([c572c06](https://github.com/n8n-io/n8n/commit/c572c0648ca5b644b222157b3cabac9c05704a84))
+* **core:** Make sure task runner exits ([#12123](https://github.com/n8n-io/n8n/issues/12123)) ([c5effca](https://github.com/n8n-io/n8n/commit/c5effca7d47a713f157eea21d7892002e9ab7283))
+* **core:** Remove run data of nodes unrelated to the current partial execution ([#12099](https://github.com/n8n-io/n8n/issues/12099)) ([c4e4d37](https://github.com/n8n-io/n8n/commit/c4e4d37a8785d1a4bcd376cb1c49b82a80aa4391))
+* **core:** Return homeProject when filtering workflows by project id ([#12077](https://github.com/n8n-io/n8n/issues/12077)) ([efafeed](https://github.com/n8n-io/n8n/commit/efafeed33482100a23fa0163a53b9ce93cd6b2c3))
+* **editor:** Don't reset all Parameter Inputs when switched to read-only  ([#12063](https://github.com/n8n-io/n8n/issues/12063)) ([706702d](https://github.com/n8n-io/n8n/commit/706702dff8da3c2e949e2c98dd5b34b299a1f17c))
+* **editor:** Fix canvas panning using `Control` + `Left Mouse Button` on Windows ([#12104](https://github.com/n8n-io/n8n/issues/12104)) ([43009b6](https://github.com/n8n-io/n8n/commit/43009b6aa820f24b9e6f519e7a45592aa21db03e))
+* **editor:** Fix Nodeview.v2 reinitialise based on route changes ([#12062](https://github.com/n8n-io/n8n/issues/12062)) ([b1f8663](https://github.com/n8n-io/n8n/commit/b1f866326574974eb2936e6b02771346e83e7137))
+* **editor:** Fix svg background pattern rendering on safari ([#12079](https://github.com/n8n-io/n8n/issues/12079)) ([596f221](https://github.com/n8n-io/n8n/commit/596f22103c01e14063ebb2388c4dabf4714d37c6))
+* **editor:** Fix switching from v2 to v1 ([#12050](https://github.com/n8n-io/n8n/issues/12050)) ([5c76de3](https://github.com/n8n-io/n8n/commit/5c76de324c2e25b0d8b74cdab79f04aa616d8c4f))
+* **editor:** Improvements to the commit modal ([#12031](https://github.com/n8n-io/n8n/issues/12031)) ([4fe1952](https://github.com/n8n-io/n8n/commit/4fe1952e2fb3379d95da42a7bb531851af6d0094))
+* **editor:** Load node types in demo and preview modes ([#12048](https://github.com/n8n-io/n8n/issues/12048)) ([4ac5f95](https://github.com/n8n-io/n8n/commit/4ac5f9527bbec382a65ed3f1d9c41d6948c154e3))
+* **editor:** Polyfill crypto.randomUUID ([#12052](https://github.com/n8n-io/n8n/issues/12052)) ([0537524](https://github.com/n8n-io/n8n/commit/0537524c3e45d7633415c7a9175a3857ad52cd58))
+* **editor:** Redirect Settings to the proper sub page depending on the instance type (cloud or not) ([#12053](https://github.com/n8n-io/n8n/issues/12053)) ([a16d006](https://github.com/n8n-io/n8n/commit/a16d006f893cac927d674fa447b08c1205b67c54))
+* **editor:** Render sanitized HTML content in toast messages ([#12139](https://github.com/n8n-io/n8n/issues/12139)) ([0468945](https://github.com/n8n-io/n8n/commit/0468945c99f083577c4cc71f671b4b950f6aeb86))
+* **editor:** Universal button snags ([#11974](https://github.com/n8n-io/n8n/issues/11974)) ([956b11a](https://github.com/n8n-io/n8n/commit/956b11a560528336a74be40f722fa05bf3cca94d))
+* **editor:** Update concurrency UI considering different types of instances ([#12068](https://github.com/n8n-io/n8n/issues/12068)) ([fa572bb](https://github.com/n8n-io/n8n/commit/fa572bbca4397b1cc42668530497444630ed17eb))
+* **FTP Node:** Fix issue with creating folders on rename ([#9340](https://github.com/n8n-io/n8n/issues/9340)) ([eb7d593](https://github.com/n8n-io/n8n/commit/eb7d5934ef8bc6e999d6de4c0b8025ce175df5dd))
+* **n8n Form Node:** Completion page display if EXECUTIONS_DATA_SAVE_ON_SUCCESS=none ([#11869](https://github.com/n8n-io/n8n/issues/11869)) ([f4c2523](https://github.com/n8n-io/n8n/commit/f4c252341985fe03927a2fd5d60ba846ec3dfc77))
+* **OpenAI Node:** Allow updating assistant files ([#12042](https://github.com/n8n-io/n8n/issues/12042)) ([7b20f8a](https://github.com/n8n-io/n8n/commit/7b20f8aaa8befd19dbad0af3bf1b881342c1fca5))
+
+
+### Features
+
+* **AI Transform Node:** Reduce payload size ([#11965](https://github.com/n8n-io/n8n/issues/11965)) ([d8ca8de](https://github.com/n8n-io/n8n/commit/d8ca8de13a4cbb856696873bdb56c66b12a5b027))
+* **core:** Add option to filter for empty variables ([#12112](https://github.com/n8n-io/n8n/issues/12112)) ([a63f0e8](https://github.com/n8n-io/n8n/commit/a63f0e878e21da9924451e2679939209b34b6583))
+* **core:** Cancel runner task on timeout in external mode ([#12101](https://github.com/n8n-io/n8n/issues/12101)) ([addb4fa](https://github.com/n8n-io/n8n/commit/addb4fa352c88d856e463bb2b7001173c4fd6a7d))
+* **core:** Parent workflows should wait for sub-workflows to finish ([#11985](https://github.com/n8n-io/n8n/issues/11985)) ([60b3dcc](https://github.com/n8n-io/n8n/commit/60b3dccf9317da6f3013be35a78ce21d0416ad80))
+* **editor:** Implementing the `Easy AI Workflow` experiment ([#12043](https://github.com/n8n-io/n8n/issues/12043)) ([67ed1d2](https://github.com/n8n-io/n8n/commit/67ed1d2c3c2e69d5a96daf7de2795c02f5d8f15b))
+* **Redis Node:** Add support for continue on fail / error output branch ([#11714](https://github.com/n8n-io/n8n/issues/11714)) ([ed35958](https://github.com/n8n-io/n8n/commit/ed359586c88a7662f4d94d58c5a87cf91d027ab9))
+
+
+
 # [1.71.0](https://github.com/n8n-io/n8n/compare/n8n@1.70.0...n8n@1.71.0) (2024-12-04)
 
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 3f19be15e9595..9ed101af7d57b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,6 +19,7 @@ Great that you are here and you want to contribute to n8n
 		- [Actual n8n setup](#actual-n8n-setup)
 		- [Start](#start)
 	- [Development cycle](#development-cycle)
+		-	[Community PR Guidelines](#community-pr-guidelines)
 		- [Test suite](#test-suite)
 			- [Unit tests](#unit-tests)
 			- [E2E tests](#e2e-tests)
@@ -191,6 +192,51 @@ automatically build your code, restart the backend and refresh the frontend
    ```
 1. Commit code and [create a pull request](https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork)
 
+---
+
+### Community PR Guidelines
+
+#### **1. Change Request/Comment**
+
+Please address the requested changes or provide feedback within 14 days. If there is no response or updates to the pull request during this time, it will be automatically closed. The PR can be reopened once the requested changes are applied.
+
+#### **2. General Requirements**
+
+- **Follow the Style Guide:**
+  - Ensure your code adheres to n8n's coding standards and conventions (e.g., formatting, naming, indentation). Use linting tools where applicable.
+- **TypeScript Compliance:**
+  - Do not use `ts-ignore` .
+  - Ensure code adheres to TypeScript rules.
+- **Avoid Repetitive Code:**
+  - Reuse existing components, parameters, and logic wherever possible instead of redefining or duplicating them.
+  - For nodes: Use the same parameter across multiple operations rather than defining a new parameter for each operation (if applicable).
+- **Testing Requirements:**
+  - PRs **must include tests**:
+    - Unit tests
+    - Workflow tests for nodes (example [here](https://github.com/n8n-io/n8n/tree/master/packages/nodes-base/nodes/Switch/V3/test))
+    - UI tests (if applicable)
+- **Typos:**
+  - Use a spell-checking tool, such as [**Code Spell Checker**](https://marketplace.visualstudio.com/items?itemName=streetsidesoftware.code-spell-checker), to avoid typos.
+
+#### **3. PR Specific Requirements**
+
+- **Small PRs Only:**
+  - Focus on a single feature or fix per PR.
+- **Naming Convention:**
+  - Follow [n8n's PR Title Conventions](https://github.com/n8n-io/n8n/blob/master/.github/pull_request_title_conventions.md#L36).
+- **New Nodes:**
+  - PRs that introduce new nodes will be **auto-closed** unless they are explicitly requested by the n8n team and aligned with an agreed project scope. However, you can still explore [building your own nodes](https://docs.n8n.io/integrations/creating-nodes/) , as n8n offers the flexibility to create your own custom nodes.
+- **Typo-Only PRs:**
+  - Typos are not sufficient justification for a PR and will be rejected.
+
+#### **4. Workflow Summary for Non-Compliant PRs**
+
+- **No Tests:** If tests are not provided, the PR will be auto-closed after **14 days**.
+- **Non-Small PRs:** Large or multifaceted PRs will be returned for segmentation.
+- **New Nodes/Typo PRs:** Automatically rejected if not aligned with project scope or guidelines.
+
+---
+
 ### Test suite
 
 #### Unit tests
diff --git a/README.md b/README.md
index d51ac596cad65..c41a5e5ac863d 100644
--- a/README.md
+++ b/README.md
@@ -1,104 +1,67 @@
-![n8n.io - Workflow Automation](https://user-images.githubusercontent.com/65276001/173571060-9f2f6d7b-bac0-43b6-bdb2-001da9694058.png)
+![Banner image](https://user-images.githubusercontent.com/10284570/173569848-c624317f-42b1-45a6-ab09-f0ea3c247648.png)
 
-# n8n - Workflow automation tool
+# n8n - Secure Workflow Automation for Technical Teams
 
-n8n is an extendable workflow automation tool. With a [fair-code](https://faircode.io) distribution model, n8n
-will always have visible source code, be available to self-host, and allow you to add your own custom
-functions, logic and apps. n8n's node-based approach makes it highly versatile, enabling you to connect
-anything to everything.
+n8n is a workflow automation platform that gives technical teams the flexibility of code with the speed of no-code. With 400+ integrations, native AI capabilities, and a fair-code license, n8n lets you build powerful automations while maintaining full control over your data and deployments.
 
-![n8n.io - Screenshot](https://raw.githubusercontent.com/n8n-io/n8n/master/assets/n8n-screenshot.png)
+![n8n.io - Screenshot](https://raw.githubusercontent.com/n8n-io/n8n/master/assets/n8n-screenshot-readme.png)
 
-## Demo
+## Key Capabilities
 
-[:tv: A short video (< 5 min)](https://www.youtube.com/watch?v=1MwSoB0gnM4) that goes over key concepts of
-creating workflows in n8n.
+- **Code When You Need It**: Write JavaScript/Python, add npm packages, or use the visual interface
+- **AI-Native Platform**: Build AI agent workflows based on LangChain with your own data and models
+- **Full Control**: Self-host with our fair-code license or use our [cloud offering](https://app.n8n.cloud/login)
+- **Enterprise-Ready**: Advanced permissions, SSO, and air-gapped deployments
+- **Active Community**: 400+ integrations and 900+ ready-to-use [templates](https://n8n.io/workflows)
 
-## Available integrations
+## Quick Start
 
-n8n has 200+ different nodes to automate workflows. The list can be found on:
-[https://n8n.io/integrations](https://n8n.io/integrations)
-
-## Documentation
-
-The official n8n documentation can be found on our [documentation website](https://docs.n8n.io)
-
-Additional information and example workflows on the [n8n.io website](https://n8n.io)
-
-The release notes can be found [here](https://docs.n8n.io/release-notes/) and the list of breaking
-changes [here](https://github.com/n8n-io/n8n/blob/master/packages/cli/BREAKING-CHANGES.md).
-
-## Usage
-
-- :books: Learn
-  [how to **use** it from the command line](https://docs.n8n.io/reference/cli-commands/)
-- :whale: Learn
-  [how to run n8n in **Docker**](https://docs.n8n.io/hosting/installation/docker/)
-
-## Start
-
-You can try n8n without installing it using npx. You must have [Node.js](https://nodejs.org/en/) installed.
-From the terminal, run:
+Try n8n instantly with [npx](https://docs.n8n.io/hosting/installation/npm/) (requires [Node.js](https://nodejs.org/en/)):
 
 `npx n8n`
 
-This command will download everything that is needed to start n8n. You can then access n8n and start building workflows by opening [http://localhost:5678](http://localhost:5678).
-
-## n8n cloud
-
-Sign-up for an [n8n cloud](https://www.n8n.io/cloud/) account.
-
-While n8n cloud and n8n are the same in terms of features, n8n cloud provides certain conveniences such as:
+Or deploy with [Docker](https://docs.n8n.io/hosting/installation/docker/):
 
-- Not having to set up and maintain your n8n instance
-- Managed OAuth for authentication
-- Easily upgrading to the newer n8n versions
+`docker run -it --rm --name n8n -p 5678:5678 docker.n8n.io/n8n-io/n8n`
 
-## Build with LangChain and AI in n8n (beta)
+Access the editor at http://localhost:5678
 
-With n8n's LangChain nodes you can build AI-powered functionality within your workflows. The LangChain nodes are configurable, meaning you can choose your preferred agent, LLM, memory, and so on. Alongside the LangChain nodes, you can connect any n8n node as normal: this means you can integrate your LangChain logic with other data sources and services.
+## Resources
 
-Learn more in the [documentation](https://docs.n8n.io/langchain/).
-
-- [LangChain nodes package](https://www.npmjs.com/package/@n8n/n8n-nodes-langchain)
-- [Chatbot package](https://www.npmjs.com/package/@n8n/chat)
+- 📚 [Documentation](https://docs.n8n.io)
+- 🔧 [400+ Integrations](https://n8n.io/integrations)
+- 💡 [Example Workflows](https://n8n.io/workflows)
+- 🤖 [AI & LangChain Guide](https://docs.n8n.io/langchain/)
+- 👥 [Community Forum](https://community.n8n.io)
+- 📖 [Community Tutorials](https://community.n8n.io/c/tutorials/28)
 
 ## Support
 
-If you have problems or questions go to our forum, we will then try to help you asap:
+Need help? Our community forum is the place to get support and connect with other users:
+[community.n8n.io](https://community.n8n.io)
 
-[https://community.n8n.io](https://community.n8n.io)
+## License
 
-## Jobs
+n8n is [fair-code](https://faircode.io) distributed under the [Sustainable Use License](https://github.com/n8n-io/n8n/blob/master/LICENSE.md) and [n8n Enterprise License](https://github.com/n8n-io/n8n/blob/master/LICENSE_EE.md).
 
-If you are interested in working for n8n and so shape the future of the project check out our
-[job posts](https://apply.workable.com/n8n/)
+- **Source Available**: Always visible source code
+- **Self-Hostable**: Deploy anywhere
+- **Extensible**: Add your own nodes and functionality
 
-## What does n8n mean and how do you pronounce it?
+[Enterprise licenses](mailto:license@n8n.io) available for additional features and support.
 
-**Short answer:** It means "nodemation" and it is pronounced as n-eight-n.
+Additional information about the license model can be found in the [docs](https://docs.n8n.io/reference/license/).
 
-**Long answer:** "I get that question quite often (more often than I expected) so I decided it is probably
-best to answer it here. While looking for a good name for the project with a free domain I realized very
-quickly that all the good ones I could think of were already taken. So, in the end, I chose nodemation.
-'node-' in the sense that it uses a Node-View and that it uses Node.js and '-mation' for 'automation' which is
-what the project is supposed to help with. However, I did not like how long the name was and I could not
-imagine writing something that long every time in the CLI. That is when I then ended up on 'n8n'." - **Jan
-Oberhauser, Founder and CEO, n8n.io**
+## Contributing
 
-## Development setup
+Found a bug 🐛 or have a feature idea ✨? Check our [Contributing Guide](https://github.com/n8n-io/n8n/blob/master/CONTRIBUTING.md) to get started.
 
-Have you found a bug :bug: ? Or maybe you have a nice feature :sparkles: to contribute ? The
-[CONTRIBUTING guide](https://github.com/n8n-io/n8n/blob/master/CONTRIBUTING.md) will help you get your
-development environment ready in minutes.
+## Join the Team
 
-## License
+Want to shape the future of automation? Check out our [job posts](https://n8n.io/careers) and join our team!
 
-n8n is [fair-code](https://faircode.io) distributed under the
-[**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/LICENSE.md) and the
-[**n8n Enterprise License**](https://github.com/n8n-io/n8n/blob/master/LICENSE_EE.md).
+## What does n8n mean?
 
-Proprietary licenses are available for enterprise customers. [Get in touch](mailto:license@n8n.io)
+**Short answer:** It means "nodemation" and is pronounced as n-eight-n.
 
-Additional information about the license model can be found in the
-[docs](https://docs.n8n.io/reference/license/).
+**Long answer:** "I get that question quite often (more often than I expected) so I decided it is probably best to answer it here. While looking for a good name for the project with a free domain I realized very quickly that all the good ones I could think of were already taken. So, in the end, I chose nodemation. 'node-' in the sense that it uses a Node-View and that it uses Node.js and '-mation' for 'automation' which is what the project is supposed to help with. However, I did not like how long the name was and I could not imagine writing something that long every time in the CLI. That is when I then ended up on 'n8n'." - **Jan Oberhauser, Founder and CEO, n8n.io**
diff --git a/assets/n8n-screenshot-readme.png b/assets/n8n-screenshot-readme.png
new file mode 100644
index 0000000000000..d6b5faef71e55
Binary files /dev/null and b/assets/n8n-screenshot-readme.png differ
diff --git a/cypress/e2e/11-inline-expression-editor.cy.ts b/cypress/e2e/11-inline-expression-editor.cy.ts
index 945c62821b7a7..a762135a65fc6 100644
--- a/cypress/e2e/11-inline-expression-editor.cy.ts
+++ b/cypress/e2e/11-inline-expression-editor.cy.ts
@@ -129,7 +129,7 @@ describe('Inline expression editor', () => {
 
 			// Run workflow
 			ndv.actions.close();
-			WorkflowPage.actions.executeNode('No Operation');
+			WorkflowPage.actions.executeNode('No Operation', { anchor: 'topLeft' });
 			WorkflowPage.actions.openNode('Hacker News');
 			WorkflowPage.actions.openInlineExpressionEditor();
 
diff --git a/cypress/e2e/13-pinning.cy.ts b/cypress/e2e/13-pinning.cy.ts
index 4f48fa45290dc..2d3351f8aad3b 100644
--- a/cypress/e2e/13-pinning.cy.ts
+++ b/cypress/e2e/13-pinning.cy.ts
@@ -112,7 +112,7 @@ describe('Data pinning', () => {
 	it('Should be able to pin data from canvas (context menu or shortcut)', () => {
 		workflowPage.actions.addInitialNodeToCanvas('Schedule Trigger');
 		workflowPage.actions.addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME);
-		workflowPage.actions.openContextMenu(EDIT_FIELDS_SET_NODE_NAME, 'overflow-button');
+		workflowPage.actions.openContextMenu(EDIT_FIELDS_SET_NODE_NAME, { method: 'overflow-button' });
 		workflowPage.getters
 			.contextMenuAction('toggle_pin')
 			.parent()
diff --git a/cypress/e2e/14-mapping.cy.ts b/cypress/e2e/14-mapping.cy.ts
index 3bbbd0b293459..e19959453f847 100644
--- a/cypress/e2e/14-mapping.cy.ts
+++ b/cypress/e2e/14-mapping.cy.ts
@@ -185,7 +185,6 @@ describe('Data mapping', () => {
 		workflowPage.actions.openNode('Set1');
 
 		ndv.actions.executePrevious();
-		ndv.actions.expandSchemaViewNode(SCHEDULE_TRIGGER_NODE_NAME);
 
 		const dataPill = ndv.getters
 			.inputDataContainer()
diff --git a/cypress/e2e/16-form-trigger-node.cy.ts b/cypress/e2e/16-form-trigger-node.cy.ts
index 60fbd7c419586..ed901107ea60e 100644
--- a/cypress/e2e/16-form-trigger-node.cy.ts
+++ b/cypress/e2e/16-form-trigger-node.cy.ts
@@ -44,8 +44,7 @@ describe('n8n Form Trigger', () => {
 			':nth-child(3) > .border-top-dashed > .parameter-input-list-wrapper > :nth-child(1) > .parameter-item',
 		)
 			.find('input[placeholder*="e.g. What is your name?"]')
-			.type('Test Field 3')
-			.blur();
+			.type('Test Field 3');
 		cy.get(
 			':nth-child(3) > .border-top-dashed > .parameter-input-list-wrapper > :nth-child(2) > .parameter-item',
 		).click();
@@ -56,27 +55,24 @@ describe('n8n Form Trigger', () => {
 			':nth-child(4) > .border-top-dashed > .parameter-input-list-wrapper > :nth-child(1) > .parameter-item',
 		)
 			.find('input[placeholder*="e.g. What is your name?"]')
-			.type('Test Field 4')
-			.blur();
+			.type('Test Field 4');
 		cy.get(
 			':nth-child(4) > .border-top-dashed > .parameter-input-list-wrapper > :nth-child(2) > .parameter-item',
 		).click();
 		getVisibleSelect().contains('Dropdown').click();
-		cy.get(
-			'.border-top-dashed > :nth-child(2) > :nth-child(3) > .multi-parameter > .fixed-collection-parameter > :nth-child(2) > .button',
-		).click();
-		cy.get(
-			':nth-child(4) > :nth-child(1) > :nth-child(2) > :nth-child(3) > .multi-parameter > .fixed-collection-parameter > .fixed-collection-parameter-property > :nth-child(1) > :nth-child(1)',
-		)
-			.find('input')
-			.type('Option 1')
-			.blur();
-		cy.get(
-			':nth-child(4) > :nth-child(1) > :nth-child(2) > :nth-child(3) > .multi-parameter > .fixed-collection-parameter > .fixed-collection-parameter-property > :nth-child(1) > :nth-child(2)',
-		)
-			.find('input')
-			.type('Option 2')
-			.blur();
+		cy.contains('button', 'Add Field Option').click();
+		cy.contains('label', 'Field Options')
+			.parent()
+			.nextAll()
+			.find('[data-test-id="parameter-input-field"]')
+			.eq(0)
+			.type('Option 1');
+		cy.contains('label', 'Field Options')
+			.parent()
+			.nextAll()
+			.find('[data-test-id="parameter-input-field"]')
+			.eq(1)
+			.type('Option 2');
 
 		//add optional submitted message
 		cy.get('.param-options').click();
@@ -94,7 +90,6 @@ describe('n8n Form Trigger', () => {
 			.children()
 			.children()
 			.first()
-			.clear()
 			.type('Your test form was successfully submitted');
 
 		ndv.getters.backToCanvas().click();
diff --git a/cypress/e2e/18-user-management.cy.ts b/cypress/e2e/18-user-management.cy.ts
index fe91a7293555e..d4eb5841cf591 100644
--- a/cypress/e2e/18-user-management.cy.ts
+++ b/cypress/e2e/18-user-management.cy.ts
@@ -148,24 +148,9 @@ describe('User Management', { disableAutoLogin: true }, () => {
 
 		personalSettingsPage.actions.changeTheme('Dark');
 		cy.get('body').should('have.attr', 'data-theme', 'dark');
-		settingsSidebar.actions.back();
-		mainSidebar.getters
-			.logo()
-			.should('have.attr', 'src')
-			.then((src) => {
-				expect(src).to.include('/static/logo/channel/dev-dark.svg');
-			});
-
-		cy.visit(personalSettingsPage.url);
+
 		personalSettingsPage.actions.changeTheme('Light');
 		cy.get('body').should('have.attr', 'data-theme', 'light');
-		settingsSidebar.actions.back();
-		mainSidebar.getters
-			.logo()
-			.should('have.attr', 'src')
-			.then((src) => {
-				expect(src).to.include('/static/logo/channel/dev.svg');
-			});
 	});
 
 	it('should delete user and their data', () => {
diff --git a/cypress/e2e/28-debug.cy.ts b/cypress/e2e/28-debug.cy.ts
index b5159951a746e..9149e2e47827f 100644
--- a/cypress/e2e/28-debug.cy.ts
+++ b/cypress/e2e/28-debug.cy.ts
@@ -87,11 +87,28 @@ describe('Debug', () => {
 		confirmDialog.get('.btn--confirm').click();
 		cy.url().should('include', '/debug');
 
-		workflowPage.getters.canvasNodes().first().should('have.descendants', '.node-pin-data-icon');
-		workflowPage.getters
-			.canvasNodes()
-			.not(':first')
-			.should('not.have.descendants', '.node-pin-data-icon');
+		cy.ifCanvasVersion(
+			() => {
+				workflowPage.getters
+					.canvasNodes()
+					.first()
+					.should('have.descendants', '.node-pin-data-icon');
+				workflowPage.getters
+					.canvasNodes()
+					.not(':first')
+					.should('not.have.descendants', '.node-pin-data-icon');
+			},
+			() => {
+				workflowPage.getters
+					.canvasNodes()
+					.first()
+					.should('have.descendants', '[data-test-id="canvas-node-status-pinned"]');
+				workflowPage.getters
+					.canvasNodes()
+					.not(':first')
+					.should('not.have.descendants', '[data-test-id="canvas-node-status-pinned"]');
+			},
+		);
 
 		cy.reload(true);
 		cy.wait(['@getExecution']);
@@ -114,7 +131,18 @@ describe('Debug', () => {
 		confirmDialog.get('.btn--confirm').click();
 		cy.url().should('include', '/debug');
 
-		workflowPage.getters.canvasNodes().last().find('.node-info-icon').should('be.empty');
+		cy.ifCanvasVersion(
+			() => {
+				workflowPage.getters.canvasNodes().last().find('.node-info-icon').should('be.empty');
+			},
+			() => {
+				workflowPage.getters
+					.canvasNodes()
+					.last()
+					.find('[class*="statusIcons"]')
+					.should('not.exist');
+			},
+		);
 
 		workflowPage.getters.canvasNodes().first().dblclick();
 		ndv.actions.unPinData();
diff --git a/cypress/e2e/29-templates.cy.ts b/cypress/e2e/29-templates.cy.ts
index 5b52889c94d10..727b0cbe3fe3f 100644
--- a/cypress/e2e/29-templates.cy.ts
+++ b/cypress/e2e/29-templates.cy.ts
@@ -129,7 +129,6 @@ describe('Workflow templates', () => {
 			workflowPage.actions.shouldHaveWorkflowName('Demo: ' + OnboardingWorkflow.name);
 			workflowPage.getters.canvasNodes().should('have.length', 4);
 			workflowPage.getters.stickies().should('have.length', 1);
-			workflowPage.getters.canvasNodes().first().should('have.descendants', '.node-pin-data-icon');
 		});
 
 		it('can import template', () => {
@@ -142,6 +141,7 @@ describe('Workflow templates', () => {
 		});
 
 		it('should save template id with the workflow', () => {
+			cy.intercept('POST', '/rest/workflows').as('saveWorkflow');
 			templatesPage.actions.importTemplate();
 
 			cy.visit(templatesPage.url);
@@ -159,10 +159,8 @@ describe('Workflow templates', () => {
 			workflowPage.actions.hitSelectAll();
 			workflowPage.actions.hitCopy();
 
-			cy.grantBrowserPermissions('clipboardReadWrite', 'clipboardSanitizedWrite');
-			// Check workflow JSON by copying it to clipboard
-			cy.readClipboard().then((workflowJSON) => {
-				expect(workflowJSON).to.contain('"templateId": "1"');
+			cy.wait('@saveWorkflow').then((interception) => {
+				expect(interception.request.body.meta.templateId).to.equal('1');
 			});
 		});
 
diff --git a/cypress/e2e/39-projects.cy.ts b/cypress/e2e/39-projects.cy.ts
index cc1ab5ca36d56..327bff4f93589 100644
--- a/cypress/e2e/39-projects.cy.ts
+++ b/cypress/e2e/39-projects.cy.ts
@@ -498,7 +498,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			projects
 				.getResourceMoveModal()
 				.should('be.visible')
-				.find('button:contains("Move workflow")')
+				.contains('button', 'Move workflow')
 				.should('be.disabled');
 			projects.getProjectMoveSelect().click();
 			getVisibleSelect()
@@ -506,7 +506,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 				.should('have.length', 5)
 				.filter(':contains("Project 1")')
 				.click();
-			projects.getResourceMoveModal().find('button:contains("Move workflow")').click();
+			projects.getResourceMoveModal().contains('button', 'Move workflow').click();
 			clearNotifications();
 
 			workflowsPage.getters
@@ -524,7 +524,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			projects
 				.getResourceMoveModal()
 				.should('be.visible')
-				.find('button:contains("Move workflow")')
+				.contains('button', 'Move workflow')
 				.should('be.disabled');
 			projects.getProjectMoveSelect().click();
 			getVisibleSelect()
@@ -532,7 +532,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 				.should('have.length', 5)
 				.filter(':contains("Project 2")')
 				.click();
-			projects.getResourceMoveModal().find('button:contains("Move workflow")').click();
+			projects.getResourceMoveModal().contains('button', 'Move workflow').click();
 
 			// Move the workflow from Project 2 to a member user
 			projects.getMenuItems().last().click();
@@ -544,7 +544,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			projects
 				.getResourceMoveModal()
 				.should('be.visible')
-				.find('button:contains("Move workflow")')
+				.contains('button', 'Move workflow')
 				.should('be.disabled');
 			projects.getProjectMoveSelect().click();
 			getVisibleSelect()
@@ -553,7 +553,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 				.filter(`:contains("${INSTANCE_MEMBERS[0].email}")`)
 				.click();
 
-			projects.getResourceMoveModal().find('button:contains("Move workflow")').click();
+			projects.getResourceMoveModal().contains('button', 'Move workflow').click();
 			workflowsPage.getters.workflowCards().should('have.length', 1);
 
 			// Move the workflow from member user back to Home
@@ -569,7 +569,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			projects
 				.getResourceMoveModal()
 				.should('be.visible')
-				.find('button:contains("Move workflow")')
+				.contains('button', 'Move workflow')
 				.should('be.disabled');
 			projects.getProjectMoveSelect().click();
 			getVisibleSelect()
@@ -578,7 +578,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 				.filter(`:contains("${INSTANCE_OWNER.email}")`)
 				.click();
 
-			projects.getResourceMoveModal().find('button:contains("Move workflow")').click();
+			projects.getResourceMoveModal().contains('button', 'Move workflow').click();
 			clearNotifications();
 			workflowsPage.getters
 				.workflowCards()
@@ -596,7 +596,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			projects
 				.getResourceMoveModal()
 				.should('be.visible')
-				.find('button:contains("Move credential")')
+				.contains('button', 'Move credential')
 				.should('be.disabled');
 			projects.getProjectMoveSelect().click();
 			getVisibleSelect()
@@ -604,7 +604,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 				.should('have.length', 5)
 				.filter(':contains("Project 2")')
 				.click();
-			projects.getResourceMoveModal().find('button:contains("Move credential")').click();
+			projects.getResourceMoveModal().contains('button', 'Move credential').click();
 			clearNotifications();
 			credentialsPage.getters.credentialCards().should('not.have.length');
 
@@ -619,7 +619,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			projects
 				.getResourceMoveModal()
 				.should('be.visible')
-				.find('button:contains("Move credential")')
+				.contains('button', 'Move credential')
 				.should('be.disabled');
 			projects.getProjectMoveSelect().click();
 			getVisibleSelect()
@@ -627,7 +627,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 				.should('have.length', 5)
 				.filter(`:contains("${INSTANCE_ADMIN.email}")`)
 				.click();
-			projects.getResourceMoveModal().find('button:contains("Move credential")').click();
+			projects.getResourceMoveModal().contains('button', 'Move credential').click();
 			credentialsPage.getters.credentialCards().should('have.length', 1);
 
 			// Move the credential from admin user back to instance owner
@@ -641,7 +641,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			projects
 				.getResourceMoveModal()
 				.should('be.visible')
-				.find('button:contains("Move credential")')
+				.contains('button', 'Move credential')
 				.should('be.disabled');
 			projects.getProjectMoveSelect().click();
 			getVisibleSelect()
@@ -649,7 +649,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 				.should('have.length', 5)
 				.filter(`:contains("${INSTANCE_OWNER.email}")`)
 				.click();
-			projects.getResourceMoveModal().find('button:contains("Move credential")').click();
+			projects.getResourceMoveModal().contains('button', 'Move credential').click();
 
 			clearNotifications();
 
@@ -666,7 +666,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			projects
 				.getResourceMoveModal()
 				.should('be.visible')
-				.find('button:contains("Move credential")')
+				.contains('button', 'Move credential')
 				.should('be.disabled');
 			projects.getProjectMoveSelect().click();
 			getVisibleSelect()
@@ -674,7 +674,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 				.should('have.length', 5)
 				.filter(':contains("Project 1")')
 				.click();
-			projects.getResourceMoveModal().find('button:contains("Move credential")').click();
+			projects.getResourceMoveModal().contains('button', 'Move credential').click();
 
 			projects.getMenuItems().first().click();
 			projects.getProjectTabCredentials().click();
@@ -721,7 +721,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			projects
 				.getResourceMoveModal()
 				.should('be.visible')
-				.find('button:contains("Move workflow")')
+				.contains('button', 'Move workflow')
 				.should('be.disabled');
 			projects.getProjectMoveSelect().click();
 			getVisibleSelect()
@@ -729,7 +729,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 				.should('have.length', 4)
 				.filter(':contains("Project 1")')
 				.click();
-			projects.getResourceMoveModal().find('button:contains("Move workflow")').click();
+			projects.getResourceMoveModal().contains('button', 'Move workflow').click();
 
 			workflowsPage.getters
 				.workflowCards()
diff --git a/cypress/e2e/48-subworkflow-inputs.cy.ts b/cypress/e2e/48-subworkflow-inputs.cy.ts
new file mode 100644
index 0000000000000..0e2755b9f08ba
--- /dev/null
+++ b/cypress/e2e/48-subworkflow-inputs.cy.ts
@@ -0,0 +1,288 @@
+import { clickGetBackToCanvas, getOutputTableHeaders } from '../composables/ndv';
+import {
+	clickZoomToFit,
+	navigateToNewWorkflowPage,
+	openNode,
+	pasteWorkflow,
+	saveWorkflowOnButtonClick,
+} from '../composables/workflow';
+import SUB_WORKFLOW_INPUTS from '../fixtures/Test_Subworkflow-Inputs.json';
+import { NDV, WorkflowsPage, WorkflowPage } from '../pages';
+import { errorToast, successToast } from '../pages/notifications';
+import { getVisiblePopper } from '../utils';
+
+const ndv = new NDV();
+const workflowsPage = new WorkflowsPage();
+const workflow = new WorkflowPage();
+
+const DEFAULT_WORKFLOW_NAME = 'My workflow';
+const DEFAULT_SUBWORKFLOW_NAME_1 = 'My Sub-Workflow 1';
+const DEFAULT_SUBWORKFLOW_NAME_2 = 'My Sub-Workflow 2';
+
+type FieldRow = readonly string[];
+
+const exampleFields = [
+	['aNumber', 'Number'],
+	['aString', 'String'],
+	['aArray', 'Array'],
+	['aObject', 'Object'],
+	['aAny', 'Allow Any Type'],
+	// bool last since it's not an inputField so we'll skip it for some cases
+	['aBool', 'Boolean'],
+] as const;
+
+/**
+ * Populate multiValue fixedCollections. Only supports fixedCollections for which all fields can be defined via keyboard typing
+ *
+ * @param items - 2D array of items to populate, i.e. [["myField1", "String"], [""]
+ * @param collectionName - name of the fixedCollection to populate
+ * @param offset - amount of 'parameter-input's before the fixedCollection under test
+ * @returns
+ */
+function populateFixedCollection(
+	items: readonly FieldRow[],
+	collectionName: string,
+	offset: number,
+) {
+	if (items.length === 0) return;
+	const n = items[0].length;
+	for (const [i, params] of items.entries()) {
+		ndv.actions.addItemToFixedCollection(collectionName);
+		for (const [j, param] of params.entries()) {
+			ndv.getters
+				.fixedCollectionParameter(collectionName)
+				.getByTestId('parameter-input')
+				.eq(offset + i * n + j)
+				.type(`${param}{downArrow}{enter}`);
+		}
+	}
+}
+
+function makeExample(type: TypeField) {
+	switch (type) {
+		case 'String':
+			return '"example"';
+		case 'Number':
+			return '42';
+		case 'Boolean':
+			return 'true';
+		case 'Array':
+			return '["example", 123, null]';
+		case 'Object':
+			return '{{}"example": [123]}';
+		case 'Allow Any Type':
+			return 'null';
+	}
+}
+
+type TypeField = 'Allow Any Type' | 'String' | 'Number' | 'Boolean' | 'Array' | 'Object';
+function populateFields(items: ReadonlyArray<readonly [string, TypeField]>) {
+	populateFixedCollection(items, 'workflowInputs', 1);
+}
+
+function navigateWorkflowSelectionDropdown(index: number, expectedText: string) {
+	ndv.getters.resourceLocator('workflowId').should('be.visible');
+	ndv.getters.resourceLocatorInput('workflowId').click();
+
+	getVisiblePopper().findChildByTestId('rlc-item').eq(0).should('exist');
+	getVisiblePopper()
+		.findChildByTestId('rlc-item')
+		.eq(index)
+		.find('span')
+		.should('have.text', expectedText)
+		.click();
+}
+
+function populateMapperFields(values: readonly string[], offset: number) {
+	for (const [i, value] of values.entries()) {
+		cy.getByTestId('parameter-input')
+			.eq(offset + i)
+			.type(value);
+
+		// Click on a parent to dismiss the pop up hiding the field below.
+		cy.getByTestId('parameter-input')
+			.eq(offset + i)
+			.parent()
+			.parent()
+			.click('topLeft');
+	}
+}
+
+// This function starts off in the Child Workflow Input Trigger, assuming we just defined the input fields
+// It then navigates back to the parent and validates output
+function validateAndReturnToParent(targetChild: string, offset: number, fields: string[]) {
+	ndv.actions.execute();
+
+	// + 1 to account for formatting-only column
+	getOutputTableHeaders().should('have.length', fields.length + 1);
+	for (const [i, name] of fields.entries()) {
+		getOutputTableHeaders().eq(i).should('have.text', name);
+	}
+
+	clickGetBackToCanvas();
+	saveWorkflowOnButtonClick();
+
+	cy.visit(workflowsPage.url);
+
+	workflowsPage.getters.workflowCardContent(DEFAULT_WORKFLOW_NAME).click();
+
+	openNode('Execute Workflow');
+
+	// Note that outside of e2e tests this will be pre-selected correctly.
+	// Due to our workaround to remain in the same tab we need to select the correct tab manually
+	navigateWorkflowSelectionDropdown(offset, targetChild);
+
+	// This fails, pointing to `usePushConnection` `const triggerNode = subWorkflow?.nodes.find` being `undefined.find()`I <think>
+	ndv.actions.execute();
+
+	getOutputTableHeaders().should('have.length', fields.length + 1);
+	for (const [i, name] of fields.entries()) {
+		getOutputTableHeaders().eq(i).should('have.text', name);
+	}
+
+	// todo: verify the fields appear and show the correct types
+
+	// todo: fill in the input fields (and mock previous node data in the json fixture to match)
+
+	// todo: validate the actual output data
+}
+
+function setWorkflowInputFieldValue(index: number, value: string) {
+	ndv.actions.addItemToFixedCollection('workflowInputs');
+	ndv.actions.typeIntoFixedCollectionItem('workflowInputs', index, value);
+}
+
+describe('Sub-workflow creation and typed usage', () => {
+	beforeEach(() => {
+		navigateToNewWorkflowPage();
+		pasteWorkflow(SUB_WORKFLOW_INPUTS);
+		saveWorkflowOnButtonClick();
+		clickZoomToFit();
+
+		openNode('Execute Workflow');
+
+		// Prevent sub-workflow from opening in new window
+		cy.window().then((win) => {
+			cy.stub(win, 'open').callsFake((url) => {
+				cy.visit(url);
+			});
+		});
+		navigateWorkflowSelectionDropdown(0, 'Create a new sub-workflow');
+		// **************************
+		// NAVIGATE TO CHILD WORKFLOW
+		// **************************
+
+		openNode('Workflow Input Trigger');
+	});
+
+	it('works with type-checked values', () => {
+		populateFields(exampleFields);
+
+		validateAndReturnToParent(
+			DEFAULT_SUBWORKFLOW_NAME_1,
+			1,
+			exampleFields.map((f) => f[0]),
+		);
+
+		const values = [
+			'-1', // number fields don't support `=` switch to expression, so let's test the Fixed case with it
+			...exampleFields.slice(1).map((x) => `={{}{{} $json.a${x[0]}`), // }} are added automatically
+		];
+
+		// this matches with the pinned data provided in the fixture
+		populateMapperFields(values, 2);
+
+		ndv.actions.execute();
+
+		// todo:
+		// - validate output lines up
+		// - change input to need casts
+		// - run
+		// - confirm error
+		// - switch `attemptToConvertTypes` flag
+		// - confirm success and changed output
+		// - change input to be invalid despite cast
+		// - run
+		// - confirm error
+		// - switch type option flags
+		// - run
+		// - confirm success
+		// - turn off attempt to cast flag
+		// - confirm a value was not cast
+	});
+
+	it('works with Fields input source into JSON input source', () => {
+		ndv.getters.nodeOutputHint().should('exist');
+
+		populateFields(exampleFields);
+
+		validateAndReturnToParent(
+			DEFAULT_SUBWORKFLOW_NAME_1,
+			1,
+			exampleFields.map((f) => f[0]),
+		);
+
+		cy.window().then((win) => {
+			cy.stub(win, 'open').callsFake((url) => {
+				cy.visit(url);
+			});
+		});
+		navigateWorkflowSelectionDropdown(0, 'Create a new sub-workflow');
+
+		openNode('Workflow Input Trigger');
+
+		cy.getByTestId('parameter-input').eq(0).click();
+
+		// Todo: Check if there's a better way to interact with option dropdowns
+		// This PR would add this child testId
+		getVisiblePopper()
+			.getByTestId('parameter-input')
+			.eq(0)
+			.type('Using JSON Example{downArrow}{enter}');
+
+		const exampleJson =
+			'{{}' + exampleFields.map((x) => `"${x[0]}": ${makeExample(x[1])}`).join(',') + '}';
+		cy.getByTestId('parameter-input-jsonExample')
+			.find('.cm-line')
+			.eq(0)
+			.type(`{selectAll}{backspace}${exampleJson}{enter}`);
+
+		// first one doesn't work for some reason, might need to wait for something?
+		ndv.actions.execute();
+
+		validateAndReturnToParent(
+			DEFAULT_SUBWORKFLOW_NAME_2,
+			2,
+			exampleFields.map((f) => f[0]),
+		);
+
+		// test for either InputSource mode and options combinations:
+		// + we're showing the notice in the output panel
+		// + we start with no fields
+		// + Test Step works and we create the fields
+		// + create field of each type (string, number, boolean, object, array, any)
+		// + exit ndv
+		// + save
+		// + go back to parent workflow
+		// - verify fields appear [needs Ivan's PR]
+		// - link fields [needs Ivan's PR]
+		// + run parent
+		// - verify output with `null` defaults exists
+		//
+	});
+
+	it('should show node issue when no fields are defined in manual mode', () => {
+		ndv.getters.nodeExecuteButton().should('be.disabled');
+		ndv.actions.close();
+		// Executing the workflow should show an error toast
+		workflow.actions.executeWorkflow();
+		errorToast().should('contain', 'The workflow has issues');
+		openNode('Workflow Input Trigger');
+		// Add a field to the workflowInputs fixedCollection
+		setWorkflowInputFieldValue(0, 'test');
+		// Executing the workflow should not show error now
+		ndv.actions.close();
+		workflow.actions.executeWorkflow();
+		successToast().should('contain', 'Workflow executed successfully');
+	});
+});
diff --git a/cypress/e2e/5-ndv.cy.ts b/cypress/e2e/5-ndv.cy.ts
index 96b917d4c3d47..8bad4245544c0 100644
--- a/cypress/e2e/5-ndv.cy.ts
+++ b/cypress/e2e/5-ndv.cy.ts
@@ -65,26 +65,6 @@ describe('NDV', () => {
 		cy.shouldNotHaveConsoleErrors();
 	});
 
-	it('should disconect Switch outputs if rules order was changed', () => {
-		cy.createFixtureWorkflow('NDV-test-switch_reorder.json', 'NDV test switch reorder');
-		workflowPage.actions.zoomToFit();
-
-		workflowPage.actions.executeWorkflow();
-		workflowPage.actions.openNode('Merge');
-		ndv.getters.outputPanel().contains('2 items').should('exist');
-		cy.contains('span', 'first').should('exist');
-		ndv.getters.backToCanvas().click();
-
-		workflowPage.actions.openNode('Switch');
-		cy.get('.cm-line').realMouseMove(100, 100);
-		cy.get('.fa-angle-down').click();
-		ndv.getters.backToCanvas().click();
-		workflowPage.actions.executeWorkflow();
-		workflowPage.actions.openNode('Merge');
-		ndv.getters.outputPanel().contains('2 items').should('exist');
-		cy.contains('span', 'zero').should('exist');
-	});
-
 	it('should show correct validation state for resource locator params', () => {
 		workflowPage.actions.addNodeToCanvas('Typeform', true, true);
 		ndv.getters.container().should('be.visible');
@@ -111,6 +91,7 @@ describe('NDV', () => {
 		cy.get('[class*=hasIssues]').should('have.length', 1);
 	});
 
+	// Correctly failing in V2 - node issues are only shows after execution
 	it('should show all validation errors when opening pasted node', () => {
 		cy.createFixtureWorkflow('Test_workflow_ndv_errors.json', 'Validation errors');
 		workflowPage.getters.canvasNodes().should('have.have.length', 1);
@@ -204,7 +185,7 @@ describe('NDV', () => {
 					.contains(key)
 					.should('be.visible');
 			});
-			getObjectValueItem().find('label').click({ force: true });
+			getObjectValueItem().find('.toggle').click({ force: true });
 			expandedObjectProps.forEach((key) => {
 				ndv.getters
 					.outputPanel()
@@ -213,9 +194,11 @@ describe('NDV', () => {
 					.should('not.be.visible');
 			});
 		});
+
 		it('should not display pagination for schema', () => {
 			setupSchemaWorkflow();
 			ndv.getters.backToCanvas().click();
+			workflowPage.actions.deselectAll();
 			workflowPage.getters.canvasNodeByName('Set').click();
 			workflowPage.actions.addNodeToCanvas(
 				'Customer Datastore (n8n training)',
@@ -245,8 +228,8 @@ describe('NDV', () => {
 			ndv.getters.outputPanel().find('[class*=_pagination]').should('not.exist');
 			ndv.getters
 				.outputPanel()
-				.find('[data-test-id=run-data-schema-item] [data-test-id=run-data-schema-item]')
-				.should('have.length', 20);
+				.find('[data-test-id=run-data-schema-item]')
+				.should('have.length.above', 10);
 		});
 	});
 
@@ -407,8 +390,18 @@ describe('NDV', () => {
 			return cy.get(`[data-node-placement=${position}]`);
 		}
 
+		// Correctly failing in V2 - due to floating navigation not updating the selected node
 		it('should traverse floating nodes with mouse', () => {
 			cy.createFixtureWorkflow('Floating_Nodes.json', 'Floating Nodes');
+
+			cy.ifCanvasVersion(
+				() => {},
+				() => {
+					// Needed in V2 as all nodes remain selected when clicking on a selected node
+					workflowPage.actions.deselectAll();
+				},
+			);
+
 			workflowPage.getters.canvasNodes().first().dblclick();
 			getFloatingNodeByPosition('inputMain').should('not.exist');
 			getFloatingNodeByPosition('outputMain').should('exist');
@@ -419,6 +412,7 @@ describe('NDV', () => {
 				getFloatingNodeByPosition('inputMain').should('exist');
 				getFloatingNodeByPosition('outputMain').should('exist');
 				ndv.actions.close();
+				// These two lines are broken in V2
 				workflowPage.getters.selectedNodes().should('have.length', 1);
 				workflowPage.getters
 					.selectedNodes()
@@ -426,10 +420,8 @@ describe('NDV', () => {
 					.should('contain', `Node ${i + 1}`);
 				workflowPage.getters.selectedNodes().first().dblclick();
 			});
-
 			getFloatingNodeByPosition('outputMain').click({ force: true });
 			ndv.getters.nodeNameContainer().should('contain', 'Chain');
-
 			// Traverse 4 connected node backwards
 			Array.from(Array(4).keys()).forEach((i) => {
 				getFloatingNodeByPosition('inputMain').click({ force: true });
@@ -453,8 +445,17 @@ describe('NDV', () => {
 				.should('contain', MANUAL_TRIGGER_NODE_DISPLAY_NAME);
 		});
 
+		// Correctly failing in V2 - due to floating navigation not updating the selected node
 		it('should traverse floating nodes with keyboard', () => {
 			cy.createFixtureWorkflow('Floating_Nodes.json', 'Floating Nodes');
+			cy.ifCanvasVersion(
+				() => {},
+				() => {
+					// Needed in V2 as all nodes remain selected when clicking on a selected node
+					workflowPage.actions.deselectAll();
+				},
+			);
+
 			workflowPage.getters.canvasNodes().first().dblclick();
 			getFloatingNodeByPosition('inputMain').should('not.exist');
 			getFloatingNodeByPosition('outputMain').should('exist');
@@ -465,6 +466,7 @@ describe('NDV', () => {
 				getFloatingNodeByPosition('inputMain').should('exist');
 				getFloatingNodeByPosition('outputMain').should('exist');
 				ndv.actions.close();
+				// These two lines are broken in V2
 				workflowPage.getters.selectedNodes().should('have.length', 1);
 				workflowPage.getters
 					.selectedNodes()
@@ -492,6 +494,7 @@ describe('NDV', () => {
 			getFloatingNodeByPosition('inputSub').should('not.exist');
 			getFloatingNodeByPosition('outputSub').should('not.exist');
 			ndv.actions.close();
+			// These two lines are broken in V2
 			workflowPage.getters.selectedNodes().should('have.length', 1);
 			workflowPage.getters
 				.selectedNodes()
@@ -717,6 +720,7 @@ describe('NDV', () => {
 			.should('have.value', 'Error fetching options from Notion');
 	});
 
+	// Correctly failing in V2 - NodeCreator is not opened after clicking on the link
 	it('Should open appropriate node creator after clicking on connection hint link', () => {
 		const nodeCreator = new NodeCreator();
 		const hintMapper = {
@@ -734,6 +738,7 @@ describe('NDV', () => {
 
 		Object.entries(hintMapper).forEach(([node, group]) => {
 			workflowPage.actions.openNode(node);
+			// This fails to open the NodeCreator
 			cy.get('[data-action=openSelectiveNodeCreator]').contains('Insert one').click();
 			nodeCreator.getters.activeSubcategory().should('contain', group);
 			cy.realPress('Escape');
@@ -837,4 +842,18 @@ describe('NDV', () => {
 			.contains('To search field contents rather than just names, use Table or JSON view')
 			.should('exist');
 	});
+
+	it('ADO-2931 - should handle multiple branches of the same input with the first branch empty correctly', () => {
+		cy.createFixtureWorkflow('Test_ndv_two_branches_of_same_parent_false_populated.json');
+		workflowPage.actions.zoomToFit();
+		workflowPage.actions.openNode('DebugHelper');
+		ndv.getters.inputPanel().should('be.visible');
+		ndv.getters.outputPanel().should('be.visible');
+		ndv.actions.execute();
+		// This ensures we rendered the inputPanel
+		ndv.getters
+			.inputPanel()
+			.find('[data-test-id=run-data-schema-item]')
+			.should('contain.text', 'a1');
+	});
 });
diff --git a/cypress/fixtures/Test_Subworkflow-Inputs.json b/cypress/fixtures/Test_Subworkflow-Inputs.json
new file mode 100644
index 0000000000000..aeb4d601fdeba
--- /dev/null
+++ b/cypress/fixtures/Test_Subworkflow-Inputs.json
@@ -0,0 +1,70 @@
+{
+	"meta": {
+		"instanceId": "4d0676b62208d810ef035130bbfc9fd3afdc78d963ea8ccb9514dc89066efc94"
+	},
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "bb7f8bb3-840a-464c-a7de-d3a80538c2be",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [0, 0]
+		},
+		{
+			"parameters": {
+				"workflowId": {},
+				"workflowInputs": {
+					"mappingMode": "defineBelow",
+					"value": {},
+					"matchingColumns": [],
+					"schema": [],
+					"ignoreTypeMismatchErrors": false,
+					"attemptToConvertTypes": false,
+					"convertFieldsToString": true
+				},
+				"options": {}
+			},
+			"type": "n8n-nodes-base.executeWorkflow",
+			"typeVersion": 1.2,
+			"position": [500, 240],
+			"id": "6b6e2e34-c6ab-4083-b8e3-6b0d56be5453",
+			"name": "Execute Workflow"
+		}
+	],
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Execute Workflow",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"pinData": {
+		"When clicking ‘Test workflow’": [
+			{
+				"aaString": "A String",
+				"aaNumber": 1,
+				"aaArray": [1, true, "3"],
+				"aaObject": {
+					"aKey": -1
+				},
+				"aaAny": {}
+			},
+			{
+				"aaString": "Another String",
+				"aaNumber": 2,
+				"aaArray": [],
+				"aaObject": {
+					"aDifferentKey": -1
+				},
+				"aaAny": []
+			}
+		]
+	}
+}
diff --git a/cypress/fixtures/Test_ndv_two_branches_of_same_parent_false_populated.json b/cypress/fixtures/Test_ndv_two_branches_of_same_parent_false_populated.json
new file mode 100644
index 0000000000000..056a35a786430
--- /dev/null
+++ b/cypress/fixtures/Test_ndv_two_branches_of_same_parent_false_populated.json
@@ -0,0 +1,94 @@
+{
+	"nodes": [
+		{
+			"parameters": {
+				"conditions": {
+					"options": {
+						"caseSensitive": true,
+						"leftValue": "",
+						"typeValidation": "strict",
+						"version": 2
+					},
+					"conditions": [
+						{
+							"id": "6f0cf983-824b-4339-a5de-6b374a23b4b0",
+							"leftValue": "={{ $json.a }}",
+							"rightValue": 3,
+							"operator": {
+								"type": "number",
+								"operation": "equals"
+							}
+						}
+					],
+					"combinator": "and"
+				},
+				"options": {}
+			},
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 2.2,
+			"position": [220, 0],
+			"id": "1755282a-ec4a-4d02-a833-0316ca413cc4",
+			"name": "If"
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [0, 0],
+			"id": "de1e7acf-12d8-4e56-ba42-709ffb397db2",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"category": "randomData"
+			},
+			"type": "n8n-nodes-base.debugHelper",
+			"typeVersion": 1,
+			"position": [580, 0],
+			"id": "86440d33-f833-453c-bcaa-fff7e0083501",
+			"name": "DebugHelper",
+			"alwaysOutputData": true
+		}
+	],
+	"connections": {
+		"If": {
+			"main": [
+				[
+					{
+						"node": "DebugHelper",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "DebugHelper",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "If",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"pinData": {
+		"When clicking ‘Test workflow’": [
+			{
+				"a": 1
+			},
+			{
+				"a": 2
+			}
+		]
+	}
+}
diff --git a/cypress/package.json b/cypress/package.json
index 832abd9ef58d8..26b585408b84a 100644
--- a/cypress/package.json
+++ b/cypress/package.json
@@ -6,6 +6,7 @@
     "cypress:install": "cypress install",
     "test:e2e:ui": "scripts/run-e2e.js ui",
     "test:e2e:dev": "scripts/run-e2e.js dev",
+    "test:e2e:dev:v2": "scripts/run-e2e.js dev:v2",
     "test:e2e:all": "scripts/run-e2e.js all",
     "format": "biome format --write .",
     "format:check": "biome ci .",
diff --git a/cypress/pages/credentials.ts b/cypress/pages/credentials.ts
index d5fa9cc0b1a54..08b2fee9c7dbc 100644
--- a/cypress/pages/credentials.ts
+++ b/cypress/pages/credentials.ts
@@ -6,48 +6,10 @@ export class CredentialsPage extends BasePage {
 	getters = {
 		emptyListCreateCredentialButton: () => cy.getByTestId('empty-resources-list').find('button'),
 		createCredentialButton: () => {
-			cy.getByTestId('resource-add').should('be.visible').click();
-			cy.getByTestId('resource-add')
-				.find('.el-sub-menu__title')
-				.as('menuitem')
-				.should('have.attr', 'aria-describedby');
-
-			cy.get('@menuitem')
-				.should('be.visible')
-				.invoke('attr', 'aria-describedby')
-				.then((el) => cy.get(`[id="${el}"]`))
-				.as('submenu');
-
-			cy.get('@submenu')
-				.should('be.visible')
-				.within((submenu) => {
-					// If submenu has another submenu
-					if (submenu.find('[data-test-id="navigation-submenu"]').length) {
-						cy.wrap(submenu)
-							.find('[data-test-id="navigation-submenu"]')
-							.should('be.visible')
-							.filter(':contains("Credential")')
-							.as('child')
-							.click();
-
-						cy.get('@child')
-							.should('be.visible')
-							.find('[data-test-id="navigation-submenu-item"]')
-							.should('be.visible')
-							.filter(':contains("Personal")')
-							.as('button');
-					} else {
-						cy.wrap(submenu)
-							.find('[data-test-id="navigation-menu-item"]')
-							.filter(':contains("Credential")')
-							.as('button');
-					}
-				});
-
-			return cy.get('@button').should('be.visible');
+			cy.getByTestId('add-resource').should('be.visible').click();
+			cy.getByTestId('add-resource').getByTestId('action-credential').should('be.visible');
+			return cy.getByTestId('add-resource').getByTestId('action-credential');
 		},
-
-		// cy.getByTestId('resources-list-add'),
 		searchInput: () => cy.getByTestId('resources-list-search'),
 		emptyList: () => cy.getByTestId('resources-list-empty'),
 		credentialCards: () => cy.getByTestId('resources-list-item'),
diff --git a/cypress/pages/ndv.ts b/cypress/pages/ndv.ts
index 516a0a1ea862c..1926ef0ad17bf 100644
--- a/cypress/pages/ndv.ts
+++ b/cypress/pages/ndv.ts
@@ -227,9 +227,6 @@ export class NDV extends BasePage {
 			this.getters.inputSelect().find('.el-select').click();
 			this.getters.inputOption().contains(nodeName).click();
 		},
-		expandSchemaViewNode: (nodeName: string) => {
-			this.getters.schemaViewNodeName().contains(nodeName).click();
-		},
 		addDefaultPinnedData: () => {
 			this.actions.editPinnedData();
 			this.actions.savePinnedData();
@@ -323,6 +320,11 @@ export class NDV extends BasePage {
 		addItemToFixedCollection: (paramName: string) => {
 			this.getters.fixedCollectionParameter(paramName).getByTestId('fixed-collection-add').click();
 		},
+		typeIntoFixedCollectionItem: (fixedCollectionName: string, index: number, content: string) => {
+			this.getters.fixedCollectionParameter(fixedCollectionName).within(() => {
+				cy.getByTestId('parameter-input').eq(index).type(content);
+			});
+		},
 		dragMainPanelToLeft: () => {
 			cy.drag('[data-test-id=panel-drag-button]', [-1000, 0], { moveTwice: true });
 		},
diff --git a/cypress/pages/workflow-executions-tab.ts b/cypress/pages/workflow-executions-tab.ts
index 5e8c36c055552..be022e6cdf789 100644
--- a/cypress/pages/workflow-executions-tab.ts
+++ b/cypress/pages/workflow-executions-tab.ts
@@ -30,6 +30,12 @@ export class WorkflowExecutionsTab extends BasePage {
 
 	actions = {
 		toggleNodeEnabled: (nodeName: string) => {
+			cy.ifCanvasVersion(
+				() => {},
+				() => {
+					cy.get('body').click(); // Cancel selection if it exists
+				},
+			);
 			workflowPage.getters.canvasNodeByName(nodeName).click();
 			cy.get('body').type('d', { force: true });
 		},
diff --git a/cypress/pages/workflow.ts b/cypress/pages/workflow.ts
index ee90fa55e8043..e99b01aa4612c 100644
--- a/cypress/pages/workflow.ts
+++ b/cypress/pages/workflow.ts
@@ -1,6 +1,7 @@
 import { BasePage } from './base';
 import { NodeCreator } from './features/node-creator';
 import { META_KEY } from '../constants';
+import type { OpenContextMenuOptions } from '../types';
 import { getVisibleSelect } from '../utils';
 import { getUniqueWorkflowName, isCanvasV2 } from '../utils/workflowUtils';
 
@@ -31,7 +32,11 @@ export class WorkflowPage extends BasePage {
 		canvasNodes: () =>
 			cy.ifCanvasVersion(
 				() => cy.getByTestId('canvas-node'),
-				() => cy.getByTestId('canvas-node').not('[data-node-type="n8n-nodes-internal.addNodes"]'),
+				() =>
+					cy
+						.getByTestId('canvas-node')
+						.not('[data-node-type="n8n-nodes-internal.addNodes"]')
+						.not('[data-node-type="n8n-nodes-base.stickyNote"]'),
 			),
 		canvasNodeByName: (nodeName: string) =>
 			this.getters.canvasNodes().filter(`:contains(${nodeName})`),
@@ -96,7 +101,7 @@ export class WorkflowPage extends BasePage {
 		disabledNodes: () =>
 			cy.ifCanvasVersion(
 				() => cy.get('.node-box.disabled'),
-				() => cy.get('[data-test-id="canvas-trigger-node"][class*="disabled"]'),
+				() => cy.get('[data-test-id*="node"][class*="disabled"]'),
 			),
 		selectedNodes: () =>
 			cy.ifCanvasVersion(
@@ -272,14 +277,14 @@ export class WorkflowPage extends BasePage {
 		},
 		openContextMenu: (
 			nodeTypeName?: string,
-			method: 'right-click' | 'overflow-button' = 'right-click',
+			{ method = 'right-click', anchor = 'center' }: OpenContextMenuOptions = {},
 		) => {
 			const target = nodeTypeName
 				? this.getters.canvasNodeByName(nodeTypeName)
 				: this.getters.nodeViewBackground();
 
 			if (method === 'right-click') {
-				target.rightclick(nodeTypeName ? 'center' : 'topLeft', { force: true });
+				target.rightclick(nodeTypeName ? anchor : 'topLeft', { force: true });
 			} else {
 				target.realHover();
 				target.find('[data-test-id="overflow-node-button"]').click({ force: true });
@@ -296,8 +301,8 @@ export class WorkflowPage extends BasePage {
 			this.actions.openContextMenu(nodeTypeName);
 			this.actions.contextMenuAction('delete');
 		},
-		executeNode: (nodeTypeName: string) => {
-			this.actions.openContextMenu(nodeTypeName);
+		executeNode: (nodeTypeName: string, options?: OpenContextMenuOptions) => {
+			this.actions.openContextMenu(nodeTypeName, options);
 			this.actions.contextMenuAction('execute');
 		},
 		addStickyFromContextMenu: () => {
@@ -324,7 +329,7 @@ export class WorkflowPage extends BasePage {
 			this.actions.contextMenuAction('toggle_pin');
 		},
 		openNodeFromContextMenu: (nodeTypeName: string) => {
-			this.actions.openContextMenu(nodeTypeName, 'overflow-button');
+			this.actions.openContextMenu(nodeTypeName, { method: 'overflow-button' });
 			this.actions.contextMenuAction('open');
 		},
 		selectAllFromContextMenu: () => {
@@ -332,8 +337,14 @@ export class WorkflowPage extends BasePage {
 			this.actions.contextMenuAction('select_all');
 		},
 		deselectAll: () => {
-			this.actions.openContextMenu();
-			this.actions.contextMenuAction('deselect_all');
+			cy.ifCanvasVersion(
+				() => {
+					this.actions.openContextMenu();
+					this.actions.contextMenuAction('deselect_all');
+				},
+				// rightclick doesn't work with vueFlow canvas
+				() => this.getters.nodeViewBackground().click('topLeft'),
+			);
 		},
 		openExpressionEditorModal: () => {
 			cy.contains('Expression').invoke('show').click();
diff --git a/cypress/pages/workflows.ts b/cypress/pages/workflows.ts
index 41f62e8bc3a89..a58911a3550f5 100644
--- a/cypress/pages/workflows.ts
+++ b/cypress/pages/workflows.ts
@@ -8,45 +8,8 @@ export class WorkflowsPage extends BasePage {
 		newWorkflowTemplateCard: () => cy.getByTestId('new-workflow-template-card'),
 		searchBar: () => cy.getByTestId('resources-list-search'),
 		createWorkflowButton: () => {
-			cy.getByTestId('resource-add').should('be.visible').click();
-			cy.getByTestId('resource-add')
-				.find('.el-sub-menu__title')
-				.as('menuitem')
-				.should('have.attr', 'aria-describedby');
-
-			cy.get('@menuitem')
-				.should('be.visible')
-				.invoke('attr', 'aria-describedby')
-				.then((el) => cy.get(`[id="${el}"]`))
-				.as('submenu');
-
-			cy.get('@submenu')
-				.should('be.visible')
-				.within((submenu) => {
-					// If submenu has another submenu
-					if (submenu.find('[data-test-id="navigation-submenu"]').length) {
-						cy.wrap(submenu)
-							.find('[data-test-id="navigation-submenu"]')
-							.should('be.visible')
-							.filter(':contains("Workflow")')
-							.as('child')
-							.click();
-
-						cy.get('@child')
-							.should('be.visible')
-							.find('[data-test-id="navigation-submenu-item"]')
-							.should('be.visible')
-							.filter(':contains("Personal")')
-							.as('button');
-					} else {
-						cy.wrap(submenu)
-							.find('[data-test-id="navigation-menu-item"]')
-							.filter(':contains("Workflow")')
-							.as('button');
-					}
-				});
-
-			return cy.get('@button').should('be.visible');
+			cy.getByTestId('add-resource-workflow').should('be.visible');
+			return cy.getByTestId('add-resource-workflow');
 		},
 		workflowCards: () => cy.getByTestId('resources-list-item'),
 		workflowCard: (workflowName: string) =>
diff --git a/cypress/scripts/run-e2e.js b/cypress/scripts/run-e2e.js
index 8096a70caf4f4..6819d6c824c8d 100755
--- a/cypress/scripts/run-e2e.js
+++ b/cypress/scripts/run-e2e.js
@@ -57,6 +57,17 @@ switch (scenario) {
 			},
 		});
 		break;
+	case 'dev:v2':
+		runTests({
+			startCommand: 'develop',
+			url: 'http://localhost:8080/favicon.ico',
+			testCommand: 'cypress open',
+			customEnv: {
+				CYPRESS_NODE_VIEW_VERSION: 2,
+				CYPRESS_BASE_URL: 'http://localhost:8080',
+			},
+		});
+		break;
 	case 'all':
 		const specSuiteFilter = process.argv[3];
 		const specParam = specSuiteFilter ? ` --spec **/*${specSuiteFilter}*` : '';
diff --git a/cypress/types.ts b/cypress/types.ts
index 6186c4201d405..63f2ddb99e703 100644
--- a/cypress/types.ts
+++ b/cypress/types.ts
@@ -22,3 +22,8 @@ export interface ExecutionResponse {
 		results: Execution[];
 	};
 }
+
+export type OpenContextMenuOptions = {
+	method?: 'right-click' | 'overflow-button';
+	anchor?: 'topRight' | 'topLeft' | 'center' | 'bottomRight' | 'bottomLeft';
+};
diff --git a/docker/images/n8n-custom/Dockerfile b/docker/images/n8n-custom/Dockerfile
index 2b72365eb82f3..13592140a4e07 100644
--- a/docker/images/n8n-custom/Dockerfile
+++ b/docker/images/n8n-custom/Dockerfile
@@ -33,7 +33,7 @@ COPY docker/images/n8n/docker-entrypoint.sh /
 
 # Setup the Task Runner Launcher
 ARG TARGETPLATFORM
-ARG LAUNCHER_VERSION=1.0.0
+ARG LAUNCHER_VERSION=1.1.0
 COPY docker/images/n8n/n8n-task-runners.json /etc/n8n-task-runners.json
 # Download, verify, then extract the launcher binary
 RUN \
diff --git a/docker/images/n8n/Dockerfile b/docker/images/n8n/Dockerfile
index 740773618536e..10720c63f20e3 100644
--- a/docker/images/n8n/Dockerfile
+++ b/docker/images/n8n/Dockerfile
@@ -24,7 +24,7 @@ RUN set -eux; \
 
 # Setup the Task Runner Launcher
 ARG TARGETPLATFORM
-ARG LAUNCHER_VERSION=1.0.0
+ARG LAUNCHER_VERSION=1.1.0
 COPY n8n-task-runners.json /etc/n8n-task-runners.json
 # Download, verify, then extract the launcher binary
 RUN \
diff --git a/docker/images/n8n/n8n-task-runners.json b/docker/images/n8n/n8n-task-runners.json
index d9575997c0995..c64d0ecdd04a5 100644
--- a/docker/images/n8n/n8n-task-runners.json
+++ b/docker/images/n8n/n8n-task-runners.json
@@ -12,6 +12,7 @@
 				"N8N_RUNNERS_TASK_BROKER_URI",
 				"N8N_RUNNERS_MAX_PAYLOAD",
 				"N8N_RUNNERS_MAX_CONCURRENCY",
+				"N8N_RUNNERS_TASK_TIMEOUT",
 				"N8N_RUNNERS_HEALTH_CHECK_SERVER_ENABLED",
 				"N8N_RUNNERS_HEALTH_CHECK_SERVER_HOST",
 				"N8N_RUNNERS_HEALTH_CHECK_SERVER_PORT",
diff --git a/package.json b/package.json
index e2a06287736b6..063accd8558ca 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,12 @@
 {
   "name": "n8n-monorepo",
-  "version": "1.71.0",
+  "version": "1.73.0",
   "private": true,
   "engines": {
     "node": ">=20.15",
-    "pnpm": ">=9.5"
+    "pnpm": ">=9.15"
   },
-  "packageManager": "pnpm@9.6.0",
+  "packageManager": "pnpm@9.15.1",
   "scripts": {
     "prepare": "node scripts/prepare.mjs",
     "preinstall": "node scripts/block-npm-install.js",
diff --git a/packages/@n8n/api-types/package.json b/packages/@n8n/api-types/package.json
index 9f045e31d4926..c14e18992236e 100644
--- a/packages/@n8n/api-types/package.json
+++ b/packages/@n8n/api-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/api-types",
-  "version": "0.9.0",
+  "version": "0.11.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
diff --git a/packages/@n8n/api-types/src/dto/index.ts b/packages/@n8n/api-types/src/dto/index.ts
index 41a55f050a358..97d5d38459b4d 100644
--- a/packages/@n8n/api-types/src/dto/index.ts
+++ b/packages/@n8n/api-types/src/dto/index.ts
@@ -3,3 +3,4 @@ export { RoleChangeRequestDto } from './user/role-change-request.dto';
 export { SettingsUpdateRequestDto } from './user/settings-update-request.dto';
 export { UserUpdateRequestDto } from './user/user-update-request.dto';
 export { CommunityRegisteredRequestDto } from './license/community-registered-request.dto';
+export { VariableListRequestDto } from './variables/variables-list-request.dto';
diff --git a/packages/@n8n/api-types/src/dto/variables/variables-list-request.dto.ts b/packages/@n8n/api-types/src/dto/variables/variables-list-request.dto.ts
new file mode 100644
index 0000000000000..804bcb27865e9
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/variables/variables-list-request.dto.ts
@@ -0,0 +1,6 @@
+import { z } from 'zod';
+import { Z } from 'zod-class';
+
+export class VariableListRequestDto extends Z.class({
+	state: z.literal('empty').optional(),
+}) {}
diff --git a/packages/@n8n/api-types/src/frontend-settings.ts b/packages/@n8n/api-types/src/frontend-settings.ts
index 00b87b968eeb9..1fe0fcd85798c 100644
--- a/packages/@n8n/api-types/src/frontend-settings.ts
+++ b/packages/@n8n/api-types/src/frontend-settings.ts
@@ -172,6 +172,5 @@ export interface FrontendSettings {
 		blockFileAccessToN8nFiles: boolean;
 	};
 	betaFeatures: FrontendBetaFeatures[];
-	virtualSchemaView: boolean;
 	easyAIWorkflowOnboarded: boolean;
 }
diff --git a/packages/@n8n/benchmark/src/n8n-api-client/n8n-api-client.ts b/packages/@n8n/benchmark/src/n8n-api-client/n8n-api-client.ts
index dd81fa9cfbd50..aa3ce82a965f0 100644
--- a/packages/@n8n/benchmark/src/n8n-api-client/n8n-api-client.ts
+++ b/packages/@n8n/benchmark/src/n8n-api-client/n8n-api-client.ts
@@ -2,7 +2,7 @@ import type { AxiosError, AxiosRequestConfig } from 'axios';
 import axios from 'axios';
 
 export class N8nApiClient {
-	constructor(public readonly apiBaseUrl: string) {}
+	constructor(readonly apiBaseUrl: string) {}
 
 	async waitForInstanceToBecomeOnline(): Promise<void> {
 		const HEALTH_ENDPOINT = 'healthz';
diff --git a/packages/@n8n/chat/package.json b/packages/@n8n/chat/package.json
index 4cc32dc8fe6bc..1db1c50f9a107 100644
--- a/packages/@n8n/chat/package.json
+++ b/packages/@n8n/chat/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/chat",
-  "version": "0.32.0",
+  "version": "0.33.0",
   "scripts": {
     "dev": "pnpm run storybook",
     "build": "pnpm build:vite && pnpm build:bundle",
diff --git a/packages/@n8n/config/package.json b/packages/@n8n/config/package.json
index 8ba9cc43bf33a..c4368a75c555b 100644
--- a/packages/@n8n/config/package.json
+++ b/packages/@n8n/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/config",
-  "version": "1.21.0",
+  "version": "1.23.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
diff --git a/packages/@n8n/config/src/configs/executions.config.ts b/packages/@n8n/config/src/configs/executions.config.ts
index 8c5d91b3c8f9c..977d53992004d 100644
--- a/packages/@n8n/config/src/configs/executions.config.ts
+++ b/packages/@n8n/config/src/configs/executions.config.ts
@@ -6,7 +6,7 @@ class PruningIntervalsConfig {
 	@Env('EXECUTIONS_DATA_PRUNE_HARD_DELETE_INTERVAL')
 	hardDelete: number = 15;
 
-	/** How often (minutes) execution data should be soft-deleted */
+	/** How often (minutes) execution data should be soft-deleted. */
 	@Env('EXECUTIONS_DATA_PRUNE_SOFT_DELETE_INTERVAL')
 	softDelete: number = 60;
 }
diff --git a/packages/@n8n/config/src/configs/runners.config.ts b/packages/@n8n/config/src/configs/runners.config.ts
index 06e262fe49249..733e72440826f 100644
--- a/packages/@n8n/config/src/configs/runners.config.ts
+++ b/packages/@n8n/config/src/configs/runners.config.ts
@@ -43,11 +43,11 @@ export class TaskRunnersConfig {
 	@Env('N8N_RUNNERS_MAX_CONCURRENCY')
 	maxConcurrency: number = 5;
 
-	/** How long (in seconds) a task is allowed to take for completion, else the task will be aborted and the runner restarted. Must be greater than 0. */
+	/** How long (in seconds) a task is allowed to take for completion, else the task will be aborted. (In internal mode, the runner will also be restarted.) Must be greater than 0. */
 	@Env('N8N_RUNNERS_TASK_TIMEOUT')
 	taskTimeout: number = 60;
 
-	/** How often (in seconds) the runner must send a heartbeat to the broker, else the task will be aborted and the runner restarted. Must be greater than 0. */
+	/** How often (in seconds) the runner must send a heartbeat to the broker, else the task will be aborted. (In internal mode, the runner will also  be restarted.) Must be greater than 0. */
 	@Env('N8N_RUNNERS_HEARTBEAT_INTERVAL')
 	heartbeatInterval: number = 30;
 }
diff --git a/packages/@n8n/nodes-langchain/.eslintrc.js b/packages/@n8n/nodes-langchain/.eslintrc.js
index 7ea76b12a9673..510b970755d4f 100644
--- a/packages/@n8n/nodes-langchain/.eslintrc.js
+++ b/packages/@n8n/nodes-langchain/.eslintrc.js
@@ -15,7 +15,6 @@ module.exports = {
 		eqeqeq: 'warn',
 		'id-denylist': 'warn',
 		'import/extensions': 'warn',
-		'import/order': 'warn',
 		'prefer-spread': 'warn',
 
 		'@typescript-eslint/naming-convention': ['error', { selector: 'memberLike', format: null }],
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/Agent.node.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/Agent.node.ts
index 80e5da9cfacce..230a6ddc6ed37 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/Agent.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/Agent.node.ts
@@ -9,6 +9,8 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
+import { promptTypeOptions, textFromPreviousNode, textInput } from '@utils/descriptions';
+
 import { conversationalAgentProperties } from './agents/ConversationalAgent/description';
 import { conversationalAgentExecute } from './agents/ConversationalAgent/execute';
 import { openAiFunctionsAgentProperties } from './agents/OpenAiFunctionsAgent/description';
@@ -21,7 +23,6 @@ import { sqlAgentAgentProperties } from './agents/SqlAgent/description';
 import { sqlAgentAgentExecute } from './agents/SqlAgent/execute';
 import { toolsAgentProperties } from './agents/ToolsAgent/description';
 import { toolsAgentExecute } from './agents/ToolsAgent/execute';
-import { promptTypeOptions, textFromPreviousNode, textInput } from '../../../utils/descriptions';
 
 // Function used in the inputs expression to figure out which inputs to
 // display based on the agent type
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ConversationalAgent/description.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ConversationalAgent/description.ts
index c3507b328c9a7..0a65f4919c19a 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ConversationalAgent/description.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ConversationalAgent/description.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { SYSTEM_MESSAGE, HUMAN_MESSAGE } from './prompt';
 
 export const conversationalAgentProperties: INodeProperties[] = [
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ConversationalAgent/execute.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ConversationalAgent/execute.ts
index 09e04c0b76326..04a565971c057 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ConversationalAgent/execute.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ConversationalAgent/execute.ts
@@ -6,14 +6,11 @@ import { CombiningOutputParser } from 'langchain/output_parsers';
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import {
-	isChatInstance,
-	getPromptInputByType,
-	getConnectedTools,
-} from '../../../../../utils/helpers';
-import { getOptionalOutputParsers } from '../../../../../utils/output_parsers/N8nOutputParser';
-import { throwIfToolSchema } from '../../../../../utils/schemaParsing';
-import { getTracingConfig } from '../../../../../utils/tracing';
+import { isChatInstance, getPromptInputByType, getConnectedTools } from '@utils/helpers';
+import { getOptionalOutputParsers } from '@utils/output_parsers/N8nOutputParser';
+import { throwIfToolSchema } from '@utils/schemaParsing';
+import { getTracingConfig } from '@utils/tracing';
+
 import { checkForStructuredTools, extractParsedOutput } from '../utils';
 
 export async function conversationalAgentExecute(
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/OpenAiFunctionsAgent/description.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/OpenAiFunctionsAgent/description.ts
index 40f9ad1945b74..0a0f6ac55edd4 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/OpenAiFunctionsAgent/description.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/OpenAiFunctionsAgent/description.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { SYSTEM_MESSAGE } from './prompt';
 
 export const openAiFunctionsAgentProperties: INodeProperties[] = [
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/OpenAiFunctionsAgent/execute.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/OpenAiFunctionsAgent/execute.ts
index a9b324678c911..17a2d43590a10 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/OpenAiFunctionsAgent/execute.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/OpenAiFunctionsAgent/execute.ts
@@ -12,9 +12,10 @@ import {
 	NodeOperationError,
 } from 'n8n-workflow';
 
-import { getConnectedTools, getPromptInputByType } from '../../../../../utils/helpers';
-import { getOptionalOutputParsers } from '../../../../../utils/output_parsers/N8nOutputParser';
-import { getTracingConfig } from '../../../../../utils/tracing';
+import { getConnectedTools, getPromptInputByType } from '@utils/helpers';
+import { getOptionalOutputParsers } from '@utils/output_parsers/N8nOutputParser';
+import { getTracingConfig } from '@utils/tracing';
+
 import { extractParsedOutput } from '../utils';
 
 export async function openAiFunctionsAgentExecute(
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/PlanAndExecuteAgent/description.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/PlanAndExecuteAgent/description.ts
index 608f9e9def135..8dcb8f838560d 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/PlanAndExecuteAgent/description.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/PlanAndExecuteAgent/description.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { DEFAULT_STEP_EXECUTOR_HUMAN_CHAT_MESSAGE_TEMPLATE } from './prompt';
 
 export const planAndExecuteAgentProperties: INodeProperties[] = [
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/PlanAndExecuteAgent/execute.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/PlanAndExecuteAgent/execute.ts
index d2dc152ebbf8d..379475f9235a0 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/PlanAndExecuteAgent/execute.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/PlanAndExecuteAgent/execute.ts
@@ -10,10 +10,11 @@ import {
 	NodeOperationError,
 } from 'n8n-workflow';
 
-import { getConnectedTools, getPromptInputByType } from '../../../../../utils/helpers';
-import { getOptionalOutputParsers } from '../../../../../utils/output_parsers/N8nOutputParser';
-import { throwIfToolSchema } from '../../../../../utils/schemaParsing';
-import { getTracingConfig } from '../../../../../utils/tracing';
+import { getConnectedTools, getPromptInputByType } from '@utils/helpers';
+import { getOptionalOutputParsers } from '@utils/output_parsers/N8nOutputParser';
+import { throwIfToolSchema } from '@utils/schemaParsing';
+import { getTracingConfig } from '@utils/tracing';
+
 import { checkForStructuredTools, extractParsedOutput } from '../utils';
 
 export async function planAndExecuteAgentExecute(
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/description.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/description.ts
index f95026f7a42e3..890d83dc4a419 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/description.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/description.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { HUMAN_MESSAGE_TEMPLATE, PREFIX, SUFFIX, SUFFIX_CHAT } from './prompt';
 
 export const reActAgentAgentProperties: INodeProperties[] = [
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/execute.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/execute.ts
index b671a8189ced4..4db35634d6c96 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/execute.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/execute.ts
@@ -11,14 +11,11 @@ import {
 	NodeOperationError,
 } from 'n8n-workflow';
 
-import {
-	getConnectedTools,
-	getPromptInputByType,
-	isChatInstance,
-} from '../../../../../utils/helpers';
-import { getOptionalOutputParsers } from '../../../../../utils/output_parsers/N8nOutputParser';
-import { throwIfToolSchema } from '../../../../../utils/schemaParsing';
-import { getTracingConfig } from '../../../../../utils/tracing';
+import { getConnectedTools, getPromptInputByType, isChatInstance } from '@utils/helpers';
+import { getOptionalOutputParsers } from '@utils/output_parsers/N8nOutputParser';
+import { throwIfToolSchema } from '@utils/schemaParsing';
+import { getTracingConfig } from '@utils/tracing';
+
 import { checkForStructuredTools, extractParsedOutput } from '../utils';
 
 export async function reActAgentAgentExecute(
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/description.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/description.ts
index bed547ba6da2f..919f501d17314 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/description.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/description.ts
@@ -1,11 +1,8 @@
 import type { INodeProperties } from 'n8n-workflow';
 
+import { promptTypeOptions, textFromPreviousNode, textInput } from '@utils/descriptions';
+
 import { SQL_PREFIX, SQL_SUFFIX } from './other/prompts';
-import {
-	promptTypeOptions,
-	textFromPreviousNode,
-	textInput,
-} from '../../../../../utils/descriptions';
 
 const dataSourceOptions: INodeProperties = {
 	displayName: 'Data Source',
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/execute.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/execute.ts
index b9c0f3db8ee9b..369ca109af497 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/execute.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/execute.ts
@@ -12,12 +12,13 @@ import {
 	type IDataObject,
 } from 'n8n-workflow';
 
+import { getPromptInputByType, serializeChatHistory } from '@utils/helpers';
+import { getTracingConfig } from '@utils/tracing';
+
 import { getMysqlDataSource } from './other/handlers/mysql';
 import { getPostgresDataSource } from './other/handlers/postgres';
 import { getSqliteDataSource } from './other/handlers/sqlite';
 import { SQL_PREFIX, SQL_SUFFIX } from './other/prompts';
-import { getPromptInputByType, serializeChatHistory } from '../../../../../utils/helpers';
-import { getTracingConfig } from '../../../../../utils/tracing';
 
 const parseTablesString = (tablesString: string) =>
 	tablesString
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/mysql.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/mysql.ts
index ea1b360f046fe..dd56f93d6ca74 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/mysql.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/mysql.ts
@@ -1,5 +1,5 @@
-import { type IExecuteFunctions } from 'n8n-workflow';
 import { DataSource } from '@n8n/typeorm';
+import { type IExecuteFunctions } from 'n8n-workflow';
 
 export async function getMysqlDataSource(this: IExecuteFunctions): Promise<DataSource> {
 	const credentials = await this.getCredentials('mySql');
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/postgres.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/postgres.ts
index 6971d9119f27a..31dda9ed72821 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/postgres.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/postgres.ts
@@ -1,5 +1,5 @@
-import { type IExecuteFunctions } from 'n8n-workflow';
 import { DataSource } from '@n8n/typeorm';
+import { type IExecuteFunctions } from 'n8n-workflow';
 
 export async function getPostgresDataSource(this: IExecuteFunctions): Promise<DataSource> {
 	const credentials = await this.getCredentials('postgres');
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/sqlite.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/sqlite.ts
index 9240feb280b19..31db7b0dcae4f 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/sqlite.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/sqlite.ts
@@ -1,9 +1,9 @@
+import { DataSource } from '@n8n/typeorm';
 import * as fs from 'fs';
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { BINARY_ENCODING, NodeOperationError } from 'n8n-workflow';
-import * as temp from 'temp';
 import * as sqlite3 from 'sqlite3';
-import { DataSource } from '@n8n/typeorm';
+import * as temp from 'temp';
 
 export async function getSqliteDataSource(
 	this: IExecuteFunctions,
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ToolsAgent/description.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ToolsAgent/description.ts
index cb33560cc6755..06b64a91de61c 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ToolsAgent/description.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ToolsAgent/description.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { SYSTEM_MESSAGE } from './prompt';
 
 export const toolsAgentProperties: INodeProperties[] = [
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ToolsAgent/execute.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ToolsAgent/execute.ts
index 74d68199618f2..b0e36d0d8b327 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ToolsAgent/execute.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ToolsAgent/execute.ts
@@ -14,16 +14,13 @@ import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import type { ZodObject } from 'zod';
 import { z } from 'zod';
 
-import { SYSTEM_MESSAGE } from './prompt';
-import {
-	isChatInstance,
-	getPromptInputByType,
-	getConnectedTools,
-} from '../../../../../utils/helpers';
+import { isChatInstance, getPromptInputByType, getConnectedTools } from '@utils/helpers';
 import {
 	getOptionalOutputParsers,
 	type N8nOutputParser,
-} from '../../../../../utils/output_parsers/N8nOutputParser';
+} from '@utils/output_parsers/N8nOutputParser';
+
+import { SYSTEM_MESSAGE } from './prompt';
 
 function getOutputParserSchema(outputParser: N8nOutputParser): ZodObject<any, any, any, any> {
 	const schema =
@@ -33,7 +30,7 @@ function getOutputParserSchema(outputParser: N8nOutputParser): ZodObject<any, an
 }
 
 async function extractBinaryMessages(ctx: IExecuteFunctions) {
-	const binaryData = ctx.getInputData(0, 'main')?.[0]?.binary ?? {};
+	const binaryData = ctx.getInputData()?.[0]?.binary ?? {};
 	const binaryMessages = await Promise.all(
 		Object.values(binaryData)
 			.filter((data) => data.mimeType.startsWith('image/'))
@@ -260,7 +257,7 @@ export async function toolsAgentExecute(this: IExecuteFunctions): Promise<INodeE
 		['human', '{input}'],
 	];
 
-	const hasBinaryData = this.getInputData(0, 'main')?.[0]?.binary !== undefined;
+	const hasBinaryData = this.getInputData()?.[0]?.binary !== undefined;
 	if (hasBinaryData && passthroughBinaryImages) {
 		const binaryMessage = await extractBinaryMessages(this);
 		messages.push(binaryMessage);
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/utils.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/utils.ts
index 144b622c76fe3..991b5895a7b4c 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/utils.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/utils.ts
@@ -1,7 +1,7 @@
-import type { z } from 'zod';
 import type { BaseOutputParser } from '@langchain/core/output_parsers';
 import type { DynamicStructuredTool, Tool } from 'langchain/tools';
 import { NodeOperationError, type IExecuteFunctions, type INode } from 'n8n-workflow';
+import type { z } from 'zod';
 
 type ZodObjectAny = z.ZodObject<any, any, any, any>;
 
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/OpenAiAssistant/OpenAiAssistant.node.ts b/packages/@n8n/nodes-langchain/nodes/agents/OpenAiAssistant/OpenAiAssistant.node.ts
index ca42323fc336c..e44ad8f9d231d 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/OpenAiAssistant/OpenAiAssistant.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/OpenAiAssistant/OpenAiAssistant.node.ts
@@ -10,9 +10,10 @@ import type {
 } from 'n8n-workflow';
 import { OpenAI as OpenAIClient } from 'openai';
 
+import { getConnectedTools } from '@utils/helpers';
+import { getTracingConfig } from '@utils/tracing';
+
 import { formatToOpenAIAssistantTool } from './utils';
-import { getConnectedTools } from '../../../utils/helpers';
-import { getTracingConfig } from '../../../utils/tracing';
 
 export class OpenAiAssistant implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/OpenAiAssistant/utils.ts b/packages/@n8n/nodes-langchain/nodes/agents/OpenAiAssistant/utils.ts
index 294fc47847f0f..d0db590bc3f41 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/OpenAiAssistant/utils.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/OpenAiAssistant/utils.ts
@@ -1,6 +1,6 @@
-import { zodToJsonSchema } from 'zod-to-json-schema';
-import type { OpenAIClient } from '@langchain/openai';
 import type { StructuredTool } from '@langchain/core/tools';
+import type { OpenAIClient } from '@langchain/openai';
+import { zodToJsonSchema } from 'zod-to-json-schema';
 
 // Copied from langchain(`langchain/src/tools/convert_to_openai.ts`)
 // since these functions are not exported
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/ChainLlm.node.ts b/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/ChainLlm.node.ts
index 32d70f2d3208d..4b2ddf5db98fb 100644
--- a/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/ChainLlm.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/ChainLlm.node.ts
@@ -27,16 +27,17 @@ import {
 	NodeOperationError,
 } from 'n8n-workflow';
 
-import { getPromptInputByType, isChatInstance } from '../../../utils/helpers';
-import type { N8nOutputParser } from '../../../utils/output_parsers/N8nOutputParser';
-import { getOptionalOutputParsers } from '../../../utils/output_parsers/N8nOutputParser';
-import { getTemplateNoticeField } from '../../../utils/sharedFields';
-import { getTracingConfig } from '../../../utils/tracing';
+import { promptTypeOptions, textFromPreviousNode } from '@utils/descriptions';
+import { getPromptInputByType, isChatInstance } from '@utils/helpers';
+import type { N8nOutputParser } from '@utils/output_parsers/N8nOutputParser';
+import { getOptionalOutputParsers } from '@utils/output_parsers/N8nOutputParser';
+import { getTemplateNoticeField } from '@utils/sharedFields';
+import { getTracingConfig } from '@utils/tracing';
+
 import {
 	getCustomErrorMessage as getCustomOpenAiErrorMessage,
 	isOpenAiError,
 } from '../../vendors/OpenAi/helpers/error-handling';
-import { promptTypeOptions, textFromPreviousNode } from '../../../utils/descriptions';
 
 interface MessagesTemplate {
 	type: string;
@@ -253,6 +254,7 @@ export class ChainLlm implements INodeType {
 		displayName: 'Basic LLM Chain',
 		name: 'chainLlm',
 		icon: 'fa:link',
+		iconColor: 'black',
 		group: ['transform'],
 		version: [1, 1.1, 1.2, 1.3, 1.4, 1.5],
 		description: 'A simple chain to prompt a large language model',
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/ChainRetrievalQA/ChainRetrievalQa.node.ts b/packages/@n8n/nodes-langchain/nodes/chains/ChainRetrievalQA/ChainRetrievalQa.node.ts
index 75f7458438440..7829bc7813cb2 100644
--- a/packages/@n8n/nodes-langchain/nodes/chains/ChainRetrievalQA/ChainRetrievalQa.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/chains/ChainRetrievalQA/ChainRetrievalQa.node.ts
@@ -16,10 +16,10 @@ import {
 	NodeOperationError,
 } from 'n8n-workflow';
 
-import { promptTypeOptions, textFromPreviousNode } from '../../../utils/descriptions';
-import { getPromptInputByType, isChatInstance } from '../../../utils/helpers';
-import { getTemplateNoticeField } from '../../../utils/sharedFields';
-import { getTracingConfig } from '../../../utils/tracing';
+import { promptTypeOptions, textFromPreviousNode } from '@utils/descriptions';
+import { getPromptInputByType, isChatInstance } from '@utils/helpers';
+import { getTemplateNoticeField } from '@utils/sharedFields';
+import { getTracingConfig } from '@utils/tracing';
 
 const SYSTEM_PROMPT_TEMPLATE = `Use the following pieces of context to answer the users question.
 If you don't know the answer, just say that you don't know, don't try to make up an answer.
@@ -31,6 +31,7 @@ export class ChainRetrievalQa implements INodeType {
 		displayName: 'Question and Answer Chain',
 		name: 'chainRetrievalQa',
 		icon: 'fa:link',
+		iconColor: 'black',
 		group: ['transform'],
 		version: [1, 1.1, 1.2, 1.3, 1.4],
 		description: 'Answer questions about retrieved documents',
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/ChainSummarization.node.ts b/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/ChainSummarization.node.ts
index cd47eb6a1531f..9c97190952167 100644
--- a/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/ChainSummarization.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/ChainSummarization.node.ts
@@ -10,6 +10,7 @@ export class ChainSummarization extends VersionedNodeType {
 			displayName: 'Summarization Chain',
 			name: 'chainSummarization',
 			icon: 'fa:link',
+			iconColor: 'black',
 			group: ['transform'],
 			description: 'Transforms text into a concise summary',
 			codex: {
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/V1/ChainSummarizationV1.node.ts b/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/V1/ChainSummarizationV1.node.ts
index 3e7b6997d6ccf..fedf9790829cd 100644
--- a/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/V1/ChainSummarizationV1.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/V1/ChainSummarizationV1.node.ts
@@ -1,3 +1,8 @@
+import type { Document } from '@langchain/core/documents';
+import type { BaseLanguageModel } from '@langchain/core/language_models/base';
+import { PromptTemplate } from '@langchain/core/prompts';
+import type { SummarizationChainParams } from 'langchain/chains';
+import { loadSummarizationChain } from 'langchain/chains';
 import {
 	NodeConnectionType,
 	type INodeTypeBaseDescription,
@@ -7,14 +12,10 @@ import {
 	type INodeTypeDescription,
 } from 'n8n-workflow';
 
-import type { SummarizationChainParams } from 'langchain/chains';
-import { loadSummarizationChain } from 'langchain/chains';
-import type { BaseLanguageModel } from '@langchain/core/language_models/base';
-import type { Document } from '@langchain/core/documents';
-import { PromptTemplate } from '@langchain/core/prompts';
-import { N8nJsonLoader } from '../../../../utils/N8nJsonLoader';
-import { N8nBinaryLoader } from '../../../../utils/N8nBinaryLoader';
-import { getTemplateNoticeField } from '../../../../utils/sharedFields';
+import { N8nBinaryLoader } from '@utils/N8nBinaryLoader';
+import { N8nJsonLoader } from '@utils/N8nJsonLoader';
+import { getTemplateNoticeField } from '@utils/sharedFields';
+
 import { REFINE_PROMPT_TEMPLATE, DEFAULT_PROMPT_TEMPLATE } from '../prompt';
 
 export class ChainSummarizationV1 implements INodeType {
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/V2/ChainSummarizationV2.node.ts b/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/V2/ChainSummarizationV2.node.ts
index 76964e99f14a2..ff6dadde59e76 100644
--- a/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/V2/ChainSummarizationV2.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/V2/ChainSummarizationV2.node.ts
@@ -1,4 +1,8 @@
-import { NodeConnectionType } from 'n8n-workflow';
+import type { Document } from '@langchain/core/documents';
+import type { BaseLanguageModel } from '@langchain/core/language_models/base';
+import type { TextSplitter } from '@langchain/textsplitters';
+import { RecursiveCharacterTextSplitter } from '@langchain/textsplitters';
+import { loadSummarizationChain } from 'langchain/chains';
 import type {
 	INodeTypeBaseDescription,
 	IExecuteFunctions,
@@ -7,18 +11,15 @@ import type {
 	INodeTypeDescription,
 	IDataObject,
 } from 'n8n-workflow';
+import { NodeConnectionType } from 'n8n-workflow';
+
+import { N8nBinaryLoader } from '@utils/N8nBinaryLoader';
+import { N8nJsonLoader } from '@utils/N8nJsonLoader';
+import { getTemplateNoticeField } from '@utils/sharedFields';
+import { getTracingConfig } from '@utils/tracing';
 
-import { loadSummarizationChain } from 'langchain/chains';
-import type { BaseLanguageModel } from '@langchain/core/language_models/base';
-import type { Document } from '@langchain/core/documents';
-import type { TextSplitter } from '@langchain/textsplitters';
-import { RecursiveCharacterTextSplitter } from '@langchain/textsplitters';
-import { N8nJsonLoader } from '../../../../utils/N8nJsonLoader';
-import { N8nBinaryLoader } from '../../../../utils/N8nBinaryLoader';
-import { getTemplateNoticeField } from '../../../../utils/sharedFields';
-import { REFINE_PROMPT_TEMPLATE, DEFAULT_PROMPT_TEMPLATE } from '../prompt';
 import { getChainPromptsArgs } from '../helpers';
-import { getTracingConfig } from '../../../../utils/tracing';
+import { REFINE_PROMPT_TEMPLATE, DEFAULT_PROMPT_TEMPLATE } from '../prompt';
 
 function getInputs(parameters: IDataObject) {
 	const chunkingMode = parameters?.chunkingMode;
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/helpers.ts b/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/helpers.ts
index 2a00d836e8f87..2da507ed00977 100644
--- a/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/helpers.ts
+++ b/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/helpers.ts
@@ -1,5 +1,5 @@
-import type { SummarizationChainParams } from 'langchain/chains';
 import { PromptTemplate } from '@langchain/core/prompts';
+import type { SummarizationChainParams } from 'langchain/chains';
 interface ChainTypeOptions {
 	combineMapPrompt?: string;
 	prompt?: string;
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/InformationExtractor/InformationExtractor.node.ts b/packages/@n8n/nodes-langchain/nodes/chains/InformationExtractor/InformationExtractor.node.ts
index ab6cd8f20117e..365a35ddd317e 100644
--- a/packages/@n8n/nodes-langchain/nodes/chains/InformationExtractor/InformationExtractor.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/chains/InformationExtractor/InformationExtractor.node.ts
@@ -13,15 +13,12 @@ import type {
 } from 'n8n-workflow';
 import type { z } from 'zod';
 
+import { inputSchemaField, jsonSchemaExampleField, schemaTypeField } from '@utils/descriptions';
+import { convertJsonSchemaToZod, generateSchema } from '@utils/schemaParsing';
+import { getTracingConfig } from '@utils/tracing';
+
 import { makeZodSchemaFromAttributes } from './helpers';
 import type { AttributeDefinition } from './types';
-import {
-	inputSchemaField,
-	jsonSchemaExampleField,
-	schemaTypeField,
-} from '../../../utils/descriptions';
-import { convertJsonSchemaToZod, generateSchema } from '../../../utils/schemaParsing';
-import { getTracingConfig } from '../../../utils/tracing';
 
 const SYSTEM_PROMPT_TEMPLATE = `You are an expert extraction algorithm.
 Only extract relevant information from the text.
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/InformationExtractor/helpers.ts b/packages/@n8n/nodes-langchain/nodes/chains/InformationExtractor/helpers.ts
index acde52765ecc4..22f39f25a9b68 100644
--- a/packages/@n8n/nodes-langchain/nodes/chains/InformationExtractor/helpers.ts
+++ b/packages/@n8n/nodes-langchain/nodes/chains/InformationExtractor/helpers.ts
@@ -1,4 +1,5 @@
 import { z } from 'zod';
+
 import type { AttributeDefinition } from './types';
 
 function makeAttributeSchema(attributeDefinition: AttributeDefinition, required: boolean = true) {
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/InformationExtractor/test/InformationExtraction.node.test.ts b/packages/@n8n/nodes-langchain/nodes/chains/InformationExtractor/test/InformationExtraction.node.test.ts
index b4e4672dacc8e..725af39a60460 100644
--- a/packages/@n8n/nodes-langchain/nodes/chains/InformationExtractor/test/InformationExtraction.node.test.ts
+++ b/packages/@n8n/nodes-langchain/nodes/chains/InformationExtractor/test/InformationExtraction.node.test.ts
@@ -1,10 +1,10 @@
-import type { IDataObject, IExecuteFunctions } from 'n8n-workflow/src';
+import type { BaseLanguageModel } from '@langchain/core/language_models/base';
+import { FakeLLM, FakeListChatModel } from '@langchain/core/utils/testing';
 import get from 'lodash/get';
+import type { IDataObject, IExecuteFunctions } from 'n8n-workflow/src';
 
-import { FakeLLM, FakeListChatModel } from '@langchain/core/utils/testing';
-import type { BaseLanguageModel } from '@langchain/core/language_models/base';
-import { InformationExtractor } from '../InformationExtractor.node';
 import { makeZodSchemaFromAttributes } from '../helpers';
+import { InformationExtractor } from '../InformationExtractor.node';
 import type { AttributeDefinition } from '../types';
 
 const mockPersonAttributes: AttributeDefinition[] = [
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/SentimentAnalysis/SentimentAnalysis.node.ts b/packages/@n8n/nodes-langchain/nodes/chains/SentimentAnalysis/SentimentAnalysis.node.ts
index 5f5c6f19dbd88..e810b0f98a05b 100644
--- a/packages/@n8n/nodes-langchain/nodes/chains/SentimentAnalysis/SentimentAnalysis.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/chains/SentimentAnalysis/SentimentAnalysis.node.ts
@@ -1,3 +1,8 @@
+import type { BaseLanguageModel } from '@langchain/core/language_models/base';
+import { HumanMessage } from '@langchain/core/messages';
+import { SystemMessagePromptTemplate, ChatPromptTemplate } from '@langchain/core/prompts';
+import { OutputFixingParser, StructuredOutputParser } from 'langchain/output_parsers';
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -6,15 +11,9 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-
-import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-
-import type { BaseLanguageModel } from '@langchain/core/language_models/base';
-import { HumanMessage } from '@langchain/core/messages';
-import { SystemMessagePromptTemplate, ChatPromptTemplate } from '@langchain/core/prompts';
-import { OutputFixingParser, StructuredOutputParser } from 'langchain/output_parsers';
 import { z } from 'zod';
-import { getTracingConfig } from '../../../utils/tracing';
+
+import { getTracingConfig } from '@utils/tracing';
 
 const DEFAULT_SYSTEM_PROMPT_TEMPLATE =
 	'You are highly intelligent and accurate sentiment analyzer. Analyze the sentiment of the provided text. Categorize it into one of the following: {categories}. Use the provided formatting instructions. Only output the JSON.';
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/TextClassifier/TextClassifier.node.ts b/packages/@n8n/nodes-langchain/nodes/chains/TextClassifier/TextClassifier.node.ts
index 7afc317c37259..298c41572d6bc 100644
--- a/packages/@n8n/nodes-langchain/nodes/chains/TextClassifier/TextClassifier.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/chains/TextClassifier/TextClassifier.node.ts
@@ -13,7 +13,7 @@ import type {
 } from 'n8n-workflow';
 import { z } from 'zod';
 
-import { getTracingConfig } from '../../../utils/tracing';
+import { getTracingConfig } from '@utils/tracing';
 
 const SYSTEM_PROMPT_TEMPLATE =
 	"Please classify the text provided by the user into one of the following categories: {categories}, and use the provided formatting instructions below. Don't explain, and only output the json.";
diff --git a/packages/@n8n/nodes-langchain/nodes/code/Code.node.ts b/packages/@n8n/nodes-langchain/nodes/code/Code.node.ts
index d73d6d3268d5a..dda3f2441456b 100644
--- a/packages/@n8n/nodes-langchain/nodes/code/Code.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/code/Code.node.ts
@@ -1,4 +1,9 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { Tool } from '@langchain/core/tools';
+import { makeResolverFromLegacyOptions } from '@n8n/vm2';
+import { JavaScriptSandbox } from 'n8n-nodes-base/dist/nodes/Code/JavaScriptSandbox';
+import { getSandboxContext } from 'n8n-nodes-base/dist/nodes/Code/Sandbox';
+import { standardizeOutput } from 'n8n-nodes-base/dist/nodes/Code/utils';
 import { NodeOperationError, NodeConnectionType } from 'n8n-workflow';
 import type {
 	IExecuteFunctions,
@@ -12,12 +17,7 @@ import type {
 
 // TODO: Add support for execute function. Got already started but got commented out
 
-import { getSandboxContext } from 'n8n-nodes-base/dist/nodes/Code/Sandbox';
-import { JavaScriptSandbox } from 'n8n-nodes-base/dist/nodes/Code/JavaScriptSandbox';
-import { standardizeOutput } from 'n8n-nodes-base/dist/nodes/Code/utils';
-import type { Tool } from '@langchain/core/tools';
-import { makeResolverFromLegacyOptions } from '@n8n/vm2';
-import { logWrapper } from '../../utils/logWrapper';
+import { logWrapper } from '@utils/logWrapper';
 
 const { NODE_FUNCTION_ALLOW_BUILTIN: builtIn, NODE_FUNCTION_ALLOW_EXTERNAL: external } =
 	process.env;
diff --git a/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentBinaryInputLoader/DocumentBinaryInputLoader.node.ts b/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentBinaryInputLoader/DocumentBinaryInputLoader.node.ts
index 2e68db4e693a9..5c9ebf08b0009 100644
--- a/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentBinaryInputLoader/DocumentBinaryInputLoader.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentBinaryInputLoader/DocumentBinaryInputLoader.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { TextSplitter } from '@langchain/textsplitters';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -7,11 +8,9 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import type { TextSplitter } from '@langchain/textsplitters';
-
-import { logWrapper } from '../../../utils/logWrapper';
-import { N8nBinaryLoader } from '../../../utils/N8nBinaryLoader';
-import { getConnectionHintNoticeField, metadataFilterField } from '../../../utils/sharedFields';
+import { logWrapper } from '@utils/logWrapper';
+import { N8nBinaryLoader } from '@utils/N8nBinaryLoader';
+import { getConnectionHintNoticeField, metadataFilterField } from '@utils/sharedFields';
 
 // Dependencies needed underneath the hood for the loaders. We add them
 // here only to track where what dependency is sued
diff --git a/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentDefaultDataLoader/DocumentDefaultDataLoader.node.ts b/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentDefaultDataLoader/DocumentDefaultDataLoader.node.ts
index 5e6457951e463..46e4120764f4b 100644
--- a/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentDefaultDataLoader/DocumentDefaultDataLoader.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentDefaultDataLoader/DocumentDefaultDataLoader.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { TextSplitter } from '@langchain/textsplitters';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -7,10 +8,10 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import type { TextSplitter } from '@langchain/textsplitters';
-import { logWrapper } from '../../../utils/logWrapper';
-import { N8nBinaryLoader } from '../../../utils/N8nBinaryLoader';
-import { metadataFilterField } from '../../../utils/sharedFields';
+import { logWrapper } from '@utils/logWrapper';
+import { N8nBinaryLoader } from '@utils/N8nBinaryLoader';
+import { N8nJsonLoader } from '@utils/N8nJsonLoader';
+import { metadataFilterField } from '@utils/sharedFields';
 
 // Dependencies needed underneath the hood for the loaders. We add them
 // here only to track where what dependency is sued
@@ -18,7 +19,6 @@ import { metadataFilterField } from '../../../utils/sharedFields';
 import 'mammoth'; // for docx
 import 'epub2'; // for epub
 import 'pdf-parse'; // for pdf
-import { N8nJsonLoader } from '../../../utils/N8nJsonLoader';
 
 export class DocumentDefaultDataLoader implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentGithubLoader/DocumentGithubLoader.node.ts b/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentGithubLoader/DocumentGithubLoader.node.ts
index 71a77f013c162..7d63e32f0b5c3 100644
--- a/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentGithubLoader/DocumentGithubLoader.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentGithubLoader/DocumentGithubLoader.node.ts
@@ -1,4 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { GithubRepoLoader } from '@langchain/community/document_loaders/web/github';
+import type { CharacterTextSplitter } from '@langchain/textsplitters';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,10 +8,9 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import { GithubRepoLoader } from '@langchain/community/document_loaders/web/github';
-import type { CharacterTextSplitter } from '@langchain/textsplitters';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class DocumentGithubLoader implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentJSONInputLoader/DocumentJsonInputLoader.node.ts b/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentJSONInputLoader/DocumentJsonInputLoader.node.ts
index 2e8cb95a11cb7..9c295ba144a96 100644
--- a/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentJSONInputLoader/DocumentJsonInputLoader.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentJSONInputLoader/DocumentJsonInputLoader.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { TextSplitter } from '@langchain/textsplitters';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -7,10 +8,9 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import type { TextSplitter } from '@langchain/textsplitters';
-import { logWrapper } from '../../../utils/logWrapper';
-import { N8nJsonLoader } from '../../../utils/N8nJsonLoader';
-import { getConnectionHintNoticeField, metadataFilterField } from '../../../utils/sharedFields';
+import { logWrapper } from '@utils/logWrapper';
+import { N8nJsonLoader } from '@utils/N8nJsonLoader';
+import { getConnectionHintNoticeField, metadataFilterField } from '@utils/sharedFields';
 
 export class DocumentJsonInputLoader implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsAwsBedrock/EmbeddingsAwsBedrock.node.ts b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsAwsBedrock/EmbeddingsAwsBedrock.node.ts
index 6e0782f1c1ac1..fdb2da5ce0e3b 100644
--- a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsAwsBedrock/EmbeddingsAwsBedrock.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsAwsBedrock/EmbeddingsAwsBedrock.node.ts
@@ -8,8 +8,8 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class EmbeddingsAwsBedrock implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsAzureOpenAi/EmbeddingsAzureOpenAi.node.ts b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsAzureOpenAi/EmbeddingsAzureOpenAi.node.ts
index bf101292f2e05..65f493d578f28 100644
--- a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsAzureOpenAi/EmbeddingsAzureOpenAi.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsAzureOpenAi/EmbeddingsAzureOpenAi.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { OpenAIEmbeddings } from '@langchain/openai';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -7,9 +8,8 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import { OpenAIEmbeddings } from '@langchain/openai';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class EmbeddingsAzureOpenAi implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsCohere/EmbeddingsCohere.node.ts b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsCohere/EmbeddingsCohere.node.ts
index 26e5d39b7075e..ebab22ec558e2 100644
--- a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsCohere/EmbeddingsCohere.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsCohere/EmbeddingsCohere.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { CohereEmbeddings } from '@langchain/cohere';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,9 +7,9 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import { CohereEmbeddings } from '@langchain/cohere';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class EmbeddingsCohere implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsGoogleGemini/EmbeddingsGoogleGemini.node.ts b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsGoogleGemini/EmbeddingsGoogleGemini.node.ts
index 2a455e4574bc1..949d6ee24e03b 100644
--- a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsGoogleGemini/EmbeddingsGoogleGemini.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsGoogleGemini/EmbeddingsGoogleGemini.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { GoogleGenerativeAIEmbeddings } from '@langchain/google-genai';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,10 +7,9 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import { GoogleGenerativeAIEmbeddings } from '@langchain/google-genai';
 
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class EmbeddingsGoogleGemini implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsHuggingFaceInference/EmbeddingsHuggingFaceInference.node.ts b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsHuggingFaceInference/EmbeddingsHuggingFaceInference.node.ts
index c8317630c36c2..c8023354ef185 100644
--- a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsHuggingFaceInference/EmbeddingsHuggingFaceInference.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsHuggingFaceInference/EmbeddingsHuggingFaceInference.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { HuggingFaceInferenceEmbeddings } from '@langchain/community/embeddings/hf';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,9 +7,9 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import { HuggingFaceInferenceEmbeddings } from '@langchain/community/embeddings/hf';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class EmbeddingsHuggingFaceInference implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsMistralCloud/EmbeddingsMistralCloud.node.ts b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsMistralCloud/EmbeddingsMistralCloud.node.ts
index dbfb93b82e080..553abfa406247 100644
--- a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsMistralCloud/EmbeddingsMistralCloud.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsMistralCloud/EmbeddingsMistralCloud.node.ts
@@ -1,4 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { MistralAIEmbeddingsParams } from '@langchain/mistralai';
+import { MistralAIEmbeddings } from '@langchain/mistralai';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,10 +8,9 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import type { MistralAIEmbeddingsParams } from '@langchain/mistralai';
-import { MistralAIEmbeddings } from '@langchain/mistralai';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class EmbeddingsMistralCloud implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOllama/EmbeddingsOllama.node.ts b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOllama/EmbeddingsOllama.node.ts
index d84aa537ec5e5..08feb90309e0f 100644
--- a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOllama/EmbeddingsOllama.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOllama/EmbeddingsOllama.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { OllamaEmbeddings } from '@langchain/ollama';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,9 +7,10 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import { OllamaEmbeddings } from '@langchain/ollama';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
 import { ollamaDescription, ollamaModel } from '../../llms/LMOllama/description';
 
 export class EmbeddingsOllama implements INodeType {
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOpenAI/EmbeddingsOpenAi.node.ts b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOpenAI/EmbeddingsOpenAi.node.ts
index aececc09aed74..cd44cb114b870 100644
--- a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOpenAI/EmbeddingsOpenAi.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOpenAI/EmbeddingsOpenAi.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { OpenAIEmbeddings } from '@langchain/openai';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -7,11 +8,10 @@ import {
 	type ISupplyDataFunctions,
 	type INodeProperties,
 } from 'n8n-workflow';
-
 import type { ClientOptions } from 'openai';
-import { OpenAIEmbeddings } from '@langchain/openai';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 const modelParameter: INodeProperties = {
 	displayName: 'Model',
@@ -79,7 +79,7 @@ export class EmbeddingsOpenAi implements INodeType {
 			},
 		],
 		group: ['transform'],
-		version: [1, 1.1],
+		version: [1, 1.1, 1.2],
 		description: 'Use Embeddings OpenAI',
 		defaults: {
 			name: 'Embeddings OpenAI',
@@ -106,7 +106,7 @@ export class EmbeddingsOpenAi implements INodeType {
 		requestDefaults: {
 			ignoreHttpStatusErrors: true,
 			baseURL:
-				'={{ $parameter.options?.baseURL?.split("/").slice(0,-1).join("/") || "https://api.openai.com" }}',
+				'={{ $parameter.options?.baseURL?.split("/").slice(0,-1).join("/") || $credentials.url?.split("/").slice(0,-1).join("/") || "https://api.openai.com" }}',
 		},
 		properties: [
 			getConnectionHintNoticeField([NodeConnectionType.AiVectorStore]),
@@ -171,6 +171,11 @@ export class EmbeddingsOpenAi implements INodeType {
 						default: 'https://api.openai.com/v1',
 						description: 'Override the default base URL for the API',
 						type: 'string',
+						displayOptions: {
+							hide: {
+								'@version': [{ _cnd: { gte: 1.2 } }],
+							},
+						},
 					},
 					{
 						displayName: 'Batch Size',
@@ -219,6 +224,8 @@ export class EmbeddingsOpenAi implements INodeType {
 		const configuration: ClientOptions = {};
 		if (options.baseURL) {
 			configuration.baseURL = options.baseURL;
+		} else if (credentials.url) {
+			configuration.baseURL = credentials.url as string;
 		}
 
 		const embeddings = new OpenAIEmbeddings(
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/LmChatAnthropic.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/LmChatAnthropic.node.ts
index c575b59aa87c0..3a38ce3a313d2 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/LmChatAnthropic.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/LmChatAnthropic.node.ts
@@ -12,9 +12,10 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
-import { N8nLlmTracing } from '../N8nLlmTracing';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
 import { makeN8nLlmFailedAttemptHandler } from '../n8nLlmFailedAttemptHandler';
+import { N8nLlmTracing } from '../N8nLlmTracing';
 
 const modelField: INodeProperties = {
 	displayName: 'Model',
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMChatOllama/LmChatOllama.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOllama/LmChatOllama.node.ts
index 354e54e27ad34..d4685fa802d47 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LMChatOllama/LmChatOllama.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOllama/LmChatOllama.node.ts
@@ -1,4 +1,7 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+
+import type { ChatOllamaInput } from '@langchain/ollama';
+import { ChatOllama } from '@langchain/ollama';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -7,12 +10,11 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import type { ChatOllamaInput } from '@langchain/ollama';
-import { ChatOllama } from '@langchain/ollama';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
 import { ollamaModel, ollamaOptions, ollamaDescription } from '../LMOllama/description';
-import { N8nLlmTracing } from '../N8nLlmTracing';
 import { makeN8nLlmFailedAttemptHandler } from '../n8nLlmFailedAttemptHandler';
+import { N8nLlmTracing } from '../N8nLlmTracing';
 
 export class LmChatOllama implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/LmChatOpenAi.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/LmChatOpenAi.node.ts
index 2e55e567222c5..cf24d944dea44 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/LmChatOpenAi.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/LmChatOpenAi.node.ts
@@ -9,7 +9,8 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
 import { openAiFailedAttemptHandler } from '../../vendors/OpenAi/helpers/error-handling';
 import { makeN8nLlmFailedAttemptHandler } from '../n8nLlmFailedAttemptHandler';
 import { N8nLlmTracing } from '../N8nLlmTracing';
@@ -21,7 +22,7 @@ export class LmChatOpenAi implements INodeType {
 		name: 'lmChatOpenAi',
 		icon: { light: 'file:openAiLight.svg', dark: 'file:openAiLight.dark.svg' },
 		group: ['transform'],
-		version: 1,
+		version: [1, 1.1],
 		description: 'For advanced usage with an AI chain',
 		defaults: {
 			name: 'OpenAI Chat Model',
@@ -54,7 +55,7 @@ export class LmChatOpenAi implements INodeType {
 		requestDefaults: {
 			ignoreHttpStatusErrors: true,
 			baseURL:
-				'={{ $parameter.options?.baseURL?.split("/").slice(0,-1).join("/") || "https://api.openai.com" }}',
+				'={{ $parameter.options?.baseURL?.split("/").slice(0,-1).join("/") || $credentials?.url?.split("/").slice(0,-1).join("/") || "https://api.openai.com" }}',
 		},
 		properties: [
 			getConnectionHintNoticeField([NodeConnectionType.AiChain, NodeConnectionType.AiAgent]),
@@ -81,7 +82,7 @@ export class LmChatOpenAi implements INodeType {
 						routing: {
 							request: {
 								method: 'GET',
-								url: '={{ $parameter.options?.baseURL?.split("/").slice(-1).pop() || "v1"  }}/models',
+								url: '={{ $parameter.options?.baseURL?.split("/").slice(-1).pop() || $credentials?.url?.split("/").slice(-1).pop() || "v1" }}/models',
 							},
 							output: {
 								postReceive: [
@@ -97,6 +98,7 @@ export class LmChatOpenAi implements INodeType {
 											// If the baseURL is not set or is set to api.openai.com, include only chat models
 											pass: `={{
 												($parameter.options?.baseURL && !$parameter.options?.baseURL?.includes('api.openai.com')) ||
+												($credentials?.url && !$credentials.url.includes('api.openai.com')) ||
 												$responseItem.id.startsWith('ft:') ||
 												$responseItem.id.startsWith('o1') ||
 												($responseItem.id.startsWith('gpt-') && !$responseItem.id.includes('instruct'))
@@ -155,6 +157,11 @@ export class LmChatOpenAi implements INodeType {
 						default: 'https://api.openai.com/v1',
 						description: 'Override the default base URL for the API',
 						type: 'string',
+						displayOptions: {
+							hide: {
+								'@version': [{ _cnd: { gte: 1.1 } }],
+							},
+						},
 					},
 					{
 						displayName: 'Frequency Penalty',
@@ -260,6 +267,8 @@ export class LmChatOpenAi implements INodeType {
 		const configuration: ClientOptions = {};
 		if (options.baseURL) {
 			configuration.baseURL = options.baseURL;
+		} else if (credentials.url) {
+			configuration.baseURL = credentials.url as string;
 		}
 
 		const model = new ChatOpenAI({
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMCohere/LmCohere.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMCohere/LmCohere.node.ts
index 4b5f85f915a3a..6b9559104b560 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LMCohere/LmCohere.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMCohere/LmCohere.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { Cohere } from '@langchain/cohere';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -7,10 +8,10 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import { Cohere } from '@langchain/cohere';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
-import { N8nLlmTracing } from '../N8nLlmTracing';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
 import { makeN8nLlmFailedAttemptHandler } from '../n8nLlmFailedAttemptHandler';
+import { N8nLlmTracing } from '../N8nLlmTracing';
 
 export class LmCohere implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMOllama/LmOllama.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMOllama/LmOllama.node.ts
index ddd565e3a9321..21a7a0c50f73c 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LMOllama/LmOllama.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMOllama/LmOllama.node.ts
@@ -1,4 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+
+import { Ollama } from '@langchain/community/llms/ollama';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -7,11 +9,11 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import { Ollama } from '@langchain/community/llms/ollama';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
-import { N8nLlmTracing } from '../N8nLlmTracing';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
 import { ollamaDescription, ollamaModel, ollamaOptions } from './description';
 import { makeN8nLlmFailedAttemptHandler } from '../n8nLlmFailedAttemptHandler';
+import { N8nLlmTracing } from '../N8nLlmTracing';
 
 export class LmOllama implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMOpenAi/LmOpenAi.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMOpenAi/LmOpenAi.node.ts
index 41cb6222949cb..1a64f07cca644 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LMOpenAi/LmOpenAi.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMOpenAi/LmOpenAi.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { OpenAI, type ClientOptions } from '@langchain/openai';
 import { NodeConnectionType } from 'n8n-workflow';
 import type {
 	INodeType,
@@ -8,9 +9,8 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-workflow';
 
-import { OpenAI, type ClientOptions } from '@langchain/openai';
-import { N8nLlmTracing } from '../N8nLlmTracing';
 import { makeN8nLlmFailedAttemptHandler } from '../n8nLlmFailedAttemptHandler';
+import { N8nLlmTracing } from '../N8nLlmTracing';
 
 type LmOpenAiOptions = {
 	baseURL?: string;
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMOpenHuggingFaceInference/LmOpenHuggingFaceInference.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMOpenHuggingFaceInference/LmOpenHuggingFaceInference.node.ts
index 7823c91b52759..e393d86f8a394 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LMOpenHuggingFaceInference/LmOpenHuggingFaceInference.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMOpenHuggingFaceInference/LmOpenHuggingFaceInference.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { HuggingFaceInference } from '@langchain/community/llms/hf';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -7,10 +8,10 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import { HuggingFaceInference } from '@langchain/community/llms/hf';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
-import { N8nLlmTracing } from '../N8nLlmTracing';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
 import { makeN8nLlmFailedAttemptHandler } from '../n8nLlmFailedAttemptHandler';
+import { N8nLlmTracing } from '../N8nLlmTracing';
 
 export class LmOpenHuggingFaceInference implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatAwsBedrock/LmChatAwsBedrock.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatAwsBedrock/LmChatAwsBedrock.node.ts
index 3d928ce801e8e..ef15a531cfce4 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LmChatAwsBedrock/LmChatAwsBedrock.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatAwsBedrock/LmChatAwsBedrock.node.ts
@@ -8,9 +8,10 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
-import { N8nLlmTracing } from '../N8nLlmTracing';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
 import { makeN8nLlmFailedAttemptHandler } from '../n8nLlmFailedAttemptHandler';
+import { N8nLlmTracing } from '../N8nLlmTracing';
 
 export class LmChatAwsBedrock implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatAzureOpenAi/LmChatAzureOpenAi.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatAzureOpenAi/LmChatAzureOpenAi.node.ts
index e2292abc772aa..5fc562153d4f6 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LmChatAzureOpenAi/LmChatAzureOpenAi.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatAzureOpenAi/LmChatAzureOpenAi.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { ChatOpenAI } from '@langchain/openai';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -7,10 +8,10 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import { ChatOpenAI } from '@langchain/openai';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
-import { N8nLlmTracing } from '../N8nLlmTracing';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
 import { makeN8nLlmFailedAttemptHandler } from '../n8nLlmFailedAttemptHandler';
+import { N8nLlmTracing } from '../N8nLlmTracing';
 
 export class LmChatAzureOpenAi implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleGemini/LmChatGoogleGemini.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleGemini/LmChatGoogleGemini.node.ts
index 9bade1e26afa9..f8b7d2bb3ea37 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleGemini/LmChatGoogleGemini.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleGemini/LmChatGoogleGemini.node.ts
@@ -1,4 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { SafetySetting } from '@google/generative-ai';
+import { ChatGoogleGenerativeAI } from '@langchain/google-genai';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,12 +8,12 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import { ChatGoogleGenerativeAI } from '@langchain/google-genai';
-import type { SafetySetting } from '@google/generative-ai';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
-import { N8nLlmTracing } from '../N8nLlmTracing';
+
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
 import { additionalOptions } from '../gemini-common/additional-options';
 import { makeN8nLlmFailedAttemptHandler } from '../n8nLlmFailedAttemptHandler';
+import { N8nLlmTracing } from '../N8nLlmTracing';
 
 export class LmChatGoogleGemini implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleVertex/LmChatGoogleVertex.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleVertex/LmChatGoogleVertex.node.ts
index 92b51e534f36a..5ca6091378423 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleVertex/LmChatGoogleVertex.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleVertex/LmChatGoogleVertex.node.ts
@@ -1,4 +1,8 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { SafetySetting } from '@google/generative-ai';
+import { ProjectsClient } from '@google-cloud/resource-manager';
+import { ChatVertexAI } from '@langchain/google-vertexai';
+import { formatPrivateKey } from 'n8n-nodes-base/dist/utils/utilities';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -9,15 +13,13 @@ import {
 	type JsonObject,
 	NodeOperationError,
 } from 'n8n-workflow';
-import { ChatVertexAI } from '@langchain/google-vertexai';
-import type { SafetySetting } from '@google/generative-ai';
-import { ProjectsClient } from '@google-cloud/resource-manager';
-import { formatPrivateKey } from 'n8n-nodes-base/dist/utils/utilities';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
-import { N8nLlmTracing } from '../N8nLlmTracing';
-import { additionalOptions } from '../gemini-common/additional-options';
+
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
 import { makeErrorFromStatus } from './error-handling';
+import { additionalOptions } from '../gemini-common/additional-options';
 import { makeN8nLlmFailedAttemptHandler } from '../n8nLlmFailedAttemptHandler';
+import { N8nLlmTracing } from '../N8nLlmTracing';
 
 export class LmChatGoogleVertex implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatGroq/LmChatGroq.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGroq/LmChatGroq.node.ts
index 1494dbcf553e6..fb859e3fce077 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LmChatGroq/LmChatGroq.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGroq/LmChatGroq.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { ChatGroq } from '@langchain/groq';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -7,10 +8,10 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import { ChatGroq } from '@langchain/groq';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
-import { N8nLlmTracing } from '../N8nLlmTracing';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
 import { makeN8nLlmFailedAttemptHandler } from '../n8nLlmFailedAttemptHandler';
+import { N8nLlmTracing } from '../N8nLlmTracing';
 
 export class LmChatGroq implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatMistralCloud/LmChatMistralCloud.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatMistralCloud/LmChatMistralCloud.node.ts
index edd533b6bae57..a23c2d4e9fa85 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LmChatMistralCloud/LmChatMistralCloud.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatMistralCloud/LmChatMistralCloud.node.ts
@@ -1,4 +1,7 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+
+import type { ChatMistralAIInput } from '@langchain/mistralai';
+import { ChatMistralAI } from '@langchain/mistralai';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -7,11 +10,10 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import type { ChatMistralAIInput } from '@langchain/mistralai';
-import { ChatMistralAI } from '@langchain/mistralai';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
-import { N8nLlmTracing } from '../N8nLlmTracing';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
 import { makeN8nLlmFailedAttemptHandler } from '../n8nLlmFailedAttemptHandler';
+import { N8nLlmTracing } from '../N8nLlmTracing';
 
 export class LmChatMistralCloud implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/N8nLlmTracing.ts b/packages/@n8n/nodes-langchain/nodes/llms/N8nLlmTracing.ts
index af60b72982814..3d426309b7391 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/N8nLlmTracing.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/N8nLlmTracing.ts
@@ -9,11 +9,11 @@ import type {
 import type { BaseMessage } from '@langchain/core/messages';
 import type { LLMResult } from '@langchain/core/outputs';
 import { encodingForModel } from '@langchain/core/utils/tiktoken';
-import type { IDataObject, ISupplyDataFunctions, JsonObject } from 'n8n-workflow';
 import { pick } from 'lodash';
+import type { IDataObject, ISupplyDataFunctions, JsonObject } from 'n8n-workflow';
 import { NodeConnectionType, NodeError, NodeOperationError } from 'n8n-workflow';
 
-import { logAiEvent } from '../../utils/helpers';
+import { logAiEvent } from '@utils/helpers';
 
 type TokensUsageParser = (llmOutput: LLMResult['llmOutput']) => {
 	completionTokens: number;
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/gemini-common/additional-options.ts b/packages/@n8n/nodes-langchain/nodes/llms/gemini-common/additional-options.ts
index 3fc1900b8a56a..f154b676c5c8d 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/gemini-common/additional-options.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/gemini-common/additional-options.ts
@@ -1,5 +1,6 @@
 import type { HarmBlockThreshold, HarmCategory } from '@google/generative-ai';
 import type { INodeProperties } from 'n8n-workflow';
+
 import { harmCategories, harmThresholds } from './safety-options';
 
 export const additionalOptions: INodeProperties = {
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/MemoryBufferWindow/MemoryBufferWindow.node.ts b/packages/@n8n/nodes-langchain/nodes/memory/MemoryBufferWindow/MemoryBufferWindow.node.ts
index 28025f28845e9..ab023398169ac 100644
--- a/packages/@n8n/nodes-langchain/nodes/memory/MemoryBufferWindow/MemoryBufferWindow.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryBufferWindow/MemoryBufferWindow.node.ts
@@ -9,9 +9,10 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import { getSessionId } from '../../../utils/helpers';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { getSessionId } from '@utils/helpers';
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
 import {
 	sessionIdOption,
 	sessionKeyProperty,
@@ -31,14 +32,14 @@ class MemoryChatBufferSingleton {
 		this.memoryBuffer = new Map();
 	}
 
-	public static getInstance(): MemoryChatBufferSingleton {
+	static getInstance(): MemoryChatBufferSingleton {
 		if (!MemoryChatBufferSingleton.instance) {
 			MemoryChatBufferSingleton.instance = new MemoryChatBufferSingleton();
 		}
 		return MemoryChatBufferSingleton.instance;
 	}
 
-	public async getMemory(
+	async getMemory(
 		sessionKey: string,
 		memoryParams: BufferWindowMemoryInput,
 	): Promise<BufferWindowMemory> {
@@ -77,6 +78,7 @@ export class MemoryBufferWindow implements INodeType {
 		displayName: 'Window Buffer Memory (easiest)',
 		name: 'memoryBufferWindow',
 		icon: 'fa:database',
+		iconColor: 'black',
 		group: ['transform'],
 		version: [1, 1.1, 1.2, 1.3],
 		description: 'Stores in n8n memory, so no credentials required',
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/MemoryChatRetriever/MemoryChatRetriever.node.ts b/packages/@n8n/nodes-langchain/nodes/memory/MemoryChatRetriever/MemoryChatRetriever.node.ts
index f2bb0f43b0100..82fcba22a66ce 100644
--- a/packages/@n8n/nodes-langchain/nodes/memory/MemoryChatRetriever/MemoryChatRetriever.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryChatRetriever/MemoryChatRetriever.node.ts
@@ -1,4 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { BaseChatMemory } from '@langchain/community/memory/chat_memory';
+import type { BaseMessage } from '@langchain/core/messages';
 import {
 	NodeConnectionType,
 	type IDataObject,
@@ -7,8 +9,6 @@ import {
 	type INodeType,
 	type INodeTypeDescription,
 } from 'n8n-workflow';
-import type { BaseChatMemory } from '@langchain/community/memory/chat_memory';
-import type { BaseMessage } from '@langchain/core/messages';
 
 function simplifyMessages(messages: BaseMessage[]) {
 	const chunkedMessages = [];
@@ -38,6 +38,7 @@ export class MemoryChatRetriever implements INodeType {
 		displayName: 'Chat Messages Retriever',
 		name: 'memoryChatRetriever',
 		icon: 'fa:database',
+		iconColor: 'black',
 		group: ['transform'],
 		hidden: true,
 		version: 1,
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/MemoryManager/MemoryManager.node.ts b/packages/@n8n/nodes-langchain/nodes/memory/MemoryManager/MemoryManager.node.ts
index 04d6035e7fbf9..964da654756f6 100644
--- a/packages/@n8n/nodes-langchain/nodes/memory/MemoryManager/MemoryManager.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryManager/MemoryManager.node.ts
@@ -1,4 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { BaseChatMemory } from '@langchain/community/memory/chat_memory';
+import { AIMessage, SystemMessage, HumanMessage, type BaseMessage } from '@langchain/core/messages';
 import { NodeConnectionType } from 'n8n-workflow';
 import type {
 	IDataObject,
@@ -7,8 +9,6 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import type { BaseChatMemory } from '@langchain/community/memory/chat_memory';
-import { AIMessage, SystemMessage, HumanMessage, type BaseMessage } from '@langchain/core/messages';
 
 type MessageRole = 'ai' | 'system' | 'user';
 interface MessageRecord {
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/MemoryMotorhead/MemoryMotorhead.node.ts b/packages/@n8n/nodes-langchain/nodes/memory/MemoryMotorhead/MemoryMotorhead.node.ts
index a326f4c1bea4c..06fa387ee65a1 100644
--- a/packages/@n8n/nodes-langchain/nodes/memory/MemoryMotorhead/MemoryMotorhead.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryMotorhead/MemoryMotorhead.node.ts
@@ -8,9 +8,10 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import { getSessionId } from '../../../utils/helpers';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { getSessionId } from '@utils/helpers';
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
 import { expressionSessionKeyProperty, sessionIdOption, sessionKeyProperty } from '../descriptions';
 
 export class MemoryMotorhead implements INodeType {
@@ -18,6 +19,7 @@ export class MemoryMotorhead implements INodeType {
 		displayName: 'Motorhead',
 		name: 'memoryMotorhead',
 		icon: 'fa:file-export',
+		iconColor: 'black',
 		group: ['transform'],
 		version: [1, 1.1, 1.2, 1.3],
 		description: 'Use Motorhead Memory',
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/MemoryPostgresChat/MemoryPostgresChat.node.ts b/packages/@n8n/nodes-langchain/nodes/memory/MemoryPostgresChat/MemoryPostgresChat.node.ts
index b3d5f2f409128..18fd76e3c5463 100644
--- a/packages/@n8n/nodes-langchain/nodes/memory/MemoryPostgresChat/MemoryPostgresChat.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryPostgresChat/MemoryPostgresChat.node.ts
@@ -13,9 +13,10 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 import type pg from 'pg';
 
-import { getSessionId } from '../../../utils/helpers';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { getSessionId } from '@utils/helpers';
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
 import {
 	sessionIdOption,
 	sessionKeyProperty,
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/MemoryRedisChat/MemoryRedisChat.node.ts b/packages/@n8n/nodes-langchain/nodes/memory/MemoryRedisChat/MemoryRedisChat.node.ts
index 09208d96f7f6d..ab7d02e2c4f9f 100644
--- a/packages/@n8n/nodes-langchain/nodes/memory/MemoryRedisChat/MemoryRedisChat.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryRedisChat/MemoryRedisChat.node.ts
@@ -13,9 +13,10 @@ import {
 import type { RedisClientOptions } from 'redis';
 import { createClient } from 'redis';
 
-import { getSessionId } from '../../../utils/helpers';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { getSessionId } from '@utils/helpers';
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
 import {
 	sessionIdOption,
 	sessionKeyProperty,
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/MemoryXata/MemoryXata.node.ts b/packages/@n8n/nodes-langchain/nodes/memory/MemoryXata/MemoryXata.node.ts
index c48f32976ba6a..c1ad7b9539f89 100644
--- a/packages/@n8n/nodes-langchain/nodes/memory/MemoryXata/MemoryXata.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryXata/MemoryXata.node.ts
@@ -10,9 +10,10 @@ import type {
 	SupplyData,
 } from 'n8n-workflow';
 
-import { getSessionId } from '../../../utils/helpers';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { getSessionId } from '@utils/helpers';
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
 import {
 	sessionIdOption,
 	sessionKeyProperty,
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/MemoryZep/MemoryZep.node.ts b/packages/@n8n/nodes-langchain/nodes/memory/MemoryZep/MemoryZep.node.ts
index 3c9ab307e2733..1943f41c03960 100644
--- a/packages/@n8n/nodes-langchain/nodes/memory/MemoryZep/MemoryZep.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryZep/MemoryZep.node.ts
@@ -1,4 +1,9 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { BaseChatMemory } from '@langchain/community/dist/memory/chat_memory';
+import { ZepMemory } from '@langchain/community/memory/zep';
+import { ZepCloudMemory } from '@langchain/community/memory/zep_cloud';
+import type { InputValues, MemoryVariables } from '@langchain/core/memory';
+import type { BaseMessage } from '@langchain/core/messages';
 import {
 	NodeConnectionType,
 	type ISupplyDataFunctions,
@@ -7,16 +12,12 @@ import {
 	type SupplyData,
 	NodeOperationError,
 } from 'n8n-workflow';
-import { ZepMemory } from '@langchain/community/memory/zep';
-import { ZepCloudMemory } from '@langchain/community/memory/zep_cloud';
 
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { getSessionId } from '@utils/helpers';
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
 import { expressionSessionKeyProperty, sessionIdOption, sessionKeyProperty } from '../descriptions';
-import { getSessionId } from '../../../utils/helpers';
-import type { BaseChatMemory } from '@langchain/community/dist/memory/chat_memory';
-import type { InputValues, MemoryVariables } from '@langchain/core/memory';
-import type { BaseMessage } from '@langchain/core/messages';
 
 // Extend ZepCloudMemory to trim white space in messages.
 class WhiteSpaceTrimmedZepCloudMemory extends ZepCloudMemory {
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/descriptions.ts b/packages/@n8n/nodes-langchain/nodes/memory/descriptions.ts
index 4627671a9b5ae..fd0a022015129 100644
--- a/packages/@n8n/nodes-langchain/nodes/memory/descriptions.ts
+++ b/packages/@n8n/nodes-langchain/nodes/memory/descriptions.ts
@@ -6,10 +6,10 @@ export const sessionIdOption: INodeProperties = {
 	type: 'options',
 	options: [
 		{
-			// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
-			name: 'Take from previous node automatically',
+			name: 'Connected Chat Trigger Node',
 			value: 'fromInput',
-			description: 'Looks for an input field called sessionId',
+			description:
+				"Looks for an input field called 'sessionId' that is coming from a directly connected Chat Trigger",
 		},
 		{
 			// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
diff --git a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserAutofixing/OutputParserAutofixing.node.ts b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserAutofixing/OutputParserAutofixing.node.ts
index 4f385e1770014..f9e6cd2968516 100644
--- a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserAutofixing/OutputParserAutofixing.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserAutofixing/OutputParserAutofixing.node.ts
@@ -8,18 +8,20 @@ import type {
 	SupplyData,
 } from 'n8n-workflow';
 
-import { NAIVE_FIX_PROMPT } from './prompt';
 import {
 	N8nOutputFixingParser,
 	type N8nStructuredOutputParser,
-} from '../../../utils/output_parsers/N8nOutputParser';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+} from '@utils/output_parsers/N8nOutputParser';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
+import { NAIVE_FIX_PROMPT } from './prompt';
 
 export class OutputParserAutofixing implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Auto-fixing Output Parser',
 		name: 'outputParserAutofixing',
 		icon: 'fa:tools',
+		iconColor: 'black',
 		group: ['transform'],
 		version: 1,
 		description: 'Automatically fix the output if it is not in the correct format',
diff --git a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserAutofixing/test/OutputParserAutofixing.node.test.ts b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserAutofixing/test/OutputParserAutofixing.node.test.ts
index 9fcae1a8fa3d3..45f054a34b1af 100644
--- a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserAutofixing/test/OutputParserAutofixing.node.test.ts
+++ b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserAutofixing/test/OutputParserAutofixing.node.test.ts
@@ -11,7 +11,8 @@ import { ApplicationError, NodeConnectionType, NodeOperationError } from 'n8n-wo
 import type {
 	N8nOutputFixingParser,
 	N8nStructuredOutputParser,
-} from '../../../../utils/output_parsers/N8nOutputParser';
+} from '@utils/output_parsers/N8nOutputParser';
+
 import { OutputParserAutofixing } from '../OutputParserAutofixing.node';
 import { NAIVE_FIX_PROMPT } from '../prompt';
 
diff --git a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserItemList/OutputParserItemList.node.ts b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserItemList/OutputParserItemList.node.ts
index b613c14775ed9..b94b82fadac49 100644
--- a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserItemList/OutputParserItemList.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserItemList/OutputParserItemList.node.ts
@@ -7,14 +7,15 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import { N8nItemListOutputParser } from '../../../utils/output_parsers/N8nItemListOutputParser';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { N8nItemListOutputParser } from '@utils/output_parsers/N8nItemListOutputParser';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class OutputParserItemList implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Item List Output Parser',
 		name: 'outputParserItemList',
 		icon: 'fa:bars',
+		iconColor: 'black',
 		group: ['transform'],
 		version: 1,
 		description: 'Return the results as separate items',
diff --git a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserItemList/test/OutputParserItemList.node.test.ts b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserItemList/test/OutputParserItemList.node.test.ts
index c8ac869169e43..ae31e88353334 100644
--- a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserItemList/test/OutputParserItemList.node.test.ts
+++ b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserItemList/test/OutputParserItemList.node.test.ts
@@ -6,7 +6,8 @@ import {
 	type IWorkflowDataProxyData,
 } from 'n8n-workflow';
 
-import { N8nItemListOutputParser } from '../../../../utils/output_parsers/N8nItemListOutputParser';
+import { N8nItemListOutputParser } from '@utils/output_parsers/N8nItemListOutputParser';
+
 import { OutputParserItemList } from '../OutputParserItemList.node';
 
 describe('OutputParserItemList', () => {
diff --git a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserStructured/OutputParserStructured.node.ts b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserStructured/OutputParserStructured.node.ts
index c35cb1d1453b3..08690209970c3 100644
--- a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserStructured/OutputParserStructured.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserStructured/OutputParserStructured.node.ts
@@ -10,20 +10,17 @@ import {
 } from 'n8n-workflow';
 import type { z } from 'zod';
 
-import {
-	inputSchemaField,
-	jsonSchemaExampleField,
-	schemaTypeField,
-} from '../../../utils/descriptions';
-import { N8nStructuredOutputParser } from '../../../utils/output_parsers/N8nOutputParser';
-import { convertJsonSchemaToZod, generateSchema } from '../../../utils/schemaParsing';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { inputSchemaField, jsonSchemaExampleField, schemaTypeField } from '@utils/descriptions';
+import { N8nStructuredOutputParser } from '@utils/output_parsers/N8nOutputParser';
+import { convertJsonSchemaToZod, generateSchema } from '@utils/schemaParsing';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class OutputParserStructured implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Structured Output Parser',
 		name: 'outputParserStructured',
 		icon: 'fa:code',
+		iconColor: 'black',
 		group: ['transform'],
 		version: [1, 1.1, 1.2],
 		defaultVersion: 1.2,
diff --git a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserStructured/test/OutputParserStructured.node.test.ts b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserStructured/test/OutputParserStructured.node.test.ts
index af72c49d7e66d..e07b012ec6232 100644
--- a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserStructured/test/OutputParserStructured.node.test.ts
+++ b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserStructured/test/OutputParserStructured.node.test.ts
@@ -7,7 +7,8 @@ import {
 	type IWorkflowDataProxyData,
 } from 'n8n-workflow';
 
-import type { N8nStructuredOutputParser } from '../../../../utils/output_parsers/N8nStructuredOutputParser';
+import type { N8nStructuredOutputParser } from '@utils/output_parsers/N8nStructuredOutputParser';
+
 import { OutputParserStructured } from '../OutputParserStructured.node';
 
 describe('OutputParserStructured', () => {
diff --git a/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverContextualCompression/RetrieverContextualCompression.node.ts b/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverContextualCompression/RetrieverContextualCompression.node.ts
index 8017caa1ad4b7..feb70ecb43d31 100644
--- a/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverContextualCompression/RetrieverContextualCompression.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverContextualCompression/RetrieverContextualCompression.node.ts
@@ -1,4 +1,9 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+
+import type { BaseLanguageModel } from '@langchain/core/language_models/base';
+import type { BaseRetriever } from '@langchain/core/retrievers';
+import { ContextualCompressionRetriever } from 'langchain/retrievers/contextual_compression';
+import { LLMChainExtractor } from 'langchain/retrievers/document_compressors/chain_extract';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -7,18 +12,14 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import { ContextualCompressionRetriever } from 'langchain/retrievers/contextual_compression';
-import { LLMChainExtractor } from 'langchain/retrievers/document_compressors/chain_extract';
-import type { BaseLanguageModel } from '@langchain/core/language_models/base';
-import type { BaseRetriever } from '@langchain/core/retrievers';
-
-import { logWrapper } from '../../../utils/logWrapper';
+import { logWrapper } from '@utils/logWrapper';
 
 export class RetrieverContextualCompression implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Contextual Compression Retriever',
 		name: 'retrieverContextualCompression',
 		icon: 'fa:box-open',
+		iconColor: 'black',
 		group: ['transform'],
 		version: 1,
 		description: 'Enhances document similarity search by contextual compression.',
diff --git a/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverMultiQuery/RetrieverMultiQuery.node.ts b/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverMultiQuery/RetrieverMultiQuery.node.ts
index f814ba875ea06..4bbc45f6d14aa 100644
--- a/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverMultiQuery/RetrieverMultiQuery.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverMultiQuery/RetrieverMultiQuery.node.ts
@@ -1,4 +1,8 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+
+import type { BaseLanguageModel } from '@langchain/core/language_models/base';
+import type { BaseRetriever } from '@langchain/core/retrievers';
+import { MultiQueryRetriever } from 'langchain/retrievers/multi_query';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -7,17 +11,14 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import { MultiQueryRetriever } from 'langchain/retrievers/multi_query';
-import type { BaseLanguageModel } from '@langchain/core/language_models/base';
-import type { BaseRetriever } from '@langchain/core/retrievers';
-
-import { logWrapper } from '../../../utils/logWrapper';
+import { logWrapper } from '@utils/logWrapper';
 
 export class RetrieverMultiQuery implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'MultiQuery Retriever',
 		name: 'retrieverMultiQuery',
 		icon: 'fa:box-open',
+		iconColor: 'black',
 		group: ['transform'],
 		version: 1,
 		description:
diff --git a/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverVectorStore/RetrieverVectorStore.node.ts b/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverVectorStore/RetrieverVectorStore.node.ts
index 5e79a6a754152..915d9766dccec 100644
--- a/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverVectorStore/RetrieverVectorStore.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverVectorStore/RetrieverVectorStore.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { VectorStore } from '@langchain/core/vectorstores';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,14 +7,15 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import type { VectorStore } from '@langchain/core/vectorstores';
-import { logWrapper } from '../../../utils/logWrapper';
+
+import { logWrapper } from '@utils/logWrapper';
 
 export class RetrieverVectorStore implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Vector Store Retriever',
 		name: 'retrieverVectorStore',
 		icon: 'fa:box-open',
+		iconColor: 'black',
 		group: ['transform'],
 		version: 1,
 		description: 'Use a Vector Store as Retriever',
diff --git a/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverWorkflow/RetrieverWorkflow.node.ts b/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverWorkflow/RetrieverWorkflow.node.ts
index bbee55399946e..1291b92252f36 100644
--- a/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverWorkflow/RetrieverWorkflow.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverWorkflow/RetrieverWorkflow.node.ts
@@ -1,4 +1,9 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { CallbackManagerForRetrieverRun } from '@langchain/core/callbacks/manager';
+import { Document } from '@langchain/core/documents';
+import { BaseRetriever, type BaseRetrieverInput } from '@langchain/core/retrievers';
+import type { SetField, SetNodeOptions } from 'n8n-nodes-base/dist/nodes/Set/v2/helpers/interfaces';
+import * as manual from 'n8n-nodes-base/dist/nodes/Set/v2/manual.mode';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import type {
 	IDataObject,
@@ -13,13 +18,7 @@ import type {
 	ExecuteWorkflowData,
 } from 'n8n-workflow';
 
-import { BaseRetriever, type BaseRetrieverInput } from '@langchain/core/retrievers';
-import { Document } from '@langchain/core/documents';
-
-import type { SetField, SetNodeOptions } from 'n8n-nodes-base/dist/nodes/Set/v2/helpers/interfaces';
-import * as manual from 'n8n-nodes-base/dist/nodes/Set/v2/manual.mode';
-import type { CallbackManagerForRetrieverRun } from '@langchain/core/callbacks/manager';
-import { logWrapper } from '../../../utils/logWrapper';
+import { logWrapper } from '@utils/logWrapper';
 
 function objectToString(obj: Record<string, string> | IDataObject, level = 0) {
 	let result = '';
@@ -42,6 +41,7 @@ export class RetrieverWorkflow implements INodeType {
 		displayName: 'Workflow Retriever',
 		name: 'retrieverWorkflow',
 		icon: 'fa:box-open',
+		iconColor: 'black',
 		group: ['transform'],
 		version: [1, 1.1],
 		description: 'Use an n8n Workflow as Retriever',
diff --git a/packages/@n8n/nodes-langchain/nodes/text_splitters/TextSplitterCharacterTextSplitter/TextSplitterCharacterTextSplitter.node.ts b/packages/@n8n/nodes-langchain/nodes/text_splitters/TextSplitterCharacterTextSplitter/TextSplitterCharacterTextSplitter.node.ts
index f62e8f01f1741..962af5bde2321 100644
--- a/packages/@n8n/nodes-langchain/nodes/text_splitters/TextSplitterCharacterTextSplitter/TextSplitterCharacterTextSplitter.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/text_splitters/TextSplitterCharacterTextSplitter/TextSplitterCharacterTextSplitter.node.ts
@@ -1,4 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { CharacterTextSplitterParams } from '@langchain/textsplitters';
+import { CharacterTextSplitter } from '@langchain/textsplitters';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,16 +8,16 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import type { CharacterTextSplitterParams } from '@langchain/textsplitters';
-import { CharacterTextSplitter } from '@langchain/textsplitters';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class TextSplitterCharacterTextSplitter implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Character Text Splitter',
 		name: 'textSplitterCharacterTextSplitter',
 		icon: 'fa:grip-lines-vertical',
+		iconColor: 'black',
 		group: ['transform'],
 		version: 1,
 		description: 'Split text into chunks by characters',
diff --git a/packages/@n8n/nodes-langchain/nodes/text_splitters/TextSplitterRecursiveCharacterTextSplitter/TextSplitterRecursiveCharacterTextSplitter.node.ts b/packages/@n8n/nodes-langchain/nodes/text_splitters/TextSplitterRecursiveCharacterTextSplitter/TextSplitterRecursiveCharacterTextSplitter.node.ts
index 21a0520766555..4e376c39a37d2 100644
--- a/packages/@n8n/nodes-langchain/nodes/text_splitters/TextSplitterRecursiveCharacterTextSplitter/TextSplitterRecursiveCharacterTextSplitter.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/text_splitters/TextSplitterRecursiveCharacterTextSplitter/TextSplitterRecursiveCharacterTextSplitter.node.ts
@@ -1,4 +1,9 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type {
+	RecursiveCharacterTextSplitterParams,
+	SupportedTextSplitterLanguage,
+} from '@langchain/textsplitters';
+import { RecursiveCharacterTextSplitter } from '@langchain/textsplitters';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,13 +11,9 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import type {
-	RecursiveCharacterTextSplitterParams,
-	SupportedTextSplitterLanguage,
-} from '@langchain/textsplitters';
-import { RecursiveCharacterTextSplitter } from '@langchain/textsplitters';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 const supportedLanguages: SupportedTextSplitterLanguage[] = [
 	'cpp',
@@ -36,6 +37,7 @@ export class TextSplitterRecursiveCharacterTextSplitter implements INodeType {
 		displayName: 'Recursive Character Text Splitter',
 		name: 'textSplitterRecursiveCharacterTextSplitter',
 		icon: 'fa:grip-lines-vertical',
+		iconColor: 'black',
 		group: ['transform'],
 		version: 1,
 		description: 'Split text into chunks by characters recursively, recommended for most use cases',
diff --git a/packages/@n8n/nodes-langchain/nodes/text_splitters/TextSplitterTokenSplitter/TextSplitterTokenSplitter.node.ts b/packages/@n8n/nodes-langchain/nodes/text_splitters/TextSplitterTokenSplitter/TextSplitterTokenSplitter.node.ts
index 247d142fa8c93..b5dade396d767 100644
--- a/packages/@n8n/nodes-langchain/nodes/text_splitters/TextSplitterTokenSplitter/TextSplitterTokenSplitter.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/text_splitters/TextSplitterTokenSplitter/TextSplitterTokenSplitter.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { TokenTextSplitter } from '@langchain/textsplitters';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,15 +7,16 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import { TokenTextSplitter } from '@langchain/textsplitters';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class TextSplitterTokenSplitter implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Token Splitter',
 		name: 'textSplitterTokenSplitter',
 		icon: 'fa:grip-lines-vertical',
+		iconColor: 'black',
 		group: ['transform'],
 		version: 1,
 		description: 'Split text into chunks by tokens',
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolCalculator/ToolCalculator.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolCalculator/ToolCalculator.node.ts
index f50a6216c044c..6d67a04555138 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolCalculator/ToolCalculator.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolCalculator/ToolCalculator.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { Calculator } from '@langchain/community/tools/calculator';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,15 +7,16 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import { Calculator } from '@langchain/community/tools/calculator';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class ToolCalculator implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Calculator',
 		name: 'toolCalculator',
 		icon: 'fa:calculator',
+		iconColor: 'black',
 		group: ['transform'],
 		version: 1,
 		description: 'Make it easier for AI agents to perform arithmetic',
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolCode/ToolCode.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolCode/ToolCode.node.ts
index 1491662e610f3..029bce48f68f7 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolCode/ToolCode.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolCode/ToolCode.node.ts
@@ -15,20 +15,18 @@ import type {
 } from 'n8n-workflow';
 import { jsonParse, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
+import { inputSchemaField, jsonSchemaExampleField, schemaTypeField } from '@utils/descriptions';
+import { convertJsonSchemaToZod, generateSchema } from '@utils/schemaParsing';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
 import type { DynamicZodObject } from '../../../types/zod.types';
-import {
-	inputSchemaField,
-	jsonSchemaExampleField,
-	schemaTypeField,
-} from '../../../utils/descriptions';
-import { convertJsonSchemaToZod, generateSchema } from '../../../utils/schemaParsing';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
 
 export class ToolCode implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Code Tool',
 		name: 'toolCode',
 		icon: 'fa:code',
+		iconColor: 'black',
 		group: ['transform'],
 		version: [1, 1.1],
 		description: 'Write a tool in JS or Python',
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/ToolHttpRequest.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/ToolHttpRequest.node.ts
index f279c1e751635..bfdd3e7ace4df 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/ToolHttpRequest.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/ToolHttpRequest.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { DynamicTool } from '@langchain/core/tools';
 import type {
 	INodeType,
 	INodeTypeDescription,
@@ -9,19 +10,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError, tryToParseAlphanumericString } from 'n8n-workflow';
 
-import { DynamicTool } from '@langchain/core/tools';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
-
-import { N8nTool } from '../../../utils/N8nTool';
-import {
-	configureHttpRequestFunction,
-	configureResponseOptimizer,
-	extractParametersFromText,
-	prepareToolDescription,
-	configureToolFunction,
-	updateParametersAndOptions,
-	makeToolInputSchema,
-} from './utils';
+import { N8nTool } from '@utils/N8nTool';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 import {
 	authenticationProperties,
@@ -31,8 +21,16 @@ import {
 	placeholderDefinitionsCollection,
 	specifyBySelector,
 } from './descriptions';
-
 import type { PlaceholderDefinition, ToolParameter } from './interfaces';
+import {
+	configureHttpRequestFunction,
+	configureResponseOptimizer,
+	extractParametersFromText,
+	prepareToolDescription,
+	configureToolFunction,
+	updateParametersAndOptions,
+	makeToolInputSchema,
+} from './utils';
 
 export class ToolHttpRequest implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/test/ToolHttpRequest.node.test.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/test/ToolHttpRequest.node.test.ts
index 1a99896fff4b1..05ed1e619c2ac 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/test/ToolHttpRequest.node.test.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/test/ToolHttpRequest.node.test.ts
@@ -2,7 +2,8 @@ import { mock } from 'jest-mock-extended';
 import type { IExecuteFunctions, INode } from 'n8n-workflow';
 import { jsonParse } from 'n8n-workflow';
 
-import type { N8nTool } from '../../../../utils/N8nTool';
+import type { N8nTool } from '@utils/N8nTool';
+
 import { ToolHttpRequest } from '../ToolHttpRequest.node';
 
 describe('ToolHttpRequest', () => {
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolSerpApi/ToolSerpApi.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolSerpApi/ToolSerpApi.node.ts
index 709b06b7ac02e..7a7a09b933a99 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolSerpApi/ToolSerpApi.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolSerpApi/ToolSerpApi.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { SerpAPI } from '@langchain/community/tools/serpapi';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,9 +7,9 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import { SerpAPI } from '@langchain/community/tools/serpapi';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class ToolSerpApi implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolVectorStore/ToolVectorStore.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolVectorStore/ToolVectorStore.node.ts
index 6f4aa19fb3bad..aaa2ca37d96aa 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolVectorStore/ToolVectorStore.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolVectorStore/ToolVectorStore.node.ts
@@ -1,3 +1,7 @@
+import type { BaseLanguageModel } from '@langchain/core/language_models/base';
+import type { VectorStore } from '@langchain/core/vectorstores';
+import { VectorDBQAChain } from 'langchain/chains';
+import { VectorStoreQATool } from 'langchain/tools';
 import type {
 	INodeType,
 	INodeTypeDescription,
@@ -6,18 +10,15 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { VectorStoreQATool } from 'langchain/tools';
-import type { VectorStore } from '@langchain/core/vectorstores';
-import type { BaseLanguageModel } from '@langchain/core/language_models/base';
-import { VectorDBQAChain } from 'langchain/chains';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
-import { logWrapper } from '../../../utils/logWrapper';
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class ToolVectorStore implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Vector Store Tool',
 		name: 'toolVectorStore',
 		icon: 'fa:database',
+		iconColor: 'black',
 		group: ['transform'],
 		version: [1],
 		description: 'Retrieve context from vector store',
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWikipedia/ToolWikipedia.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWikipedia/ToolWikipedia.node.ts
index e462e38febd0c..4eef3a1b450cb 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolWikipedia/ToolWikipedia.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWikipedia/ToolWikipedia.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { WikipediaQueryRun } from '@langchain/community/tools/wikipedia_query_run';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,9 +7,9 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import { WikipediaQueryRun } from '@langchain/community/tools/wikipedia_query_run';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class ToolWikipedia implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWolframAlpha/ToolWolframAlpha.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWolframAlpha/ToolWolframAlpha.node.ts
index 93290e63ad765..162b78ba8ec72 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolWolframAlpha/ToolWolframAlpha.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWolframAlpha/ToolWolframAlpha.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { WolframAlphaTool } from '@langchain/community/tools/wolframalpha';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,9 +7,9 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import { WolframAlphaTool } from '@langchain/community/tools/wolframalpha';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class ToolWolframAlpha implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/ToolWorkflow.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/ToolWorkflow.node.ts
index d85ff722712b2..de7abf6a8b6ea 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/ToolWorkflow.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/ToolWorkflow.node.ts
@@ -1,569 +1,42 @@
-import type { CallbackManagerForToolRun } from '@langchain/core/callbacks/manager';
-import { DynamicStructuredTool, DynamicTool } from '@langchain/core/tools';
-import type { JSONSchema7 } from 'json-schema';
-import get from 'lodash/get';
-import isObject from 'lodash/isObject';
-import type { SetField, SetNodeOptions } from 'n8n-nodes-base/dist/nodes/Set/v2/helpers/interfaces';
-import * as manual from 'n8n-nodes-base/dist/nodes/Set/v2/manual.mode';
-import type {
-	IExecuteWorkflowInfo,
-	INodeExecutionData,
-	INodeType,
-	INodeTypeDescription,
-	IWorkflowBase,
-	ISupplyDataFunctions,
-	SupplyData,
-	ExecutionError,
-	ExecuteWorkflowData,
-	IDataObject,
-	INodeParameterResourceLocator,
-	ITaskMetadata,
-} from 'n8n-workflow';
-import { NodeConnectionType, NodeOperationError, jsonParse } from 'n8n-workflow';
-
-import type { DynamicZodObject } from '../../../types/zod.types';
-import {
-	jsonSchemaExampleField,
-	schemaTypeField,
-	inputSchemaField,
-} from '../../../utils/descriptions';
-import { convertJsonSchemaToZod, generateSchema } from '../../../utils/schemaParsing';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
-
-export class ToolWorkflow implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'Call n8n Workflow Tool',
-		name: 'toolWorkflow',
-		icon: 'fa:network-wired',
-		group: ['transform'],
-		version: [1, 1.1, 1.2, 1.3],
-		description: 'Uses another n8n workflow as a tool. Allows packaging any n8n node(s) as a tool.',
-		defaults: {
-			name: 'Call n8n Workflow Tool',
-		},
-		codex: {
-			categories: ['AI'],
-			subcategories: {
-				AI: ['Tools'],
-				Tools: ['Recommended Tools'],
-			},
-			resources: {
-				primaryDocumentation: [
-					{
-						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.toolworkflow/',
-					},
-				],
-			},
-		},
-		// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
-		inputs: [],
-		// eslint-disable-next-line n8n-nodes-base/node-class-description-outputs-wrong
-		outputs: [NodeConnectionType.AiTool],
-		outputNames: ['Tool'],
-		properties: [
-			getConnectionHintNoticeField([NodeConnectionType.AiAgent]),
-			{
-				displayName:
-					'See an example of a workflow to suggest meeting slots using AI <a href="/templates/1953" target="_blank">here</a>.',
-				name: 'noticeTemplateExample',
-				type: 'notice',
-				default: '',
-			},
-			{
-				displayName: 'Name',
-				name: 'name',
-				type: 'string',
-				default: '',
-				placeholder: 'My_Color_Tool',
-				displayOptions: {
-					show: {
-						'@version': [1],
-					},
-				},
-			},
-			{
-				displayName: 'Name',
-				name: 'name',
-				type: 'string',
-				default: '',
-				placeholder: 'e.g. My_Color_Tool',
-				validateType: 'string-alphanumeric',
-				description:
-					'The name of the function to be called, could contain letters, numbers, and underscores only',
-				displayOptions: {
-					show: {
-						'@version': [{ _cnd: { gte: 1.1 } }],
-					},
-				},
-			},
-			{
-				displayName: 'Description',
-				name: 'description',
-				type: 'string',
-				default: '',
-				placeholder:
-					'Call this tool to get a random color. The input should be a string with comma separted names of colors to exclude.',
-				typeOptions: {
-					rows: 3,
-				},
-			},
-
-			{
-				displayName:
-					'This tool will call the workflow you define below, and look in the last node for the response. The workflow needs to start with an Execute Workflow trigger',
-				name: 'executeNotice',
-				type: 'notice',
-				default: '',
-			},
-
-			{
-				displayName: 'Source',
-				name: 'source',
-				type: 'options',
-				options: [
-					{
-						name: 'Database',
-						value: 'database',
-						description: 'Load the workflow from the database by ID',
-					},
-					{
-						name: 'Define Below',
-						value: 'parameter',
-						description: 'Pass the JSON code of a workflow',
-					},
-				],
-				default: 'database',
-				description: 'Where to get the workflow to execute from',
-			},
-
-			// ----------------------------------
-			//         source:database
-			// ----------------------------------
-			{
-				displayName: 'Workflow ID',
-				name: 'workflowId',
-				type: 'string',
-				displayOptions: {
-					show: {
-						source: ['database'],
-						'@version': [{ _cnd: { lte: 1.1 } }],
-					},
-				},
-				default: '',
-				required: true,
-				description: 'The workflow to execute',
-				hint: 'Can be found in the URL of the workflow',
-			},
-
-			{
-				displayName: 'Workflow',
-				name: 'workflowId',
-				type: 'workflowSelector',
-				displayOptions: {
-					show: {
-						source: ['database'],
-						'@version': [{ _cnd: { gte: 1.2 } }],
-					},
-				},
-				default: '',
-				required: true,
-			},
-
-			// ----------------------------------
-			//         source:parameter
-			// ----------------------------------
-			{
-				displayName: 'Workflow JSON',
-				name: 'workflowJson',
-				type: 'json',
-				typeOptions: {
-					rows: 10,
-				},
-				displayOptions: {
-					show: {
-						source: ['parameter'],
-					},
-				},
-				default: '\n\n\n\n\n\n\n\n\n',
-				required: true,
-				description: 'The workflow JSON code to execute',
-			},
-			// ----------------------------------
-			//         For all
-			// ----------------------------------
-			{
-				displayName: 'Field to Return',
-				name: 'responsePropertyName',
-				type: 'string',
-				default: 'response',
-				required: true,
-				hint: 'The field in the last-executed node of the workflow that contains the response',
-				description:
-					'Where to find the data that this tool should return. n8n will look in the output of the last-executed node of the workflow for a field with this name, and return its value.',
-				displayOptions: {
-					show: {
-						'@version': [{ _cnd: { lt: 1.3 } }],
-					},
-				},
-			},
-			{
-				displayName: 'Extra Workflow Inputs',
-				name: 'fields',
-				placeholder: 'Add Value',
-				type: 'fixedCollection',
-				description:
-					"These will be output by the 'execute workflow' trigger of the workflow being called",
-				typeOptions: {
-					multipleValues: true,
-					sortable: true,
-				},
-				default: {},
-				options: [
-					{
-						name: 'values',
-						displayName: 'Values',
-						values: [
-							{
-								displayName: 'Name',
-								name: 'name',
-								type: 'string',
-								default: '',
-								placeholder: 'e.g. fieldName',
-								description:
-									'Name of the field to set the value of. Supports dot-notation. Example: data.person[0].name.',
-								requiresDataPath: 'single',
-							},
-							{
-								displayName: 'Type',
-								name: 'type',
-								type: 'options',
-								description: 'The field value type',
-								// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
-								options: [
-									{
-										name: 'String',
-										value: 'stringValue',
-									},
-									{
-										name: 'Number',
-										value: 'numberValue',
-									},
-									{
-										name: 'Boolean',
-										value: 'booleanValue',
-									},
-									{
-										name: 'Array',
-										value: 'arrayValue',
-									},
-									{
-										name: 'Object',
-										value: 'objectValue',
-									},
-								],
-								default: 'stringValue',
-							},
-							{
-								displayName: 'Value',
-								name: 'stringValue',
-								type: 'string',
-								default: '',
-								displayOptions: {
-									show: {
-										type: ['stringValue'],
-									},
-								},
-								validateType: 'string',
-								ignoreValidationDuringExecution: true,
-							},
-							{
-								displayName: 'Value',
-								name: 'numberValue',
-								type: 'string',
-								default: '',
-								displayOptions: {
-									show: {
-										type: ['numberValue'],
-									},
-								},
-								validateType: 'number',
-								ignoreValidationDuringExecution: true,
-							},
-							{
-								displayName: 'Value',
-								name: 'booleanValue',
-								type: 'options',
-								default: 'true',
-								options: [
-									{
-										name: 'True',
-										value: 'true',
-									},
-									{
-										name: 'False',
-										value: 'false',
-									},
-								],
-								displayOptions: {
-									show: {
-										type: ['booleanValue'],
-									},
-								},
-								validateType: 'boolean',
-								ignoreValidationDuringExecution: true,
-							},
-							{
-								displayName: 'Value',
-								name: 'arrayValue',
-								type: 'string',
-								default: '',
-								placeholder: 'e.g. [ arrayItem1, arrayItem2, arrayItem3 ]',
-								displayOptions: {
-									show: {
-										type: ['arrayValue'],
-									},
-								},
-								validateType: 'array',
-								ignoreValidationDuringExecution: true,
-							},
-							{
-								displayName: 'Value',
-								name: 'objectValue',
-								type: 'json',
-								default: '={}',
-								typeOptions: {
-									rows: 2,
-								},
-								displayOptions: {
-									show: {
-										type: ['objectValue'],
-									},
-								},
-								validateType: 'object',
-								ignoreValidationDuringExecution: true,
-							},
-						],
-					},
-				],
-			},
-			// ----------------------------------
-			//         Output Parsing
-			// ----------------------------------
-			{
-				displayName: 'Specify Input Schema',
-				name: 'specifyInputSchema',
-				type: 'boolean',
-				description:
-					'Whether to specify the schema for the function. This would require the LLM to provide the input in the correct format and would validate it against the schema.',
-				noDataExpression: true,
-				default: false,
-			},
-			{ ...schemaTypeField, displayOptions: { show: { specifyInputSchema: [true] } } },
-			jsonSchemaExampleField,
-			inputSchemaField,
-		],
-	};
-
-	async supplyData(this: ISupplyDataFunctions, itemIndex: number): Promise<SupplyData> {
-		const workflowProxy = this.getWorkflowDataProxy(0);
-
-		const name = this.getNodeParameter('name', itemIndex) as string;
-		const description = this.getNodeParameter('description', itemIndex) as string;
-
-		let subExecutionId: string | undefined;
-		let subWorkflowId: string | undefined;
-
-		const useSchema = this.getNodeParameter('specifyInputSchema', itemIndex) as boolean;
-		let tool: DynamicTool | DynamicStructuredTool | undefined = undefined;
-
-		const runFunction = async (
-			query: string | IDataObject,
-			runManager?: CallbackManagerForToolRun,
-		): Promise<string> => {
-			const source = this.getNodeParameter('source', itemIndex) as string;
-			const workflowInfo: IExecuteWorkflowInfo = {};
-			if (source === 'database') {
-				// Read workflow from database
-				const nodeVersion = this.getNode().typeVersion;
-				if (nodeVersion <= 1.1) {
-					workflowInfo.id = this.getNodeParameter('workflowId', itemIndex) as string;
-				} else {
-					const { value } = this.getNodeParameter(
-						'workflowId',
-						itemIndex,
-						{},
-					) as INodeParameterResourceLocator;
-					workflowInfo.id = value as string;
-				}
-
-				subWorkflowId = workflowInfo.id;
-			} else if (source === 'parameter') {
-				// Read workflow from parameter
-				const workflowJson = this.getNodeParameter('workflowJson', itemIndex) as string;
-				try {
-					workflowInfo.code = JSON.parse(workflowJson) as IWorkflowBase;
-
-					// subworkflow is same as parent workflow
-					subWorkflowId = workflowProxy.$workflow.id;
-				} catch (error) {
-					throw new NodeOperationError(
-						this.getNode(),
-						`The provided workflow is not valid JSON: "${(error as Error).message}"`,
+import type { IVersionedNodeType, INodeTypeBaseDescription } from 'n8n-workflow';
+import { VersionedNodeType } from 'n8n-workflow';
+
+import { ToolWorkflowV1 } from './v1/ToolWorkflowV1.node';
+import { ToolWorkflowV2 } from './v2/ToolWorkflowV2.node';
+
+export class ToolWorkflow extends VersionedNodeType {
+	constructor() {
+		const baseDescription: INodeTypeBaseDescription = {
+			displayName: 'Call n8n Sub-Workflow Tool',
+			name: 'toolWorkflow',
+			icon: 'fa:network-wired',
+			group: ['transform'],
+			description:
+				'Uses another n8n workflow as a tool. Allows packaging any n8n node(s) as a tool.',
+			codex: {
+				categories: ['AI'],
+				subcategories: {
+					AI: ['Tools'],
+					Tools: ['Recommended Tools'],
+				},
+				resources: {
+					primaryDocumentation: [
 						{
-							itemIndex,
+							url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.toolworkflow/',
 						},
-					);
-				}
-			}
-
-			const rawData: IDataObject = { query };
-
-			const workflowFieldsJson = this.getNodeParameter('fields.values', itemIndex, [], {
-				rawExpressions: true,
-			}) as SetField[];
-
-			// Copied from Set Node v2
-			for (const entry of workflowFieldsJson) {
-				if (entry.type === 'objectValue' && (entry.objectValue as string).startsWith('=')) {
-					rawData[entry.name] = (entry.objectValue as string).replace(/^=+/, '');
-				}
-			}
-
-			const options: SetNodeOptions = {
-				include: 'all',
-			};
-
-			const newItem = await manual.execute.call(
-				this,
-				{ json: { query } },
-				itemIndex,
-				options,
-				rawData,
-				this.getNode(),
-			);
-
-			const items = [newItem] as INodeExecutionData[];
-
-			let receivedData: ExecuteWorkflowData;
-			try {
-				receivedData = await this.executeWorkflow(workflowInfo, items, runManager?.getChild(), {
-					parentExecution: {
-						executionId: workflowProxy.$execution.id,
-						workflowId: workflowProxy.$workflow.id,
-					},
-				});
-				subExecutionId = receivedData.executionId;
-			} catch (error) {
-				// Make sure a valid error gets returned that can by json-serialized else it will
-				// not show up in the frontend
-				throw new NodeOperationError(this.getNode(), error as Error);
-			}
-
-			const response: string | undefined = get(receivedData, 'data[0][0].json') as
-				| string
-				| undefined;
-			if (response === undefined) {
-				throw new NodeOperationError(
-					this.getNode(),
-					'There was an error: "The workflow did not return a response"',
-				);
-			}
-
-			return response;
-		};
-
-		const toolHandler = async (
-			query: string | IDataObject,
-			runManager?: CallbackManagerForToolRun,
-		): Promise<string> => {
-			const { index } = this.addInputData(NodeConnectionType.AiTool, [[{ json: { query } }]]);
-
-			let response: string = '';
-			let executionError: ExecutionError | undefined;
-			try {
-				response = await runFunction(query, runManager);
-			} catch (error) {
-				// TODO: Do some more testing. Issues here should actually fail the workflow
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-				executionError = error;
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-				response = `There was an error: "${error.message}"`;
-			}
-
-			if (typeof response === 'number') {
-				response = (response as number).toString();
-			}
-
-			if (isObject(response)) {
-				response = JSON.stringify(response, null, 2);
-			}
-
-			if (typeof response !== 'string') {
-				// TODO: Do some more testing. Issues here should actually fail the workflow
-				executionError = new NodeOperationError(this.getNode(), 'Wrong output type returned', {
-					description: `The response property should be a string, but it is an ${typeof response}`,
-				});
-				response = `There was an error: "${executionError.message}"`;
-			}
-
-			let metadata: ITaskMetadata | undefined;
-			if (subExecutionId && subWorkflowId) {
-				metadata = {
-					subExecution: {
-						executionId: subExecutionId,
-						workflowId: subWorkflowId,
-					},
-				};
-			}
-
-			if (executionError) {
-				void this.addOutputData(NodeConnectionType.AiTool, index, executionError, metadata);
-			} else {
-				// Output always needs to be an object
-				// so we try to parse the response as JSON and if it fails we just return the string wrapped in an object
-				const json = jsonParse<IDataObject>(response, { fallbackValue: { response } });
-				void this.addOutputData(NodeConnectionType.AiTool, index, [[{ json }]], metadata);
-			}
-			return response;
-		};
-
-		const functionBase = {
-			name,
-			description,
-			func: toolHandler,
+					],
+				},
+			},
+			defaultVersion: 2,
 		};
 
-		if (useSchema) {
-			try {
-				// We initialize these even though one of them will always be empty
-				// it makes it easier to navigate the ternary operator
-				const jsonExample = this.getNodeParameter('jsonSchemaExample', itemIndex, '') as string;
-				const inputSchema = this.getNodeParameter('inputSchema', itemIndex, '') as string;
-
-				const schemaType = this.getNodeParameter('schemaType', itemIndex) as 'fromJson' | 'manual';
-				const jsonSchema =
-					schemaType === 'fromJson'
-						? generateSchema(jsonExample)
-						: jsonParse<JSONSchema7>(inputSchema);
-
-				const zodSchema = convertJsonSchemaToZod<DynamicZodObject>(jsonSchema);
-
-				tool = new DynamicStructuredTool({
-					schema: zodSchema,
-					...functionBase,
-				});
-			} catch (error) {
-				throw new NodeOperationError(
-					this.getNode(),
-					'Error during parsing of JSON Schema. \n ' + error,
-				);
-			}
-		} else {
-			tool = new DynamicTool(functionBase);
-		}
-
-		return {
-			response: tool,
+		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
+			1: new ToolWorkflowV1(baseDescription),
+			1.1: new ToolWorkflowV1(baseDescription),
+			1.2: new ToolWorkflowV1(baseDescription),
+			1.3: new ToolWorkflowV1(baseDescription),
+			2: new ToolWorkflowV2(baseDescription),
 		};
+		super(nodeVersions, baseDescription);
 	}
 }
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v1/ToolWorkflowV1.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v1/ToolWorkflowV1.node.ts
new file mode 100644
index 0000000000000..4c33c86b4e744
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v1/ToolWorkflowV1.node.ts
@@ -0,0 +1,241 @@
+import type { CallbackManagerForToolRun } from '@langchain/core/callbacks/manager';
+import { DynamicStructuredTool, DynamicTool } from '@langchain/core/tools';
+import type { JSONSchema7 } from 'json-schema';
+import get from 'lodash/get';
+import isObject from 'lodash/isObject';
+import type { SetField, SetNodeOptions } from 'n8n-nodes-base/dist/nodes/Set/v2/helpers/interfaces';
+import * as manual from 'n8n-nodes-base/dist/nodes/Set/v2/manual.mode';
+import type {
+	IExecuteWorkflowInfo,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+	IWorkflowBase,
+	ISupplyDataFunctions,
+	SupplyData,
+	ExecutionError,
+	ExecuteWorkflowData,
+	IDataObject,
+	INodeParameterResourceLocator,
+	ITaskMetadata,
+	INodeTypeBaseDescription,
+} from 'n8n-workflow';
+import { NodeConnectionType, NodeOperationError, jsonParse } from 'n8n-workflow';
+
+import { versionDescription } from './versionDescription';
+import type { DynamicZodObject } from '../../../../types/zod.types';
+import { convertJsonSchemaToZod, generateSchema } from '../../../../utils/schemaParsing';
+
+export class ToolWorkflowV1 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			...versionDescription,
+		};
+	}
+
+	async supplyData(this: ISupplyDataFunctions, itemIndex: number): Promise<SupplyData> {
+		const workflowProxy = this.getWorkflowDataProxy(0);
+
+		const name = this.getNodeParameter('name', itemIndex) as string;
+		const description = this.getNodeParameter('description', itemIndex) as string;
+
+		let subExecutionId: string | undefined;
+		let subWorkflowId: string | undefined;
+
+		const useSchema = this.getNodeParameter('specifyInputSchema', itemIndex) as boolean;
+		let tool: DynamicTool | DynamicStructuredTool | undefined = undefined;
+
+		const runFunction = async (
+			query: string | IDataObject,
+			runManager?: CallbackManagerForToolRun,
+		): Promise<string> => {
+			const source = this.getNodeParameter('source', itemIndex) as string;
+			const workflowInfo: IExecuteWorkflowInfo = {};
+			if (source === 'database') {
+				// Read workflow from database
+				const nodeVersion = this.getNode().typeVersion;
+				if (nodeVersion <= 1.1) {
+					workflowInfo.id = this.getNodeParameter('workflowId', itemIndex) as string;
+				} else {
+					const { value } = this.getNodeParameter(
+						'workflowId',
+						itemIndex,
+						{},
+					) as INodeParameterResourceLocator;
+					workflowInfo.id = value as string;
+				}
+
+				subWorkflowId = workflowInfo.id;
+			} else if (source === 'parameter') {
+				// Read workflow from parameter
+				const workflowJson = this.getNodeParameter('workflowJson', itemIndex) as string;
+				try {
+					workflowInfo.code = JSON.parse(workflowJson) as IWorkflowBase;
+
+					// subworkflow is same as parent workflow
+					subWorkflowId = workflowProxy.$workflow.id;
+				} catch (error) {
+					throw new NodeOperationError(
+						this.getNode(),
+						`The provided workflow is not valid JSON: "${(error as Error).message}"`,
+						{
+							itemIndex,
+						},
+					);
+				}
+			}
+
+			const rawData: IDataObject = { query };
+
+			const workflowFieldsJson = this.getNodeParameter('fields.values', itemIndex, [], {
+				rawExpressions: true,
+			}) as SetField[];
+
+			// Copied from Set Node v2
+			for (const entry of workflowFieldsJson) {
+				if (entry.type === 'objectValue' && (entry.objectValue as string).startsWith('=')) {
+					rawData[entry.name] = (entry.objectValue as string).replace(/^=+/, '');
+				}
+			}
+
+			const options: SetNodeOptions = {
+				include: 'all',
+			};
+
+			const newItem = await manual.execute.call(
+				this,
+				{ json: { query } },
+				itemIndex,
+				options,
+				rawData,
+				this.getNode(),
+			);
+
+			const items = [newItem] as INodeExecutionData[];
+
+			let receivedData: ExecuteWorkflowData;
+			try {
+				receivedData = await this.executeWorkflow(workflowInfo, items, runManager?.getChild(), {
+					parentExecution: {
+						executionId: workflowProxy.$execution.id,
+						workflowId: workflowProxy.$workflow.id,
+					},
+				});
+				subExecutionId = receivedData.executionId;
+			} catch (error) {
+				// Make sure a valid error gets returned that can by json-serialized else it will
+				// not show up in the frontend
+				throw new NodeOperationError(this.getNode(), error as Error);
+			}
+
+			const response: string | undefined = get(receivedData, 'data[0][0].json') as
+				| string
+				| undefined;
+			if (response === undefined) {
+				throw new NodeOperationError(
+					this.getNode(),
+					'There was an error: "The workflow did not return a response"',
+				);
+			}
+
+			return response;
+		};
+
+		const toolHandler = async (
+			query: string | IDataObject,
+			runManager?: CallbackManagerForToolRun,
+		): Promise<string> => {
+			const { index } = this.addInputData(NodeConnectionType.AiTool, [[{ json: { query } }]]);
+
+			let response: string = '';
+			let executionError: ExecutionError | undefined;
+			try {
+				response = await runFunction(query, runManager);
+			} catch (error) {
+				// TODO: Do some more testing. Issues here should actually fail the workflow
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+				executionError = error;
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+				response = `There was an error: "${error.message}"`;
+			}
+
+			if (typeof response === 'number') {
+				response = (response as number).toString();
+			}
+
+			if (isObject(response)) {
+				response = JSON.stringify(response, null, 2);
+			}
+
+			if (typeof response !== 'string') {
+				// TODO: Do some more testing. Issues here should actually fail the workflow
+				executionError = new NodeOperationError(this.getNode(), 'Wrong output type returned', {
+					description: `The response property should be a string, but it is an ${typeof response}`,
+				});
+				response = `There was an error: "${executionError.message}"`;
+			}
+
+			let metadata: ITaskMetadata | undefined;
+			if (subExecutionId && subWorkflowId) {
+				metadata = {
+					subExecution: {
+						executionId: subExecutionId,
+						workflowId: subWorkflowId,
+					},
+				};
+			}
+
+			if (executionError) {
+				void this.addOutputData(NodeConnectionType.AiTool, index, executionError, metadata);
+			} else {
+				// Output always needs to be an object
+				// so we try to parse the response as JSON and if it fails we just return the string wrapped in an object
+				const json = jsonParse<IDataObject>(response, { fallbackValue: { response } });
+				void this.addOutputData(NodeConnectionType.AiTool, index, [[{ json }]], metadata);
+			}
+			return response;
+		};
+
+		const functionBase = {
+			name,
+			description,
+			func: toolHandler,
+		};
+
+		if (useSchema) {
+			try {
+				// We initialize these even though one of them will always be empty
+				// it makes it easier to navigate the ternary operator
+				const jsonExample = this.getNodeParameter('jsonSchemaExample', itemIndex, '') as string;
+				const inputSchema = this.getNodeParameter('inputSchema', itemIndex, '') as string;
+
+				const schemaType = this.getNodeParameter('schemaType', itemIndex) as 'fromJson' | 'manual';
+				const jsonSchema =
+					schemaType === 'fromJson'
+						? generateSchema(jsonExample)
+						: jsonParse<JSONSchema7>(inputSchema);
+
+				const zodSchema = convertJsonSchemaToZod<DynamicZodObject>(jsonSchema);
+
+				tool = new DynamicStructuredTool({
+					schema: zodSchema,
+					...functionBase,
+				});
+			} catch (error) {
+				throw new NodeOperationError(
+					this.getNode(),
+					'Error during parsing of JSON Schema. \n ' + error,
+				);
+			}
+		} else {
+			tool = new DynamicTool(functionBase);
+		}
+
+		return {
+			response: tool,
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v1/versionDescription.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v1/versionDescription.ts
new file mode 100644
index 0000000000000..da7a0e9815cea
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v1/versionDescription.ts
@@ -0,0 +1,345 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { INodeTypeDescription } from 'n8n-workflow';
+import { NodeConnectionType } from 'n8n-workflow';
+
+import {
+	inputSchemaField,
+	jsonSchemaExampleField,
+	schemaTypeField,
+} from '../../../../utils/descriptions';
+import { getConnectionHintNoticeField } from '../../../../utils/sharedFields';
+
+export const versionDescription: INodeTypeDescription = {
+	displayName: 'Call n8n Workflow Tool',
+	name: 'toolWorkflow',
+	icon: 'fa:network-wired',
+	iconColor: 'black',
+	group: ['transform'],
+	version: [1, 1.1, 1.2, 1.3],
+	description: 'Uses another n8n workflow as a tool. Allows packaging any n8n node(s) as a tool.',
+	defaults: {
+		name: 'Call n8n Workflow Tool',
+	},
+	codex: {
+		categories: ['AI'],
+		subcategories: {
+			AI: ['Tools'],
+			Tools: ['Recommended Tools'],
+		},
+		resources: {
+			primaryDocumentation: [
+				{
+					url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.toolworkflow/',
+				},
+			],
+		},
+	},
+	// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
+	inputs: [],
+	// eslint-disable-next-line n8n-nodes-base/node-class-description-outputs-wrong
+	outputs: [NodeConnectionType.AiTool],
+	outputNames: ['Tool'],
+	properties: [
+		getConnectionHintNoticeField([NodeConnectionType.AiAgent]),
+		{
+			displayName:
+				'See an example of a workflow to suggest meeting slots using AI <a href="/templates/1953" target="_blank">here</a>.',
+			name: 'noticeTemplateExample',
+			type: 'notice',
+			default: '',
+		},
+		{
+			displayName: 'Name',
+			name: 'name',
+			type: 'string',
+			default: '',
+			placeholder: 'My_Color_Tool',
+			displayOptions: {
+				show: {
+					'@version': [1],
+				},
+			},
+		},
+		{
+			displayName: 'Name',
+			name: 'name',
+			type: 'string',
+			default: '',
+			placeholder: 'e.g. My_Color_Tool',
+			validateType: 'string-alphanumeric',
+			description:
+				'The name of the function to be called, could contain letters, numbers, and underscores only',
+			displayOptions: {
+				show: {
+					'@version': [{ _cnd: { gte: 1.1 } }],
+				},
+			},
+		},
+		{
+			displayName: 'Description',
+			name: 'description',
+			type: 'string',
+			default: '',
+			placeholder:
+				'Call this tool to get a random color. The input should be a string with comma separted names of colors to exclude.',
+			typeOptions: {
+				rows: 3,
+			},
+		},
+
+		{
+			displayName:
+				'This tool will call the workflow you define below, and look in the last node for the response. The workflow needs to start with an Execute Workflow trigger',
+			name: 'executeNotice',
+			type: 'notice',
+			default: '',
+		},
+
+		{
+			displayName: 'Source',
+			name: 'source',
+			type: 'options',
+			options: [
+				{
+					name: 'Database',
+					value: 'database',
+					description: 'Load the workflow from the database by ID',
+				},
+				{
+					name: 'Define Below',
+					value: 'parameter',
+					description: 'Pass the JSON code of a workflow',
+				},
+			],
+			default: 'database',
+			description: 'Where to get the workflow to execute from',
+		},
+
+		// ----------------------------------
+		//         source:database
+		// ----------------------------------
+		{
+			displayName: 'Workflow ID',
+			name: 'workflowId',
+			type: 'string',
+			displayOptions: {
+				show: {
+					source: ['database'],
+					'@version': [{ _cnd: { lte: 1.1 } }],
+				},
+			},
+			default: '',
+			required: true,
+			description: 'The workflow to execute',
+			hint: 'Can be found in the URL of the workflow',
+		},
+
+		{
+			displayName: 'Workflow',
+			name: 'workflowId',
+			type: 'workflowSelector',
+			displayOptions: {
+				show: {
+					source: ['database'],
+					'@version': [{ _cnd: { gte: 1.2 } }],
+				},
+			},
+			default: '',
+			required: true,
+		},
+
+		// ----------------------------------
+		//         source:parameter
+		// ----------------------------------
+		{
+			displayName: 'Workflow JSON',
+			name: 'workflowJson',
+			type: 'json',
+			typeOptions: {
+				rows: 10,
+			},
+			displayOptions: {
+				show: {
+					source: ['parameter'],
+				},
+			},
+			default: '\n\n\n\n\n\n\n\n\n',
+			required: true,
+			description: 'The workflow JSON code to execute',
+		},
+		// ----------------------------------
+		//         For all
+		// ----------------------------------
+		{
+			displayName: 'Field to Return',
+			name: 'responsePropertyName',
+			type: 'string',
+			default: 'response',
+			required: true,
+			hint: 'The field in the last-executed node of the workflow that contains the response',
+			description:
+				'Where to find the data that this tool should return. n8n will look in the output of the last-executed node of the workflow for a field with this name, and return its value.',
+			displayOptions: {
+				show: {
+					'@version': [{ _cnd: { lt: 1.3 } }],
+				},
+			},
+		},
+		{
+			displayName: 'Extra Workflow Inputs',
+			name: 'fields',
+			placeholder: 'Add Value',
+			type: 'fixedCollection',
+			description:
+				"These will be output by the 'execute workflow' trigger of the workflow being called",
+			typeOptions: {
+				multipleValues: true,
+				sortable: true,
+			},
+			default: {},
+			options: [
+				{
+					name: 'values',
+					displayName: 'Values',
+					values: [
+						{
+							displayName: 'Name',
+							name: 'name',
+							type: 'string',
+							default: '',
+							placeholder: 'e.g. fieldName',
+							description:
+								'Name of the field to set the value of. Supports dot-notation. Example: data.person[0].name.',
+							requiresDataPath: 'single',
+						},
+						{
+							displayName: 'Type',
+							name: 'type',
+							type: 'options',
+							description: 'The field value type',
+							// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+							options: [
+								{
+									name: 'String',
+									value: 'stringValue',
+								},
+								{
+									name: 'Number',
+									value: 'numberValue',
+								},
+								{
+									name: 'Boolean',
+									value: 'booleanValue',
+								},
+								{
+									name: 'Array',
+									value: 'arrayValue',
+								},
+								{
+									name: 'Object',
+									value: 'objectValue',
+								},
+							],
+							default: 'stringValue',
+						},
+						{
+							displayName: 'Value',
+							name: 'stringValue',
+							type: 'string',
+							default: '',
+							displayOptions: {
+								show: {
+									type: ['stringValue'],
+								},
+							},
+							validateType: 'string',
+							ignoreValidationDuringExecution: true,
+						},
+						{
+							displayName: 'Value',
+							name: 'numberValue',
+							type: 'string',
+							default: '',
+							displayOptions: {
+								show: {
+									type: ['numberValue'],
+								},
+							},
+							validateType: 'number',
+							ignoreValidationDuringExecution: true,
+						},
+						{
+							displayName: 'Value',
+							name: 'booleanValue',
+							type: 'options',
+							default: 'true',
+							options: [
+								{
+									name: 'True',
+									value: 'true',
+								},
+								{
+									name: 'False',
+									value: 'false',
+								},
+							],
+							displayOptions: {
+								show: {
+									type: ['booleanValue'],
+								},
+							},
+							validateType: 'boolean',
+							ignoreValidationDuringExecution: true,
+						},
+						{
+							displayName: 'Value',
+							name: 'arrayValue',
+							type: 'string',
+							default: '',
+							placeholder: 'e.g. [ arrayItem1, arrayItem2, arrayItem3 ]',
+							displayOptions: {
+								show: {
+									type: ['arrayValue'],
+								},
+							},
+							validateType: 'array',
+							ignoreValidationDuringExecution: true,
+						},
+						{
+							displayName: 'Value',
+							name: 'objectValue',
+							type: 'json',
+							default: '={}',
+							typeOptions: {
+								rows: 2,
+							},
+							displayOptions: {
+								show: {
+									type: ['objectValue'],
+								},
+							},
+							validateType: 'object',
+							ignoreValidationDuringExecution: true,
+						},
+					],
+				},
+			],
+		},
+		// ----------------------------------
+		//         Output Parsing
+		// ----------------------------------
+		{
+			displayName: 'Specify Input Schema',
+			name: 'specifyInputSchema',
+			type: 'boolean',
+			description:
+				'Whether to specify the schema for the function. This would require the LLM to provide the input in the correct format and would validate it against the schema.',
+			noDataExpression: true,
+			default: false,
+		},
+		{ ...schemaTypeField, displayOptions: { show: { specifyInputSchema: [true] } } },
+		jsonSchemaExampleField,
+		inputSchemaField,
+	],
+};
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/ToolWorkflowV2.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/ToolWorkflowV2.node.ts
new file mode 100644
index 0000000000000..22ca31e4da2b1
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/ToolWorkflowV2.node.ts
@@ -0,0 +1,42 @@
+import { loadWorkflowInputMappings } from 'n8n-nodes-base/dist/utils/workflowInputsResourceMapping/GenericFunctions';
+import type {
+	INodeTypeBaseDescription,
+	ISupplyDataFunctions,
+	SupplyData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import { WorkflowToolService } from './utils/WorkflowToolService';
+import { versionDescription } from './versionDescription';
+
+export class ToolWorkflowV2 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			...versionDescription,
+		};
+	}
+
+	methods = {
+		localResourceMapping: {
+			loadWorkflowInputMappings,
+		},
+	};
+
+	async supplyData(this: ISupplyDataFunctions, itemIndex: number): Promise<SupplyData> {
+		const workflowToolService = new WorkflowToolService(this);
+		const name = this.getNodeParameter('name', itemIndex) as string;
+		const description = this.getNodeParameter('description', itemIndex) as string;
+
+		const tool = await workflowToolService.createTool({
+			name,
+			description,
+			itemIndex,
+		});
+
+		return { response: tool };
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/ToolWorkflowV2.test.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/ToolWorkflowV2.test.ts
new file mode 100644
index 0000000000000..73aa24c6b7fef
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/ToolWorkflowV2.test.ts
@@ -0,0 +1,235 @@
+/* eslint-disable @typescript-eslint/dot-notation */ // Disabled to allow access to private methods
+import { DynamicTool } from '@langchain/core/tools';
+import { NodeOperationError } from 'n8n-workflow';
+import type {
+	ISupplyDataFunctions,
+	INodeExecutionData,
+	IWorkflowDataProxyData,
+	ExecuteWorkflowData,
+	INode,
+} from 'n8n-workflow';
+
+import { WorkflowToolService } from './utils/WorkflowToolService';
+
+// Mock ISupplyDataFunctions interface
+function createMockContext(overrides?: Partial<ISupplyDataFunctions>): ISupplyDataFunctions {
+	return {
+		getNodeParameter: jest.fn(),
+		getWorkflowDataProxy: jest.fn(),
+		getNode: jest.fn(),
+		executeWorkflow: jest.fn(),
+		addInputData: jest.fn(),
+		addOutputData: jest.fn(),
+		getCredentials: jest.fn(),
+		getCredentialsProperties: jest.fn(),
+		getInputData: jest.fn(),
+		getMode: jest.fn(),
+		getRestApiUrl: jest.fn(),
+		getTimezone: jest.fn(),
+		getWorkflow: jest.fn(),
+		getWorkflowStaticData: jest.fn(),
+		logger: {
+			debug: jest.fn(),
+			error: jest.fn(),
+			info: jest.fn(),
+			warn: jest.fn(),
+		},
+		...overrides,
+	} as ISupplyDataFunctions;
+}
+
+describe('WorkflowTool::WorkflowToolService', () => {
+	let context: ISupplyDataFunctions;
+	let service: WorkflowToolService;
+
+	beforeEach(() => {
+		// Prepare essential mocks
+		context = createMockContext();
+		jest.spyOn(context, 'getNode').mockReturnValue({
+			parameters: { workflowInputs: { schema: [] } },
+		} as unknown as INode);
+		service = new WorkflowToolService(context);
+	});
+
+	describe('createTool', () => {
+		it('should create a basic dynamic tool when schema is not used', async () => {
+			const toolParams = {
+				name: 'TestTool',
+				description: 'Test Description',
+				itemIndex: 0,
+			};
+
+			const result = await service.createTool(toolParams);
+
+			expect(result).toBeInstanceOf(DynamicTool);
+			expect(result).toHaveProperty('name', 'TestTool');
+			expect(result).toHaveProperty('description', 'Test Description');
+		});
+
+		it('should create a tool that can handle successful execution', async () => {
+			const toolParams = {
+				name: 'TestTool',
+				description: 'Test Description',
+				itemIndex: 0,
+			};
+
+			const TEST_RESPONSE = { msg: 'test response' };
+
+			const mockExecuteWorkflowResponse: ExecuteWorkflowData = {
+				data: [[{ json: TEST_RESPONSE }]],
+				executionId: 'test-execution',
+			};
+
+			jest.spyOn(context, 'executeWorkflow').mockResolvedValueOnce(mockExecuteWorkflowResponse);
+			jest.spyOn(context, 'addInputData').mockReturnValue({ index: 0 });
+			jest.spyOn(context, 'getNodeParameter').mockReturnValue('database');
+			jest.spyOn(context, 'getWorkflowDataProxy').mockReturnValue({
+				$execution: { id: 'exec-id' },
+				$workflow: { id: 'workflow-id' },
+			} as unknown as IWorkflowDataProxyData);
+
+			const tool = await service.createTool(toolParams);
+			const result = await tool.func('test query');
+
+			expect(result).toBe(JSON.stringify(TEST_RESPONSE, null, 2));
+			expect(context.addOutputData).toHaveBeenCalled();
+		});
+
+		it('should handle errors during tool execution', async () => {
+			const toolParams = {
+				name: 'TestTool',
+				description: 'Test Description',
+				itemIndex: 0,
+			};
+
+			jest
+				.spyOn(context, 'executeWorkflow')
+				.mockRejectedValueOnce(new Error('Workflow execution failed'));
+			jest.spyOn(context, 'addInputData').mockReturnValue({ index: 0 });
+			jest.spyOn(context, 'getNodeParameter').mockReturnValue('database');
+
+			const tool = await service.createTool(toolParams);
+			const result = await tool.func('test query');
+
+			expect(result).toContain('There was an error');
+			expect(context.addOutputData).toHaveBeenCalled();
+		});
+	});
+
+	describe('handleToolResponse', () => {
+		it('should handle number response', () => {
+			const result = service['handleToolResponse'](42);
+
+			expect(result).toBe('42');
+		});
+
+		it('should handle object response', () => {
+			const obj = { test: 'value' };
+
+			const result = service['handleToolResponse'](obj);
+
+			expect(result).toBe(JSON.stringify(obj, null, 2));
+		});
+
+		it('should handle string response', () => {
+			const result = service['handleToolResponse']('test response');
+
+			expect(result).toBe('test response');
+		});
+
+		it('should throw error for invalid response type', () => {
+			expect(() => service['handleToolResponse'](undefined)).toThrow(NodeOperationError);
+		});
+	});
+
+	describe('executeSubWorkflow', () => {
+		it('should successfully execute workflow and return response', async () => {
+			const workflowInfo = { id: 'test-workflow' };
+			const items: INodeExecutionData[] = [];
+			const workflowProxyMock = {
+				$execution: { id: 'exec-id' },
+				$workflow: { id: 'workflow-id' },
+			} as unknown as IWorkflowDataProxyData;
+
+			const TEST_RESPONSE = { msg: 'test response' };
+
+			const mockResponse: ExecuteWorkflowData = {
+				data: [[{ json: TEST_RESPONSE }]],
+				executionId: 'test-execution',
+			};
+
+			jest.spyOn(context, 'executeWorkflow').mockResolvedValueOnce(mockResponse);
+
+			const result = await service['executeSubWorkflow'](workflowInfo, items, workflowProxyMock);
+
+			expect(result.response).toBe(TEST_RESPONSE);
+			expect(result.subExecutionId).toBe('test-execution');
+		});
+
+		it('should throw error when workflow execution fails', async () => {
+			jest.spyOn(context, 'executeWorkflow').mockRejectedValueOnce(new Error('Execution failed'));
+
+			await expect(service['executeSubWorkflow']({}, [], {} as never)).rejects.toThrow(
+				NodeOperationError,
+			);
+		});
+
+		it('should throw error when workflow returns no response', async () => {
+			const mockResponse: ExecuteWorkflowData = {
+				data: [],
+				executionId: 'test-execution',
+			};
+
+			jest.spyOn(context, 'executeWorkflow').mockResolvedValueOnce(mockResponse);
+
+			await expect(service['executeSubWorkflow']({}, [], {} as never)).rejects.toThrow();
+		});
+	});
+
+	describe('getSubWorkflowInfo', () => {
+		it('should handle database source correctly', async () => {
+			const source = 'database';
+			const itemIndex = 0;
+			const workflowProxyMock = {
+				$workflow: { id: 'proxy-id' },
+			} as unknown as IWorkflowDataProxyData;
+
+			jest.spyOn(context, 'getNodeParameter').mockReturnValueOnce({ value: 'workflow-id' });
+
+			const result = await service['getSubWorkflowInfo'](source, itemIndex, workflowProxyMock);
+
+			expect(result.workflowInfo).toHaveProperty('id', 'workflow-id');
+			expect(result.subWorkflowId).toBe('workflow-id');
+		});
+
+		it('should handle parameter source correctly', async () => {
+			const source = 'parameter';
+			const itemIndex = 0;
+			const workflowProxyMock = {
+				$workflow: { id: 'proxy-id' },
+			} as unknown as IWorkflowDataProxyData;
+			const mockWorkflow = { id: 'test-workflow' };
+
+			jest.spyOn(context, 'getNodeParameter').mockReturnValueOnce(JSON.stringify(mockWorkflow));
+
+			const result = await service['getSubWorkflowInfo'](source, itemIndex, workflowProxyMock);
+
+			expect(result.workflowInfo.code).toEqual(mockWorkflow);
+			expect(result.subWorkflowId).toBe('proxy-id');
+		});
+
+		it('should throw error for invalid JSON in parameter source', async () => {
+			const source = 'parameter';
+			const itemIndex = 0;
+			const workflowProxyMock = {
+				$workflow: { id: 'proxy-id' },
+			} as unknown as IWorkflowDataProxyData;
+
+			jest.spyOn(context, 'getNodeParameter').mockReturnValueOnce('invalid json');
+
+			await expect(
+				service['getSubWorkflowInfo'](source, itemIndex, workflowProxyMock),
+			).rejects.toThrow(NodeOperationError);
+		});
+	});
+});
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/utils/FromAIParser.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/utils/FromAIParser.ts
new file mode 100644
index 0000000000000..4b9b6ed58ed4e
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/utils/FromAIParser.ts
@@ -0,0 +1,284 @@
+import type { ISupplyDataFunctions } from 'n8n-workflow';
+import { jsonParse, NodeOperationError } from 'n8n-workflow';
+import { z } from 'zod';
+
+type AllowedTypes = 'string' | 'number' | 'boolean' | 'json';
+export interface FromAIArgument {
+	key: string;
+	description?: string;
+	type?: AllowedTypes;
+	defaultValue?: string | number | boolean | Record<string, unknown>;
+}
+
+// TODO: We copied this class from the core package, once the new nodes context work is merged, this should be available in root node context and this file can be removed.
+// Please apply any changes to both files
+
+/**
+ * AIParametersParser
+ *
+ * This class encapsulates the logic for parsing node parameters, extracting $fromAI calls,
+ * generating Zod schemas, and creating LangChain tools.
+ */
+export class AIParametersParser {
+	private ctx: ISupplyDataFunctions;
+
+	/**
+	 * Constructs an instance of AIParametersParser.
+	 * @param ctx The execution context.
+	 */
+	constructor(ctx: ISupplyDataFunctions) {
+		this.ctx = ctx;
+	}
+
+	/**
+	 * Generates a Zod schema based on the provided FromAIArgument placeholder.
+	 * @param placeholder The FromAIArgument object containing key, type, description, and defaultValue.
+	 * @returns A Zod schema corresponding to the placeholder's type and constraints.
+	 */
+	generateZodSchema(placeholder: FromAIArgument): z.ZodTypeAny {
+		let schema: z.ZodTypeAny;
+
+		switch (placeholder.type?.toLowerCase()) {
+			case 'string':
+				schema = z.string();
+				break;
+			case 'number':
+				schema = z.number();
+				break;
+			case 'boolean':
+				schema = z.boolean();
+				break;
+			case 'json':
+				schema = z.record(z.any());
+				break;
+			default:
+				schema = z.string();
+		}
+
+		if (placeholder.description) {
+			schema = schema.describe(`${schema.description ?? ''} ${placeholder.description}`.trim());
+		}
+
+		if (placeholder.defaultValue !== undefined) {
+			schema = schema.default(placeholder.defaultValue);
+		}
+
+		return schema;
+	}
+
+	/**
+	 * Recursively traverses the nodeParameters object to find all $fromAI calls.
+	 * @param payload The current object or value being traversed.
+	 * @param collectedArgs The array collecting FromAIArgument objects.
+	 */
+	traverseNodeParameters(payload: unknown, collectedArgs: FromAIArgument[]) {
+		if (typeof payload === 'string') {
+			const fromAICalls = this.extractFromAICalls(payload);
+			fromAICalls.forEach((call) => collectedArgs.push(call));
+		} else if (Array.isArray(payload)) {
+			payload.forEach((item: unknown) => this.traverseNodeParameters(item, collectedArgs));
+		} else if (typeof payload === 'object' && payload !== null) {
+			Object.values(payload).forEach((value) => this.traverseNodeParameters(value, collectedArgs));
+		}
+	}
+
+	/**
+	 * Extracts all $fromAI calls from a given string
+	 * @param str The string to search for $fromAI calls.
+	 * @returns An array of FromAIArgument objects.
+	 *
+	 * This method uses a regular expression to find the start of each $fromAI function call
+	 * in the input string. It then employs a character-by-character parsing approach to
+	 * accurately extract the arguments of each call, handling nested parentheses and quoted strings.
+	 *
+	 * The parsing process:
+	 * 1. Finds the starting position of a $fromAI call using regex.
+	 * 2. Iterates through characters, keeping track of parentheses depth and quote status.
+	 * 3. Handles escaped characters within quotes to avoid premature quote closing.
+	 * 4. Builds the argument string until the matching closing parenthesis is found.
+	 * 5. Parses the extracted argument string into a FromAIArgument object.
+	 * 6. Repeats the process for all $fromAI calls in the input string.
+	 *
+	 */
+	extractFromAICalls(str: string): FromAIArgument[] {
+		const args: FromAIArgument[] = [];
+		// Regular expression to match the start of a $fromAI function call
+		const pattern = /\$fromAI\s*\(\s*/gi;
+		let match: RegExpExecArray | null;
+
+		while ((match = pattern.exec(str)) !== null) {
+			const startIndex = match.index + match[0].length;
+			let current = startIndex;
+			let inQuotes = false;
+			let quoteChar = '';
+			let parenthesesCount = 1;
+			let argsString = '';
+
+			// Parse the arguments string, handling nested parentheses and quotes
+			while (current < str.length && parenthesesCount > 0) {
+				const char = str[current];
+
+				if (inQuotes) {
+					// Handle characters inside quotes, including escaped characters
+					if (char === '\\' && current + 1 < str.length) {
+						argsString += char + str[current + 1];
+						current += 2;
+						continue;
+					}
+
+					if (char === quoteChar) {
+						inQuotes = false;
+						quoteChar = '';
+					}
+					argsString += char;
+				} else {
+					// Handle characters outside quotes
+					if (['"', "'", '`'].includes(char)) {
+						inQuotes = true;
+						quoteChar = char;
+					} else if (char === '(') {
+						parenthesesCount++;
+					} else if (char === ')') {
+						parenthesesCount--;
+					}
+
+					// Only add characters if we're still inside the main parentheses
+					if (parenthesesCount > 0 || char !== ')') {
+						argsString += char;
+					}
+				}
+
+				current++;
+			}
+
+			// If parentheses are balanced, parse the arguments
+			if (parenthesesCount === 0) {
+				try {
+					const parsedArgs = this.parseArguments(argsString);
+					args.push(parsedArgs);
+				} catch (error) {
+					// If parsing fails, throw an ApplicationError with details
+					throw new NodeOperationError(
+						this.ctx.getNode(),
+						`Failed to parse $fromAI arguments: ${argsString}: ${error}`,
+					);
+				}
+			} else {
+				// Log an error if parentheses are unbalanced
+				throw new NodeOperationError(
+					this.ctx.getNode(),
+					`Unbalanced parentheses while parsing $fromAI call: ${str.slice(startIndex)}`,
+				);
+			}
+		}
+
+		return args;
+	}
+
+	/**
+	 * Parses the arguments of a single $fromAI function call.
+	 * @param argsString The string containing the function arguments.
+	 * @returns A FromAIArgument object.
+	 */
+	parseArguments(argsString: string): FromAIArgument {
+		// Split arguments by commas not inside quotes
+		const args: string[] = [];
+		let currentArg = '';
+		let inQuotes = false;
+		let quoteChar = '';
+		let escapeNext = false;
+
+		for (let i = 0; i < argsString.length; i++) {
+			const char = argsString[i];
+
+			if (escapeNext) {
+				currentArg += char;
+				escapeNext = false;
+				continue;
+			}
+
+			if (char === '\\') {
+				escapeNext = true;
+				continue;
+			}
+
+			if (['"', "'", '`'].includes(char)) {
+				if (!inQuotes) {
+					inQuotes = true;
+					quoteChar = char;
+					currentArg += char;
+				} else if (char === quoteChar) {
+					inQuotes = false;
+					quoteChar = '';
+					currentArg += char;
+				} else {
+					currentArg += char;
+				}
+				continue;
+			}
+
+			if (char === ',' && !inQuotes) {
+				args.push(currentArg.trim());
+				currentArg = '';
+				continue;
+			}
+
+			currentArg += char;
+		}
+
+		if (currentArg) {
+			args.push(currentArg.trim());
+		}
+
+		// Remove surrounding quotes if present
+		const cleanArgs = args.map((arg) => {
+			const trimmed = arg.trim();
+			if (
+				(trimmed.startsWith("'") && trimmed.endsWith("'")) ||
+				(trimmed.startsWith('`') && trimmed.endsWith('`')) ||
+				(trimmed.startsWith('"') && trimmed.endsWith('"'))
+			) {
+				return trimmed
+					.slice(1, -1)
+					.replace(/\\'/g, "'")
+					.replace(/\\`/g, '`')
+					.replace(/\\"/g, '"')
+					.replace(/\\\\/g, '\\');
+			}
+			return trimmed;
+		});
+
+		const type = cleanArgs?.[2] || 'string';
+
+		if (!['string', 'number', 'boolean', 'json'].includes(type.toLowerCase())) {
+			throw new NodeOperationError(this.ctx.getNode(), `Invalid type: ${type}`);
+		}
+
+		return {
+			key: cleanArgs[0] || '',
+			description: cleanArgs[1],
+			type: (cleanArgs?.[2] ?? 'string') as AllowedTypes,
+			defaultValue: this.parseDefaultValue(cleanArgs[3]),
+		};
+	}
+
+	/**
+	 * Parses the default value, preserving its original type.
+	 * @param value The default value as a string.
+	 * @returns The parsed default value in its appropriate type.
+	 */
+	parseDefaultValue(
+		value: string | undefined,
+	): string | number | boolean | Record<string, unknown> | undefined {
+		if (value === undefined || value === '') return undefined;
+		const lowerValue = value.toLowerCase();
+		if (lowerValue === 'true') return true;
+		if (lowerValue === 'false') return false;
+		if (!isNaN(Number(value))) return Number(value);
+		try {
+			return jsonParse(value);
+		} catch {
+			return value;
+		}
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/utils/WorkflowToolService.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/utils/WorkflowToolService.ts
new file mode 100644
index 0000000000000..2ce3c435562be
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/utils/WorkflowToolService.ts
@@ -0,0 +1,313 @@
+import type { CallbackManagerForToolRun } from '@langchain/core/callbacks/manager';
+import { DynamicStructuredTool, DynamicTool } from '@langchain/core/tools';
+import get from 'lodash/get';
+import isObject from 'lodash/isObject';
+import type { SetField, SetNodeOptions } from 'n8n-nodes-base/dist/nodes/Set/v2/helpers/interfaces';
+import * as manual from 'n8n-nodes-base/dist/nodes/Set/v2/manual.mode';
+import { getCurrentWorkflowInputData } from 'n8n-nodes-base/dist/utils/workflowInputsResourceMapping/GenericFunctions';
+import type {
+	ExecuteWorkflowData,
+	ExecutionError,
+	IDataObject,
+	IExecuteWorkflowInfo,
+	INodeExecutionData,
+	INodeParameterResourceLocator,
+	ISupplyDataFunctions,
+	ITaskMetadata,
+	IWorkflowBase,
+	IWorkflowDataProxyData,
+	ResourceMapperValue,
+} from 'n8n-workflow';
+import { jsonParse, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import { z } from 'zod';
+
+import type { FromAIArgument } from './FromAIParser';
+import { AIParametersParser } from './FromAIParser';
+
+/**
+	Main class for creating the Workflow tool
+	Processes the node parameters and creates AI Agent tool capable of executing n8n workflows
+*/
+export class WorkflowToolService {
+	// Determines if we should use input schema when creating the tool
+	private useSchema: boolean;
+
+	// Sub-workflow id, pulled from referenced sub-workflow
+	private subWorkflowId: string | undefined;
+
+	// Sub-workflow execution id, will be set after the sub-workflow is executed
+	private subExecutionId: string | undefined;
+
+	constructor(private context: ISupplyDataFunctions) {
+		const subWorkflowInputs = this.context.getNode().parameters
+			.workflowInputs as ResourceMapperValue;
+		this.useSchema = (subWorkflowInputs?.schema ?? []).length > 0;
+	}
+
+	// Creates the tool based on the provided parameters
+	async createTool({
+		name,
+		description,
+		itemIndex,
+	}: {
+		name: string;
+		description: string;
+		itemIndex: number;
+	}): Promise<DynamicTool | DynamicStructuredTool> {
+		// Handler for the tool execution, will be called when the tool is executed
+		// This function will execute the sub-workflow and return the response
+		const toolHandler = async (
+			query: string | IDataObject,
+			runManager?: CallbackManagerForToolRun,
+		): Promise<string> => {
+			const { index } = this.context.addInputData(NodeConnectionType.AiTool, [
+				[{ json: { query } }],
+			]);
+
+			try {
+				const response = await this.runFunction(query, itemIndex, runManager);
+				const processedResponse = this.handleToolResponse(response);
+
+				// Once the sub-workflow is executed, add the output data to the context
+				// This will be used to link the sub-workflow execution in the parent workflow
+				let metadata: ITaskMetadata | undefined;
+				if (this.subExecutionId && this.subWorkflowId) {
+					metadata = {
+						subExecution: {
+							executionId: this.subExecutionId,
+							workflowId: this.subWorkflowId,
+						},
+					};
+				}
+				const json = jsonParse<IDataObject>(processedResponse, {
+					fallbackValue: { response: processedResponse },
+				});
+				void this.context.addOutputData(NodeConnectionType.AiTool, index, [[{ json }]], metadata);
+
+				return processedResponse;
+			} catch (error) {
+				const executionError = error as ExecutionError;
+				const errorResponse = `There was an error: "${executionError.message}"`;
+				void this.context.addOutputData(NodeConnectionType.AiTool, index, executionError);
+				return errorResponse;
+			}
+		};
+
+		// Create structured tool if input schema is provided
+		return this.useSchema
+			? await this.createStructuredTool(name, description, toolHandler)
+			: new DynamicTool({ name, description, func: toolHandler });
+	}
+
+	private handleToolResponse(response: unknown): string {
+		if (typeof response === 'number') {
+			return response.toString();
+		}
+
+		if (isObject(response)) {
+			return JSON.stringify(response, null, 2);
+		}
+
+		if (typeof response !== 'string') {
+			throw new NodeOperationError(this.context.getNode(), 'Wrong output type returned', {
+				description: `The response property should be a string, but it is an ${typeof response}`,
+			});
+		}
+
+		return response;
+	}
+
+	/**
+	 * Executes specified sub-workflow with provided inputs
+	 */
+	private async executeSubWorkflow(
+		workflowInfo: IExecuteWorkflowInfo,
+		items: INodeExecutionData[],
+		workflowProxy: IWorkflowDataProxyData,
+		runManager?: CallbackManagerForToolRun,
+	): Promise<{ response: string; subExecutionId: string }> {
+		let receivedData: ExecuteWorkflowData;
+		try {
+			receivedData = await this.context.executeWorkflow(
+				workflowInfo,
+				items,
+				runManager?.getChild(),
+				{
+					parentExecution: {
+						executionId: workflowProxy.$execution.id,
+						workflowId: workflowProxy.$workflow.id,
+					},
+				},
+			);
+			// Set sub-workflow execution id so it can be used in other places
+			this.subExecutionId = receivedData.executionId;
+		} catch (error) {
+			throw new NodeOperationError(this.context.getNode(), error as Error);
+		}
+
+		const response: string | undefined = get(receivedData, 'data[0][0].json') as string | undefined;
+		if (response === undefined) {
+			throw new NodeOperationError(
+				this.context.getNode(),
+				'There was an error: "The workflow did not return a response"',
+			);
+		}
+
+		return { response, subExecutionId: receivedData.executionId };
+	}
+
+	/**
+	 * Gets the sub-workflow info based on the source and executes it.
+	 * This function will be called as part of the tool execution (from the toolHandler)
+	 */
+	private async runFunction(
+		query: string | IDataObject,
+		itemIndex: number,
+		runManager?: CallbackManagerForToolRun,
+	): Promise<string> {
+		const source = this.context.getNodeParameter('source', itemIndex) as string;
+		const workflowProxy = this.context.getWorkflowDataProxy(0);
+
+		const { workflowInfo } = await this.getSubWorkflowInfo(source, itemIndex, workflowProxy);
+		const rawData = this.prepareRawData(query, itemIndex);
+		const items = await this.prepareWorkflowItems(query, itemIndex, rawData);
+
+		this.subWorkflowId = workflowInfo.id;
+
+		const { response } = await this.executeSubWorkflow(
+			workflowInfo,
+			items,
+			workflowProxy,
+			runManager,
+		);
+		return response;
+	}
+
+	/**
+	 * Gets the sub-workflow info based on the source (database or parameter)
+	 */
+	private async getSubWorkflowInfo(
+		source: string,
+		itemIndex: number,
+		workflowProxy: IWorkflowDataProxyData,
+	): Promise<{
+		workflowInfo: IExecuteWorkflowInfo;
+		subWorkflowId: string;
+	}> {
+		const workflowInfo: IExecuteWorkflowInfo = {};
+		let subWorkflowId: string;
+
+		if (source === 'database') {
+			const { value } = this.context.getNodeParameter(
+				'workflowId',
+				itemIndex,
+				{},
+			) as INodeParameterResourceLocator;
+			workflowInfo.id = value as string;
+			subWorkflowId = workflowInfo.id;
+		} else if (source === 'parameter') {
+			const workflowJson = this.context.getNodeParameter('workflowJson', itemIndex) as string;
+			try {
+				workflowInfo.code = JSON.parse(workflowJson) as IWorkflowBase;
+				// subworkflow is same as parent workflow
+				subWorkflowId = workflowProxy.$workflow.id;
+			} catch (error) {
+				throw new NodeOperationError(
+					this.context.getNode(),
+					`The provided workflow is not valid JSON: "${(error as Error).message}"`,
+					{ itemIndex },
+				);
+			}
+		}
+
+		return { workflowInfo, subWorkflowId: subWorkflowId! };
+	}
+
+	private prepareRawData(query: string | IDataObject, itemIndex: number): IDataObject {
+		const rawData: IDataObject = { query };
+		const workflowFieldsJson = this.context.getNodeParameter('fields.values', itemIndex, [], {
+			rawExpressions: true,
+		}) as SetField[];
+
+		// Copied from Set Node v2
+		for (const entry of workflowFieldsJson) {
+			if (entry.type === 'objectValue' && (entry.objectValue as string).startsWith('=')) {
+				rawData[entry.name] = (entry.objectValue as string).replace(/^=+/, '');
+			}
+		}
+
+		return rawData;
+	}
+
+	/**
+	 * Prepares the sub-workflow items for execution
+	 */
+	private async prepareWorkflowItems(
+		query: string | IDataObject,
+		itemIndex: number,
+		rawData: IDataObject,
+	): Promise<INodeExecutionData[]> {
+		const options: SetNodeOptions = { include: 'all' };
+		let jsonData = typeof query === 'object' ? query : { query };
+
+		if (this.useSchema) {
+			const currentWorkflowInputs = getCurrentWorkflowInputData.call(this.context);
+			jsonData = currentWorkflowInputs[itemIndex].json;
+		}
+
+		const newItem = await manual.execute.call(
+			this.context,
+			{ json: jsonData },
+			itemIndex,
+			options,
+			rawData,
+			this.context.getNode(),
+		);
+
+		return [newItem] as INodeExecutionData[];
+	}
+
+	/**
+	 *  Create structured tool by parsing the sub-workflow input schema
+	 */
+	private async createStructuredTool(
+		name: string,
+		description: string,
+		func: (query: string | IDataObject, runManager?: CallbackManagerForToolRun) => Promise<string>,
+	): Promise<DynamicStructuredTool | DynamicTool> {
+		const fromAIParser = new AIParametersParser(this.context);
+		const collectedArguments = await this.extractFromAIParameters(fromAIParser);
+
+		// If there are no `fromAI` arguments, fallback to creating a simple tool
+		if (collectedArguments.length === 0) {
+			return new DynamicTool({ name, description, func });
+		}
+
+		// Otherwise, prepare Zod schema  and create a structured tool
+		const schema = this.createZodSchema(collectedArguments, fromAIParser);
+		return new DynamicStructuredTool({ schema, name, description, func });
+	}
+
+	private async extractFromAIParameters(
+		fromAIParser: AIParametersParser,
+	): Promise<FromAIArgument[]> {
+		const collectedArguments: FromAIArgument[] = [];
+		fromAIParser.traverseNodeParameters(this.context.getNode().parameters, collectedArguments);
+
+		const uniqueArgsMap = new Map<string, FromAIArgument>();
+		for (const arg of collectedArguments) {
+			uniqueArgsMap.set(arg.key, arg);
+		}
+
+		return Array.from(uniqueArgsMap.values());
+	}
+
+	private createZodSchema(args: FromAIArgument[], parser: AIParametersParser): z.ZodObject<any> {
+		const schemaObj = args.reduce((acc: Record<string, z.ZodTypeAny>, placeholder) => {
+			acc[placeholder.key] = parser.generateZodSchema(placeholder);
+			return acc;
+		}, {});
+
+		return z.object(schemaObj).required();
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/versionDescription.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/versionDescription.ts
new file mode 100644
index 0000000000000..469a7d6d4cb34
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/versionDescription.ts
@@ -0,0 +1,151 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { NodeConnectionType, type INodeTypeDescription } from 'n8n-workflow';
+
+import { getConnectionHintNoticeField } from '../../../../utils/sharedFields';
+
+export const versionDescription: INodeTypeDescription = {
+	displayName: 'Call n8n Workflow Tool',
+	name: 'toolWorkflow',
+	icon: 'fa:network-wired',
+	group: ['transform'],
+	description: 'Uses another n8n workflow as a tool. Allows packaging any n8n node(s) as a tool.',
+	defaults: {
+		name: 'Call n8n Workflow Tool',
+	},
+	version: [2],
+	inputs: [],
+	outputs: [NodeConnectionType.AiTool],
+	outputNames: ['Tool'],
+	properties: [
+		getConnectionHintNoticeField([NodeConnectionType.AiAgent]),
+		{
+			displayName:
+				'See an example of a workflow to suggest meeting slots using AI <a href="/templates/1953" target="_blank">here</a>.',
+			name: 'noticeTemplateExample',
+			type: 'notice',
+			default: '',
+		},
+		{
+			displayName: 'Name',
+			name: 'name',
+			type: 'string',
+			default: '',
+			placeholder: 'e.g. My_Color_Tool',
+			validateType: 'string-alphanumeric',
+			description:
+				'The name of the function to be called, could contain letters, numbers, and underscores only',
+		},
+		{
+			displayName: 'Description',
+			name: 'description',
+			type: 'string',
+			default: '',
+			placeholder:
+				'Call this tool to get a random color. The input should be a string with comma separated names of colors to exclude.',
+			typeOptions: {
+				rows: 3,
+			},
+		},
+
+		{
+			displayName:
+				'This tool will call the workflow you define below, and look in the last node for the response. The workflow needs to start with an Execute Workflow trigger',
+			name: 'executeNotice',
+			type: 'notice',
+			default: '',
+		},
+
+		{
+			displayName: 'Source',
+			name: 'source',
+			type: 'options',
+			options: [
+				{
+					name: 'Database',
+					value: 'database',
+					description: 'Load the workflow from the database by ID',
+				},
+				{
+					name: 'Define Below',
+					value: 'parameter',
+					description: 'Pass the JSON code of a workflow',
+				},
+			],
+			default: 'database',
+			description: 'Where to get the workflow to execute from',
+		},
+
+		// ----------------------------------
+		//         source:database
+		// ----------------------------------
+		{
+			displayName: 'Workflow',
+			name: 'workflowId',
+			type: 'workflowSelector',
+			displayOptions: {
+				show: {
+					source: ['database'],
+				},
+			},
+			default: '',
+			required: true,
+		},
+		// -----------------------------------------------
+		//         Resource mapper for workflow inputs
+		// -----------------------------------------------
+		{
+			displayName: 'Workflow Inputs',
+			name: 'workflowInputs',
+			type: 'resourceMapper',
+			noDataExpression: true,
+			default: {
+				mappingMode: 'defineBelow',
+				value: null,
+			},
+			required: true,
+			typeOptions: {
+				loadOptionsDependsOn: ['workflowId.value'],
+				resourceMapper: {
+					localResourceMapperMethod: 'loadWorkflowInputMappings',
+					valuesLabel: 'Workflow Inputs',
+					mode: 'map',
+					fieldWords: {
+						singular: 'workflow input',
+						plural: 'workflow inputs',
+					},
+					addAllFields: true,
+					multiKeyMatch: false,
+					supportAutoMap: false,
+				},
+			},
+			displayOptions: {
+				show: {
+					source: ['database'],
+				},
+				hide: {
+					workflowId: [''],
+				},
+			},
+		},
+		// ----------------------------------
+		//         source:parameter
+		// ----------------------------------
+		{
+			displayName: 'Workflow JSON',
+			name: 'workflowJson',
+			type: 'json',
+			typeOptions: {
+				rows: 10,
+			},
+			displayOptions: {
+				show: {
+					source: ['parameter'],
+				},
+			},
+			default: '\n\n\n\n\n\n\n\n\n',
+			required: true,
+			description: 'The workflow JSON code to execute',
+		},
+	],
+};
diff --git a/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts
index 489b4fe28beed..27fb1bcd359a4 100644
--- a/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts
@@ -1,6 +1,6 @@
 import type { BaseChatMemory } from '@langchain/community/memory/chat_memory';
 import { pick } from 'lodash';
-import { Node, NodeConnectionType, commonCORSParameters } from 'n8n-workflow';
+import { Node, NodeConnectionType } from 'n8n-workflow';
 import type {
 	IDataObject,
 	IWebhookFunctions,
@@ -241,14 +241,19 @@ export class ChatTrigger extends Node {
 				default: {},
 				options: [
 					// CORS parameters are only valid for when chat is used in hosted or webhook mode
-					...commonCORSParameters.map((p) => ({
-						...p,
+					{
+						displayName: 'Allowed Origins (CORS)',
+						name: 'allowedOrigins',
+						type: 'string',
+						default: '*',
+						description:
+							'Comma-separated list of URLs allowed for cross-origin non-preflight requests. Use * (default) to allow all origins.',
 						displayOptions: {
 							show: {
 								'/mode': ['hostedChat', 'webhook'],
 							},
 						},
-					})),
+					},
 					{
 						...allowFileUploadsOption,
 						displayOptions: {
diff --git a/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/GenericFunctions.ts b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/GenericFunctions.ts
index 02620ab797cf6..c065569eb2916 100644
--- a/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/GenericFunctions.ts
+++ b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/GenericFunctions.ts
@@ -1,5 +1,6 @@
-import type { ICredentialDataDecryptedObject, IWebhookFunctions } from 'n8n-workflow';
 import basicAuth from 'basic-auth';
+import type { ICredentialDataDecryptedObject, IWebhookFunctions } from 'n8n-workflow';
+
 import { ChatTriggerAuthorizationError } from './error';
 import type { AuthenticationChatOption } from './types';
 
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreInMemory/VectorStoreInMemory.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreInMemory/VectorStoreInMemory.node.ts
index 5508f957f8ff5..0323478ee8c58 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreInMemory/VectorStoreInMemory.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreInMemory/VectorStoreInMemory.node.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { createVectorStoreNode } from '../shared/createVectorStoreNode';
 import { MemoryVectorStoreManager } from '../shared/MemoryVectorStoreManager';
 
@@ -25,6 +26,7 @@ export class VectorStoreInMemory extends createVectorStoreNode({
 		name: 'vectorStoreInMemory',
 		description: 'Work with your data in In-Memory Vector Store',
 		icon: 'fa:database',
+		iconColor: 'black',
 		docsUrl:
 			'https://docs.n8n.io/integrations/builtin/cluster-nodes/root-nodes/n8n-nodes-langchain.vectorstoreinmemory/',
 	},
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreInMemoryInsert/VectorStoreInMemoryInsert.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreInMemoryInsert/VectorStoreInMemoryInsert.node.ts
index 225201a5e1265..34d48150343c6 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreInMemoryInsert/VectorStoreInMemoryInsert.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreInMemoryInsert/VectorStoreInMemoryInsert.node.ts
@@ -1,4 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { Embeddings } from '@langchain/core/embeddings';
+import type { Document } from 'langchain/document';
 import {
 	NodeConnectionType,
 	type INodeExecutionData,
@@ -6,11 +8,11 @@ import {
 	type INodeType,
 	type INodeTypeDescription,
 } from 'n8n-workflow';
-import type { Document } from 'langchain/document';
-import type { Embeddings } from '@langchain/core/embeddings';
-import type { N8nJsonLoader } from '../../../utils/N8nJsonLoader';
-import { processDocuments } from '../shared/processDocuments';
+
+import type { N8nJsonLoader } from '@utils/N8nJsonLoader';
+
 import { MemoryVectorStoreManager } from '../shared/MemoryVectorStoreManager';
+import { processDocuments } from '../shared/processDocuments';
 
 // This node is deprecated. Use VectorStoreInMemory instead.
 export class VectorStoreInMemoryInsert implements INodeType {
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreInMemoryLoad/VectorStoreInMemoryLoad.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreInMemoryLoad/VectorStoreInMemoryLoad.node.ts
index 7bf48c3d8cfda..dd2def31e36fe 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreInMemoryLoad/VectorStoreInMemoryLoad.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreInMemoryLoad/VectorStoreInMemoryLoad.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { Embeddings } from '@langchain/core/embeddings';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,9 +7,10 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import type { Embeddings } from '@langchain/core/embeddings';
+
+import { logWrapper } from '@utils/logWrapper';
+
 import { MemoryVectorStoreManager } from '../shared/MemoryVectorStoreManager';
-import { logWrapper } from '../../../utils/logWrapper';
 
 // This node is deprecated. Use VectorStoreInMemory instead.
 export class VectorStoreInMemoryLoad implements INodeType {
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePGVector/VectorStorePGVector.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePGVector/VectorStorePGVector.node.ts
index 8336958cc5dfc..6d5da1615b036 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePGVector/VectorStorePGVector.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePGVector/VectorStorePGVector.node.ts
@@ -9,7 +9,8 @@ import { configurePostgres } from 'n8n-nodes-base/dist/nodes/Postgres/v2/transpo
 import type { INodeProperties } from 'n8n-workflow';
 import type pg from 'pg';
 
-import { metadataFilterField } from '../../../utils/sharedFields';
+import { metadataFilterField } from '@utils/sharedFields';
+
 import { createVectorStoreNode } from '../shared/createVectorStoreNode';
 
 type CollectionOptions = {
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePinecone/VectorStorePinecone.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePinecone/VectorStorePinecone.node.ts
index d153979ef4c1c..711425df55edf 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePinecone/VectorStorePinecone.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePinecone/VectorStorePinecone.node.ts
@@ -1,9 +1,11 @@
-import { NodeOperationError, type INodeProperties } from 'n8n-workflow';
 import type { PineconeStoreParams } from '@langchain/pinecone';
 import { PineconeStore } from '@langchain/pinecone';
 import { Pinecone } from '@pinecone-database/pinecone';
+import { NodeOperationError, type INodeProperties } from 'n8n-workflow';
+
+import { metadataFilterField } from '@utils/sharedFields';
+
 import { createVectorStoreNode } from '../shared/createVectorStoreNode';
-import { metadataFilterField } from '../../../utils/sharedFields';
 import { pineconeIndexRLC } from '../shared/descriptions';
 import { pineconeIndexSearch } from '../shared/methods/listSearch';
 
@@ -54,7 +56,7 @@ export class VectorStorePinecone extends createVectorStoreNode({
 		displayName: 'Pinecone Vector Store',
 		name: 'vectorStorePinecone',
 		description: 'Work with your data in Pinecone Vector Store',
-		icon: 'file:pinecone.svg',
+		icon: { light: 'file:pinecone.svg', dark: 'file:pinecone.dark.svg' },
 		docsUrl:
 			'https://docs.n8n.io/integrations/builtin/cluster-nodes/root-nodes/n8n-nodes-langchain.vectorstorepinecone/',
 		credentials: [
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePinecone/pinecone.dark.svg b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePinecone/pinecone.dark.svg
new file mode 100644
index 0000000000000..4d163c6784eb6
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePinecone/pinecone.dark.svg
@@ -0,0 +1,21 @@
+<svg width="32" height="35" viewBox="0 0 32 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.8555 34.2962C14.9325 34.2962 15.8055 33.4451 15.8055 32.3954C15.8055 31.3456 14.9325 30.4946 13.8555 30.4946C12.7786 30.4946 11.9055 31.3456 11.9055 32.3954C11.9055 33.4451 12.7786 34.2962 13.8555 34.2962Z" fill="white"/>
+<path d="M18.4138 7.19675L19.2512 2.66005" stroke="white" stroke-width="2.11786" stroke-linecap="square"/>
+<path d="M22.2656 5.5855L19.3466 2.11099L15.3748 4.37292" stroke="white" stroke-width="2.11786" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M14.9202 26.5528L15.7337 22.0169" stroke="white" stroke-width="2.11786" stroke-linecap="square"/>
+<path d="M18.7729 24.9304L15.83 21.4671L11.8701 23.741" stroke="white" stroke-width="2.11786" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M16.6077 17.1996L17.4212 12.6633" stroke="white" stroke-width="2.11786" stroke-linecap="square"/>
+<path d="M20.4587 15.58L17.5277 12.128L13.5679 14.3904" stroke="white" stroke-width="2.11786" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M8.32871 26.1554L4.75171 28.5815" stroke="white" stroke-width="2.01017" stroke-linecap="square"/>
+<path d="M8.54383 30.0865L4.3208 28.8738L4.63185 24.5944" stroke="white" stroke-width="2.01017" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M21.3213 28.4299L23.8096 31.9282" stroke="white" stroke-width="2.01017" stroke-linecap="square"/>
+<path d="M19.718 32.045L24.1085 32.3365L25.3527 28.2438" stroke="white" stroke-width="2.01017" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M25.3999 21.3291L29.7784 22.0996" stroke="white" stroke-width="2.05804" stroke-linecap="square"/>
+<path d="M26.9072 25.072L30.3048 22.1919L28.1634 18.3557" stroke="white" stroke-width="2.05804" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M24.1196 12.8615L28.0197 10.763" stroke="white" stroke-width="2.05804" stroke-linecap="square"/>
+<path d="M24.3357 8.83965L28.4869 10.5188L27.7093 14.8216" stroke="white" stroke-width="2.05804" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M6.91639 18.1572L2.52588 17.4101" stroke="white" stroke-width="2.05804" stroke-linecap="square"/>
+<path d="M4.17731 21.1645L2 17.328L5.36167 14.436" stroke="white" stroke-width="2.05804" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M11.0799 10.6129L8.14893 7.34769" stroke="white" stroke-width="2.05804" stroke-linecap="square"/>
+<path d="M12.2897 6.77496L7.80349 6.96156L7.01392 11.2649" stroke="white" stroke-width="2.05804" stroke-linecap="square" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePinecone/pinecone.svg b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePinecone/pinecone.svg
index b94b8b3af6696..e9884a4249f2c 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePinecone/pinecone.svg
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePinecone/pinecone.svg
@@ -1 +1,21 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="w-full -translate-y-0.5" viewBox="1 1 30 29"><g fill="none" fill-rule="evenodd" transform="translate(0 1)"><path stroke="currentColor" stroke-linecap="square" stroke-width="1.77" d="m14.58 5.24.7-3.89"/><path stroke="#7D7D87" stroke-linecap="square" stroke-linejoin="round" stroke-width="1.77" d="M17.8 3.86 15.36.88l-3.32 1.94"/><path stroke="currentColor" stroke-linecap="square" stroke-width="1.77" d="m11.66 21.84.68-3.89"/><path stroke="currentColor" stroke-linecap="square" stroke-linejoin="round" stroke-width="1.77" d="m14.88 20.45-2.46-2.97-3.31 1.95"/><path stroke="currentColor" stroke-linecap="square" stroke-width="1.77" d="m13.07 13.82.68-3.89"/><path stroke="currentColor" stroke-linecap="square" stroke-linejoin="round" stroke-width="1.77" d="m16.29 12.43-2.45-2.96-3.31 1.94"/><circle cx="10.77" cy="26.85" r="1.63" fill="currentColor" fill-rule="nonzero"/><g stroke="currentColor" stroke-linecap="square"><path stroke-width="1.68" d="m6.15 21.5-2.99 2.08"/><path stroke-linejoin="round" stroke-width="1.68" d="M6.33 24.87 2.8 23.83l.26-3.67"/><path stroke-width="1.68" d="m17.01 23.45 2.08 3"/><path stroke-linejoin="round" stroke-width="1.68" d="m15.67 26.55 3.67.25 1.04-3.51"/><path stroke-width="1.72" d="m20.42 17.36 3.66.66"/><path stroke-linejoin="round" stroke-width="1.72" d="m21.68 20.57 2.84-2.47-1.79-3.29"/><path stroke-width="1.72" d="m19.35 10.1 3.26-1.8"/><path stroke-linejoin="round" stroke-width="1.72" d="M19.53 6.65 23 8.09l-.65 3.69"/><path stroke-width="1.72" d="M4.97 14.64 1.3 14"/><path stroke-linejoin="round" stroke-width="1.72" d="M2.68 17.22.86 13.93l2.81-2.48"/><path stroke-width="1.72" d="M8.45 8.17 6 5.37"/><path stroke-linejoin="round" stroke-width="1.72" d="m9.46 4.88-3.75.16-.66 3.69"/></g></g></svg>
\ No newline at end of file
+<svg width="32" height="35" viewBox="0 0 32 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.8555 34.2962C14.9325 34.2962 15.8055 33.4451 15.8055 32.3954C15.8055 31.3456 14.9325 30.4946 13.8555 30.4946C12.7786 30.4946 11.9055 31.3456 11.9055 32.3954C11.9055 33.4451 12.7786 34.2962 13.8555 34.2962Z" fill="black"/>
+<path d="M18.4138 7.19675L19.2512 2.66005" stroke="black" stroke-width="2.11786" stroke-linecap="square"/>
+<path d="M22.2656 5.5855L19.3466 2.11099L15.3748 4.37292" stroke="black" stroke-width="2.11786" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M14.9202 26.5528L15.7337 22.0169" stroke="black" stroke-width="2.11786" stroke-linecap="square"/>
+<path d="M18.7729 24.9304L15.83 21.4671L11.8701 23.741" stroke="black" stroke-width="2.11786" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M16.6077 17.1996L17.4212 12.6633" stroke="black" stroke-width="2.11786" stroke-linecap="square"/>
+<path d="M20.4587 15.58L17.5277 12.128L13.5679 14.3904" stroke="black" stroke-width="2.11786" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M8.32871 26.1554L4.75171 28.5815" stroke="black" stroke-width="2.01017" stroke-linecap="square"/>
+<path d="M8.54383 30.0865L4.3208 28.8738L4.63185 24.5944" stroke="black" stroke-width="2.01017" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M21.3213 28.4299L23.8096 31.9282" stroke="black" stroke-width="2.01017" stroke-linecap="square"/>
+<path d="M19.718 32.045L24.1085 32.3365L25.3527 28.2438" stroke="black" stroke-width="2.01017" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M25.3999 21.3291L29.7784 22.0996" stroke="black" stroke-width="2.05804" stroke-linecap="square"/>
+<path d="M26.9072 25.072L30.3048 22.1919L28.1634 18.3557" stroke="black" stroke-width="2.05804" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M24.1196 12.8615L28.0197 10.763" stroke="black" stroke-width="2.05804" stroke-linecap="square"/>
+<path d="M24.3357 8.83965L28.4869 10.5188L27.7093 14.8216" stroke="black" stroke-width="2.05804" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M6.91639 18.1572L2.52588 17.4101" stroke="black" stroke-width="2.05804" stroke-linecap="square"/>
+<path d="M4.17731 21.1645L2 17.328L5.36167 14.436" stroke="black" stroke-width="2.05804" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M11.0799 10.6129L8.14893 7.34769" stroke="black" stroke-width="2.05804" stroke-linecap="square"/>
+<path d="M12.2897 6.77496L7.80349 6.96156L7.01392 11.2649" stroke="black" stroke-width="2.05804" stroke-linecap="square" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePineconeInsert/VectorStorePineconeInsert.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePineconeInsert/VectorStorePineconeInsert.node.ts
index 023b65be84493..6c10ff1427b91 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePineconeInsert/VectorStorePineconeInsert.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePineconeInsert/VectorStorePineconeInsert.node.ts
@@ -1,3 +1,7 @@
+import type { Document } from '@langchain/core/documents';
+import type { Embeddings } from '@langchain/core/embeddings';
+import { PineconeStore } from '@langchain/pinecone';
+import { Pinecone } from '@pinecone-database/pinecone';
 import {
 	type IExecuteFunctions,
 	type INodeType,
@@ -5,15 +9,12 @@ import {
 	type INodeExecutionData,
 	NodeConnectionType,
 } from 'n8n-workflow';
-import type { Embeddings } from '@langchain/core/embeddings';
-import type { Document } from '@langchain/core/documents';
 
-import { PineconeStore } from '@langchain/pinecone';
-import { Pinecone } from '@pinecone-database/pinecone';
-import type { N8nJsonLoader } from '../../../utils/N8nJsonLoader';
-import { processDocuments } from '../shared/processDocuments';
+import type { N8nJsonLoader } from '@utils/N8nJsonLoader';
+
 import { pineconeIndexRLC } from '../shared/descriptions';
 import { pineconeIndexSearch } from '../shared/methods/listSearch';
+import { processDocuments } from '../shared/processDocuments';
 
 // This node is deprecated. Use VectorStorePinecone instead.
 export class VectorStorePineconeInsert implements INodeType {
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePineconeLoad/VectorStorePineconeLoad.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePineconeLoad/VectorStorePineconeLoad.node.ts
index d46bccd9f793f..54eea2e902ebb 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePineconeLoad/VectorStorePineconeLoad.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePineconeLoad/VectorStorePineconeLoad.node.ts
@@ -1,3 +1,7 @@
+import type { Embeddings } from '@langchain/core/embeddings';
+import type { PineconeStoreParams } from '@langchain/pinecone';
+import { PineconeStore } from '@langchain/pinecone';
+import { Pinecone } from '@pinecone-database/pinecone';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -5,14 +9,11 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import type { PineconeStoreParams } from '@langchain/pinecone';
-import { PineconeStore } from '@langchain/pinecone';
-import { Pinecone } from '@pinecone-database/pinecone';
 
-import type { Embeddings } from '@langchain/core/embeddings';
-import { logWrapper } from '../../../utils/logWrapper';
-import { metadataFilterField } from '../../../utils/sharedFields';
-import { getMetadataFiltersValues } from '../../../utils/helpers';
+import { getMetadataFiltersValues } from '@utils/helpers';
+import { logWrapper } from '@utils/logWrapper';
+import { metadataFilterField } from '@utils/sharedFields';
+
 import { pineconeIndexRLC } from '../shared/descriptions';
 import { pineconeIndexSearch } from '../shared/methods/listSearch';
 
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreQdrant/VectorStoreQdrant.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreQdrant/VectorStoreQdrant.node.ts
index 0b5859e0bc191..988f607ad75ef 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreQdrant/VectorStoreQdrant.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreQdrant/VectorStoreQdrant.node.ts
@@ -1,12 +1,13 @@
-import type { IDataObject, INodeProperties } from 'n8n-workflow';
+import type { Callbacks } from '@langchain/core/callbacks/manager';
+import type { Embeddings } from '@langchain/core/embeddings';
 import type { QdrantLibArgs } from '@langchain/qdrant';
 import { QdrantVectorStore } from '@langchain/qdrant';
 import type { Schemas as QdrantSchemas } from '@qdrant/js-client-rest';
+import type { IDataObject, INodeProperties } from 'n8n-workflow';
+
 import { createVectorStoreNode } from '../shared/createVectorStoreNode';
 import { qdrantCollectionRLC } from '../shared/descriptions';
 import { qdrantCollectionsSearch } from '../shared/methods/listSearch';
-import type { Embeddings } from '@langchain/core/embeddings';
-import type { Callbacks } from '@langchain/core/callbacks/manager';
 
 class ExtendedQdrantVectorStore extends QdrantVectorStore {
 	private static defaultFilter: IDataObject = {};
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabase/VectorStoreSupabase.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabase/VectorStoreSupabase.node.ts
index 549fcd5e7f364..b1b80fea5a153 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabase/VectorStoreSupabase.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabase/VectorStoreSupabase.node.ts
@@ -1,8 +1,10 @@
-import { NodeOperationError, type INodeProperties } from 'n8n-workflow';
-import { createClient } from '@supabase/supabase-js';
 import { SupabaseVectorStore } from '@langchain/community/vectorstores/supabase';
+import { createClient } from '@supabase/supabase-js';
+import { NodeOperationError, type INodeProperties } from 'n8n-workflow';
+
+import { metadataFilterField } from '@utils/sharedFields';
+
 import { createVectorStoreNode } from '../shared/createVectorStoreNode';
-import { metadataFilterField } from '../../../utils/sharedFields';
 import { supabaseTableNameRLC } from '../shared/descriptions';
 import { supabaseTableNameSearch } from '../shared/methods/listSearch';
 
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabaseInsert/VectorStoreSupabaseInsert.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabaseInsert/VectorStoreSupabaseInsert.node.ts
index 44b3a6a39741c..332f534fe6b67 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabaseInsert/VectorStoreSupabaseInsert.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabaseInsert/VectorStoreSupabaseInsert.node.ts
@@ -1,3 +1,7 @@
+import { SupabaseVectorStore } from '@langchain/community/vectorstores/supabase';
+import type { Document } from '@langchain/core/documents';
+import type { Embeddings } from '@langchain/core/embeddings';
+import { createClient } from '@supabase/supabase-js';
 import {
 	type IExecuteFunctions,
 	type INodeType,
@@ -5,15 +9,12 @@ import {
 	type INodeExecutionData,
 	NodeConnectionType,
 } from 'n8n-workflow';
-import type { Embeddings } from '@langchain/core/embeddings';
-import type { Document } from '@langchain/core/documents';
-import { createClient } from '@supabase/supabase-js';
-import { SupabaseVectorStore } from '@langchain/community/vectorstores/supabase';
 
-import type { N8nJsonLoader } from '../../../utils/N8nJsonLoader';
-import { processDocuments } from '../shared/processDocuments';
+import type { N8nJsonLoader } from '@utils/N8nJsonLoader';
+
 import { supabaseTableNameRLC } from '../shared/descriptions';
 import { supabaseTableNameSearch } from '../shared/methods/listSearch';
+import { processDocuments } from '../shared/processDocuments';
 
 // This node is deprecated. Use VectorStoreSupabase instead.
 export class VectorStoreSupabaseInsert implements INodeType {
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabaseLoad/VectorStoreSupabaseLoad.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabaseLoad/VectorStoreSupabaseLoad.node.ts
index f4bdc49e44325..eae056adb97ce 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabaseLoad/VectorStoreSupabaseLoad.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabaseLoad/VectorStoreSupabaseLoad.node.ts
@@ -1,3 +1,7 @@
+import type { SupabaseLibArgs } from '@langchain/community/vectorstores/supabase';
+import { SupabaseVectorStore } from '@langchain/community/vectorstores/supabase';
+import type { Embeddings } from '@langchain/core/embeddings';
+import { createClient } from '@supabase/supabase-js';
 import {
 	type INodeType,
 	type INodeTypeDescription,
@@ -5,13 +9,11 @@ import {
 	type SupplyData,
 	NodeConnectionType,
 } from 'n8n-workflow';
-import type { Embeddings } from '@langchain/core/embeddings';
-import { createClient } from '@supabase/supabase-js';
-import type { SupabaseLibArgs } from '@langchain/community/vectorstores/supabase';
-import { SupabaseVectorStore } from '@langchain/community/vectorstores/supabase';
-import { logWrapper } from '../../../utils/logWrapper';
-import { metadataFilterField } from '../../../utils/sharedFields';
-import { getMetadataFiltersValues } from '../../../utils/helpers';
+
+import { getMetadataFiltersValues } from '@utils/helpers';
+import { logWrapper } from '@utils/logWrapper';
+import { metadataFilterField } from '@utils/sharedFields';
+
 import { supabaseTableNameRLC } from '../shared/descriptions';
 import { supabaseTableNameSearch } from '../shared/methods/listSearch';
 
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZep/VectorStoreZep.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZep/VectorStoreZep.node.ts
index 184b720d31242..d6e8914ae54b8 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZep/VectorStoreZep.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZep/VectorStoreZep.node.ts
@@ -1,9 +1,11 @@
-import type { IDataObject, INodeProperties } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
 import type { IZepConfig } from '@langchain/community/vectorstores/zep';
 import { ZepVectorStore } from '@langchain/community/vectorstores/zep';
+import type { IDataObject, INodeProperties } from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
+import { metadataFilterField } from '@utils/sharedFields';
+
 import { createVectorStoreNode } from '../shared/createVectorStoreNode';
-import { metadataFilterField } from '../../../utils/sharedFields';
 
 const embeddingDimensions: INodeProperties = {
 	displayName: 'Embedding Dimensions',
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZepInsert/VectorStoreZepInsert.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZepInsert/VectorStoreZepInsert.node.ts
index 3b40e07d650ed..4892d8ad85d00 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZepInsert/VectorStoreZepInsert.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZepInsert/VectorStoreZepInsert.node.ts
@@ -1,3 +1,6 @@
+import { ZepVectorStore } from '@langchain/community/vectorstores/zep';
+import type { Document } from '@langchain/core/documents';
+import type { Embeddings } from '@langchain/core/embeddings';
 import {
 	type IExecuteFunctions,
 	type INodeType,
@@ -5,10 +8,9 @@ import {
 	type INodeExecutionData,
 	NodeConnectionType,
 } from 'n8n-workflow';
-import { ZepVectorStore } from '@langchain/community/vectorstores/zep';
-import type { Embeddings } from '@langchain/core/embeddings';
-import type { Document } from '@langchain/core/documents';
-import type { N8nJsonLoader } from '../../../utils/N8nJsonLoader';
+
+import type { N8nJsonLoader } from '@utils/N8nJsonLoader';
+
 import { processDocuments } from '../shared/processDocuments';
 
 // This node is deprecated. Use VectorStoreZep instead.
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZepLoad/VectorStoreZepLoad.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZepLoad/VectorStoreZepLoad.node.ts
index dd30a0808e189..040b845e57c27 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZepLoad/VectorStoreZepLoad.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZepLoad/VectorStoreZepLoad.node.ts
@@ -1,3 +1,6 @@
+import type { IZepConfig } from '@langchain/community/vectorstores/zep';
+import { ZepVectorStore } from '@langchain/community/vectorstores/zep';
+import type { Embeddings } from '@langchain/core/embeddings';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -5,12 +8,10 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import type { IZepConfig } from '@langchain/community/vectorstores/zep';
-import { ZepVectorStore } from '@langchain/community/vectorstores/zep';
-import type { Embeddings } from '@langchain/core/embeddings';
-import { metadataFilterField } from '../../../utils/sharedFields';
-import { getMetadataFiltersValues } from '../../../utils/helpers';
-import { logWrapper } from '../../../utils/logWrapper';
+
+import { getMetadataFiltersValues } from '@utils/helpers';
+import { logWrapper } from '@utils/logWrapper';
+import { metadataFilterField } from '@utils/sharedFields';
 
 // This node is deprecated. Use VectorStoreZep instead.
 export class VectorStoreZepLoad implements INodeType {
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/MemoryVectorStoreManager.test.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/MemoryVectorStoreManager.test.ts
index 6229868f320ad..1088505a0a714 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/MemoryVectorStoreManager.test.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/MemoryVectorStoreManager.test.ts
@@ -1,7 +1,7 @@
 import type { OpenAIEmbeddings } from '@langchain/openai';
+import { mock } from 'jest-mock-extended';
 
 import { MemoryVectorStoreManager } from './MemoryVectorStoreManager';
-import { mock } from 'jest-mock-extended';
 
 describe('MemoryVectorStoreManager', () => {
 	it('should create an instance of MemoryVectorStoreManager', () => {
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/MemoryVectorStoreManager.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/MemoryVectorStoreManager.ts
index 5c507a5196f17..f92c8abd41166 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/MemoryVectorStoreManager.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/MemoryVectorStoreManager.ts
@@ -11,7 +11,7 @@ export class MemoryVectorStoreManager {
 		this.vectorStoreBuffer = new Map();
 	}
 
-	public static getInstance(embeddings: Embeddings): MemoryVectorStoreManager {
+	static getInstance(embeddings: Embeddings): MemoryVectorStoreManager {
 		if (!MemoryVectorStoreManager.instance) {
 			MemoryVectorStoreManager.instance = new MemoryVectorStoreManager(embeddings);
 		} else {
@@ -27,7 +27,7 @@ export class MemoryVectorStoreManager {
 		return MemoryVectorStoreManager.instance;
 	}
 
-	public async getVectorStore(memoryKey: string): Promise<MemoryVectorStore> {
+	async getVectorStore(memoryKey: string): Promise<MemoryVectorStore> {
 		let vectorStoreInstance = this.vectorStoreBuffer.get(memoryKey);
 
 		if (!vectorStoreInstance) {
@@ -38,7 +38,7 @@ export class MemoryVectorStoreManager {
 		return vectorStoreInstance;
 	}
 
-	public async addDocuments(
+	async addDocuments(
 		memoryKey: string,
 		documents: Document[],
 		clearStore?: boolean,
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts
index 2de9304fc57f9..84f1d550e5032 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts
@@ -17,14 +17,16 @@ import type {
 	INodeListSearchResult,
 	Icon,
 	INodePropertyOptions,
+	ThemeIconColor,
 } from 'n8n-workflow';
 
+import { getMetadataFiltersValues, logAiEvent } from '@utils/helpers';
+import { logWrapper } from '@utils/logWrapper';
+import type { N8nBinaryLoader } from '@utils/N8nBinaryLoader';
+import { N8nJsonLoader } from '@utils/N8nJsonLoader';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
 import { processDocument } from './processDocuments';
-import { getMetadataFiltersValues, logAiEvent } from '../../../utils/helpers';
-import { logWrapper } from '../../../utils/logWrapper';
-import type { N8nBinaryLoader } from '../../../utils/N8nBinaryLoader';
-import { N8nJsonLoader } from '../../../utils/N8nJsonLoader';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
 
 type NodeOperationMode = 'insert' | 'load' | 'retrieve' | 'update';
 
@@ -36,6 +38,7 @@ interface NodeMeta {
 	description: string;
 	docsUrl: string;
 	icon: Icon;
+	iconColor?: ThemeIconColor;
 	credentials?: INodeCredentialDescription[];
 	operationModes?: NodeOperationMode[];
 }
@@ -124,6 +127,7 @@ export const createVectorStoreNode = (args: VectorStoreNodeConstructorArgs) =>
 			name: args.meta.name,
 			description: args.meta.description,
 			icon: args.meta.icon,
+			iconColor: args.meta.iconColor,
 			group: ['transform'],
 			version: 1,
 			defaults: {
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/methods/listSearch.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/methods/listSearch.ts
index f12ff5d5cf0b9..278d879f90aad 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/methods/listSearch.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/methods/listSearch.ts
@@ -1,6 +1,6 @@
-import { ApplicationError, type IDataObject, type ILoadOptionsFunctions } from 'n8n-workflow';
 import { Pinecone } from '@pinecone-database/pinecone';
 import { QdrantClient } from '@qdrant/js-client-rest';
+import { ApplicationError, type IDataObject, type ILoadOptionsFunctions } from 'n8n-workflow';
 
 export async function pineconeIndexSearch(this: ILoadOptionsFunctions) {
 	const credentials = await this.getCredentials('pineconeApi');
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/processDocuments.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/processDocuments.ts
index 5a3847d6911a1..0c28d8db2578f 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/processDocuments.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/processDocuments.ts
@@ -1,7 +1,8 @@
 import type { Document } from '@langchain/core/documents';
 import type { INodeExecutionData } from 'n8n-workflow';
-import { N8nJsonLoader } from '../../../utils/N8nJsonLoader';
-import { N8nBinaryLoader } from '../../../utils/N8nBinaryLoader';
+
+import { N8nBinaryLoader } from '@utils/N8nBinaryLoader';
+import { N8nJsonLoader } from '@utils/N8nJsonLoader';
 
 export async function processDocuments(
 	documentInput: N8nJsonLoader | N8nBinaryLoader | Array<Document<Record<string, unknown>>>,
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/OpenAi.node.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/OpenAi.node.ts
index 1743c6961859f..251618c01e3b2 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/OpenAi.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/OpenAi.node.ts
@@ -1,4 +1,5 @@
 import type { IExecuteFunctions, INodeType } from 'n8n-workflow';
+
 import { router } from './actions/router';
 import { versionDescription } from './actions/versionDescription';
 import { listSearch, loadOptions } from './methods';
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/create.operation.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/create.operation.ts
index b9a0dee535907..3ac5e453527e2 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/create.operation.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/create.operation.ts
@@ -5,6 +5,7 @@ import type {
 	IDataObject,
 } from 'n8n-workflow';
 import { NodeOperationError, updateDisplayOptions } from 'n8n-workflow';
+
 import { apiRequest } from '../../transport';
 import { modelRLC } from '../descriptions';
 
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/deleteAssistant.operation.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/deleteAssistant.operation.ts
index 099e5fd3e6402..7287d8ebfdb61 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/deleteAssistant.operation.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/deleteAssistant.operation.ts
@@ -1,5 +1,6 @@
 import type { INodeProperties, IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { updateDisplayOptions } from 'n8n-workflow';
+
 import { apiRequest } from '../../transport';
 import { assistantRLC } from '../descriptions';
 
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/index.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/index.ts
index 3f869ffcc877c..5973319492f6f 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/index.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/index.ts
@@ -2,8 +2,8 @@ import type { INodeProperties } from 'n8n-workflow';
 
 import * as create from './create.operation';
 import * as deleteAssistant from './deleteAssistant.operation';
-import * as message from './message.operation';
 import * as list from './list.operation';
+import * as message from './message.operation';
 import * as update from './update.operation';
 
 export { create, deleteAssistant, message, list, update };
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/list.operation.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/list.operation.ts
index c029af4d4836e..ec75be1cfd812 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/list.operation.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/list.operation.ts
@@ -1,5 +1,6 @@
 import type { INodeProperties, IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { updateDisplayOptions } from 'n8n-workflow';
+
 import { apiRequest } from '../../transport';
 
 const properties: INodeProperties[] = [
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/message.operation.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/message.operation.ts
index 959d487abe2a4..bc22ac948fe01 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/message.operation.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/message.operation.ts
@@ -18,9 +18,10 @@ import {
 } from 'n8n-workflow';
 import { OpenAI as OpenAIClient } from 'openai';
 
-import { promptTypeOptions } from '../../../../../utils/descriptions';
-import { getConnectedTools } from '../../../../../utils/helpers';
-import { getTracingConfig } from '../../../../../utils/tracing';
+import { promptTypeOptions } from '@utils/descriptions';
+import { getConnectedTools } from '@utils/helpers';
+import { getTracingConfig } from '@utils/tracing';
+
 import { formatToOpenAIAssistantTool } from '../../helpers/utils';
 import { assistantRLC } from '../descriptions';
 
@@ -105,6 +106,11 @@ const properties: INodeProperties[] = [
 				default: 'https://api.openai.com/v1',
 				description: 'Override the default base URL for the API',
 				type: 'string',
+				displayOptions: {
+					hide: {
+						'@version': [{ _cnd: { gte: 1.8 } }],
+					},
+				},
 			},
 			{
 				displayName: 'Max Retries',
@@ -181,11 +187,13 @@ export async function execute(this: IExecuteFunctions, i: number): Promise<INode
 		preserveOriginalTools?: boolean;
 	};
 
+	const baseURL = (options.baseURL ?? credentials.url) as string;
+
 	const client = new OpenAIClient({
 		apiKey: credentials.apiKey as string,
 		maxRetries: options.maxRetries ?? 2,
 		timeout: options.timeout ?? 10000,
-		baseURL: options.baseURL,
+		baseURL,
 	});
 
 	const agent = new OpenAIAssistantRunnable({ assistantId, client, asAgent: true });
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/update.operation.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/update.operation.ts
index bd26ab0a0c5b0..f197ace5ecd51 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/update.operation.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/update.operation.ts
@@ -5,6 +5,7 @@ import type {
 	IDataObject,
 } from 'n8n-workflow';
 import { ApplicationError, NodeOperationError, updateDisplayOptions } from 'n8n-workflow';
+
 import { apiRequest } from '../../transport';
 import { assistantRLC, modelRLC } from '../descriptions';
 
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/audio/generate.operation.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/audio/generate.operation.ts
index 2a1c59090d1db..4058a3bcf76ce 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/audio/generate.operation.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/audio/generate.operation.ts
@@ -5,6 +5,7 @@ import type {
 	INodeExecutionData,
 } from 'n8n-workflow';
 import { updateDisplayOptions } from 'n8n-workflow';
+
 import { apiRequest } from '../../transport';
 
 const properties: INodeProperties[] = [
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/audio/transcribe.operation.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/audio/transcribe.operation.ts
index 1f419066ad3e6..ddbc1f09ae2a2 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/audio/transcribe.operation.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/audio/transcribe.operation.ts
@@ -1,7 +1,7 @@
+import FormData from 'form-data';
 import type { INodeProperties, IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { updateDisplayOptions } from 'n8n-workflow';
 
-import FormData from 'form-data';
 import { apiRequest } from '../../transport';
 
 const properties: INodeProperties[] = [
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/audio/translate.operation.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/audio/translate.operation.ts
index 3ba7e53c64991..911da72296714 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/audio/translate.operation.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/audio/translate.operation.ts
@@ -1,6 +1,7 @@
+import FormData from 'form-data';
 import type { INodeProperties, IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { updateDisplayOptions } from 'n8n-workflow';
-import FormData from 'form-data';
+
 import { apiRequest } from '../../transport';
 
 const properties: INodeProperties[] = [
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/file/index.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/file/index.ts
index 809c1ec94751f..248d01fc27446 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/file/index.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/file/index.ts
@@ -1,8 +1,8 @@
 import type { INodeProperties } from 'n8n-workflow';
 
-import * as upload from './upload.operation';
 import * as deleteFile from './deleteFile.operation';
 import * as list from './list.operation';
+import * as upload from './upload.operation';
 
 export { upload, deleteFile, list };
 
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/file/upload.operation.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/file/upload.operation.ts
index 9776c0f38558e..38bcd1e824935 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/file/upload.operation.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/file/upload.operation.ts
@@ -1,6 +1,7 @@
+import FormData from 'form-data';
 import type { INodeProperties, IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { updateDisplayOptions, NodeOperationError } from 'n8n-workflow';
-import FormData from 'form-data';
+
 import { apiRequest } from '../../transport';
 
 const properties: INodeProperties[] = [
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/image/analyze.operation.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/image/analyze.operation.ts
index 07a91ab82dad0..a46e77a494fea 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/image/analyze.operation.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/image/analyze.operation.ts
@@ -5,6 +5,7 @@ import type {
 	IDataObject,
 } from 'n8n-workflow';
 import { updateDisplayOptions, NodeOperationError } from 'n8n-workflow';
+
 import { apiRequest } from '../../transport';
 import { modelRLC } from '../descriptions';
 
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/image/generate.operation.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/image/generate.operation.ts
index 48a03158b5e85..0c443bb6c739b 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/image/generate.operation.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/image/generate.operation.ts
@@ -5,6 +5,7 @@ import type {
 	IDataObject,
 } from 'n8n-workflow';
 import { updateDisplayOptions } from 'n8n-workflow';
+
 import { apiRequest } from '../../transport';
 
 const properties: INodeProperties[] = [
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/image/index.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/image/index.ts
index 0516ae3ce4bee..3ad3648273eeb 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/image/index.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/image/index.ts
@@ -1,7 +1,7 @@
 import type { INodeProperties } from 'n8n-workflow';
 
-import * as generate from './generate.operation';
 import * as analyze from './analyze.operation';
+import * as generate from './generate.operation';
 
 export { generate, analyze };
 
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/router.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/router.ts
index 634923a5e6cb9..2b64993e2d474 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/router.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/router.ts
@@ -9,9 +9,8 @@ import * as assistant from './assistant';
 import * as audio from './audio';
 import * as file from './file';
 import * as image from './image';
-import * as text from './text';
-
 import type { OpenAiType } from './node.type';
+import * as text from './text';
 import { getCustomErrorMessage } from '../helpers/error-handling';
 
 export async function router(this: IExecuteFunctions) {
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/text/classify.operation.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/text/classify.operation.ts
index 338d4ade1e32c..dfc9a5f38afa2 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/text/classify.operation.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/text/classify.operation.ts
@@ -1,5 +1,6 @@
 import type { INodeProperties, IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { updateDisplayOptions } from 'n8n-workflow';
+
 import { apiRequest } from '../../transport';
 
 const properties: INodeProperties[] = [
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/text/message.operation.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/text/message.operation.ts
index 231fdb4b77195..2da3163099e05 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/text/message.operation.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/text/message.operation.ts
@@ -1,3 +1,5 @@
+import type { Tool } from '@langchain/core/tools';
+import _omit from 'lodash/omit';
 import type {
 	INodeProperties,
 	IExecuteFunctions,
@@ -5,14 +7,15 @@ import type {
 	IDataObject,
 } from 'n8n-workflow';
 import { jsonParse, updateDisplayOptions } from 'n8n-workflow';
-import type { Tool } from '@langchain/core/tools';
-import _omit from 'lodash/omit';
-import { apiRequest } from '../../transport';
+
+import { getConnectedTools } from '@utils/helpers';
+
+import { MODELS_NOT_SUPPORT_FUNCTION_CALLS } from '../../helpers/constants';
 import type { ChatCompletion } from '../../helpers/interfaces';
 import { formatToOpenAIAssistantTool } from '../../helpers/utils';
+import { apiRequest } from '../../transport';
 import { modelRLC } from '../descriptions';
-import { getConnectedTools } from '../../../../../utils/helpers';
-import { MODELS_NOT_SUPPORT_FUNCTION_CALLS } from '../../helpers/constants';
+
 const properties: INodeProperties[] = [
 	modelRLC('modelSearch'),
 	{
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/versionDescription.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/versionDescription.ts
index 8beabcf0a4c91..1ebd986f120b2 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/versionDescription.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/versionDescription.ts
@@ -77,7 +77,7 @@ export const versionDescription: INodeTypeDescription = {
 	name: 'openAi',
 	icon: { light: 'file:openAi.svg', dark: 'file:openAi.dark.svg' },
 	group: ['transform'],
-	version: [1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7],
+	version: [1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8],
 	subtitle: `={{(${prettifyOperation})($parameter.resource, $parameter.operation)}}`,
 	description: 'Message an assistant or GPT, analyze images, generate audio, etc.',
 	defaults: {
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/helpers/utils.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/helpers/utils.ts
index 294fc47847f0f..d0db590bc3f41 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/helpers/utils.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/helpers/utils.ts
@@ -1,6 +1,6 @@
-import { zodToJsonSchema } from 'zod-to-json-schema';
-import type { OpenAIClient } from '@langchain/openai';
 import type { StructuredTool } from '@langchain/core/tools';
+import type { OpenAIClient } from '@langchain/openai';
+import { zodToJsonSchema } from 'zod-to-json-schema';
 
 // Copied from langchain(`langchain/src/tools/convert_to_openai.ts`)
 // since these functions are not exported
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/methods/listSearch.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/methods/listSearch.ts
index 447502948140f..dcf056618a854 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/methods/listSearch.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/methods/listSearch.ts
@@ -4,9 +4,9 @@ import type {
 	INodeListSearchItems,
 	INodeListSearchResult,
 } from 'n8n-workflow';
-
-import type { Model } from 'openai/resources/models';
 import type { Assistant } from 'openai/resources/beta/assistants';
+import type { Model } from 'openai/resources/models';
+
 import { apiRequest } from '../transport';
 
 export async function fileSearch(
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/methods/loadOptions.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/methods/loadOptions.ts
index a25f24c6988cd..9f53ca1f865c6 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/methods/loadOptions.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/methods/loadOptions.ts
@@ -1,4 +1,5 @@
 import type { ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
+
 import { apiRequest } from '../transport';
 
 export async function getFiles(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/test/OpenAi.node.test.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/test/OpenAi.node.test.ts
index a78260844c87a..b8a32c45bfdc6 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/test/OpenAi.node.test.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/test/OpenAi.node.test.ts
@@ -1,11 +1,11 @@
-import type { IDataObject, IExecuteFunctions } from 'n8n-workflow';
 import get from 'lodash/get';
+import type { IDataObject, IExecuteFunctions } from 'n8n-workflow';
+
 import * as assistant from '../actions/assistant';
 import * as audio from '../actions/audio';
 import * as file from '../actions/file';
 import * as image from '../actions/image';
 import * as text from '../actions/text';
-
 import * as transport from '../transport';
 
 const createExecuteFunctionsMock = (parameters: IDataObject) => {
diff --git a/packages/@n8n/nodes-langchain/package.json b/packages/@n8n/nodes-langchain/package.json
index f086f2e82f617..8945d9ba43308 100644
--- a/packages/@n8n/nodes-langchain/package.json
+++ b/packages/@n8n/nodes-langchain/package.json
@@ -1,19 +1,18 @@
 {
   "name": "@n8n/n8n-nodes-langchain",
-  "version": "1.71.0",
+  "version": "1.73.0",
   "description": "",
   "main": "index.js",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm run watch",
     "typecheck": "tsc --noEmit",
-    "build": "tsc -p tsconfig.build.json && pnpm n8n-copy-icons && pnpm build:metadata",
-    "build:metadata": "pnpm n8n-generate-known && pnpm n8n-generate-ui-types",
+    "build": "tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && pnpm n8n-copy-icons && pnpm n8n-generate-metadata",
     "format": "biome format --write .",
     "format:check": "biome ci .",
-    "lint": "eslint nodes credentials --quiet",
-    "lintfix": "eslint nodes credentials --fix",
-    "watch": "tsc-watch -p tsconfig.build.json --onCompilationComplete \"tsc-alias -p tsconfig.build.json\" --onSuccess \"pnpm n8n-generate-ui-types\"",
+    "lint": "eslint nodes credentials utils --quiet",
+    "lintfix": "eslint nodes credentials utils --fix",
+    "watch": "tsc-watch -p tsconfig.build.json --onCompilationComplete \"tsc-alias -p tsconfig.build.json\" --onSuccess \"pnpm n8n-generate-metadata\"",
     "test": "jest",
     "test:dev": "jest --watch"
   },
diff --git a/packages/@n8n/nodes-langchain/tsconfig.json b/packages/@n8n/nodes-langchain/tsconfig.json
index a0bd21149ff1c..d72fd76a4af4d 100644
--- a/packages/@n8n/nodes-langchain/tsconfig.json
+++ b/packages/@n8n/nodes-langchain/tsconfig.json
@@ -1,6 +1,9 @@
 {
 	"extends": ["../../../tsconfig.json", "../../../tsconfig.backend.json"],
 	"compilerOptions": {
+		"paths": {
+			"@utils/*": ["./utils/*"]
+		},
 		"tsBuildInfoFile": "dist/typecheck.tsbuildinfo",
 		// TODO: remove all options below this line
 		"useUnknownInCatchVariables": false
diff --git a/packages/@n8n/nodes-langchain/utils/N8nBinaryLoader.ts b/packages/@n8n/nodes-langchain/utils/N8nBinaryLoader.ts
index 53f4f95a74013..cca2244793815 100644
--- a/packages/@n8n/nodes-langchain/utils/N8nBinaryLoader.ts
+++ b/packages/@n8n/nodes-langchain/utils/N8nBinaryLoader.ts
@@ -1,5 +1,12 @@
-import { pipeline } from 'stream/promises';
+import { CSVLoader } from '@langchain/community/document_loaders/fs/csv';
+import { DocxLoader } from '@langchain/community/document_loaders/fs/docx';
+import { EPubLoader } from '@langchain/community/document_loaders/fs/epub';
+import { PDFLoader } from '@langchain/community/document_loaders/fs/pdf';
+import type { Document } from '@langchain/core/documents';
+import type { TextSplitter } from '@langchain/textsplitters';
 import { createWriteStream } from 'fs';
+import { JSONLoader } from 'langchain/document_loaders/fs/json';
+import { TextLoader } from 'langchain/document_loaders/fs/text';
 import type {
 	IBinaryData,
 	IExecuteFunctions,
@@ -7,15 +14,7 @@ import type {
 	ISupplyDataFunctions,
 } from 'n8n-workflow';
 import { NodeOperationError, BINARY_ENCODING } from 'n8n-workflow';
-
-import type { TextSplitter } from '@langchain/textsplitters';
-import type { Document } from '@langchain/core/documents';
-import { CSVLoader } from '@langchain/community/document_loaders/fs/csv';
-import { DocxLoader } from '@langchain/community/document_loaders/fs/docx';
-import { JSONLoader } from 'langchain/document_loaders/fs/json';
-import { PDFLoader } from '@langchain/community/document_loaders/fs/pdf';
-import { TextLoader } from 'langchain/document_loaders/fs/text';
-import { EPubLoader } from '@langchain/community/document_loaders/fs/epub';
+import { pipeline } from 'stream/promises';
 import { file as tmpFile, type DirectoryResult } from 'tmp-promise';
 
 import { getMetadataFiltersValues } from './helpers';
diff --git a/packages/@n8n/nodes-langchain/utils/N8nJsonLoader.ts b/packages/@n8n/nodes-langchain/utils/N8nJsonLoader.ts
index 7c44d8a8f9c02..de5add3e2664c 100644
--- a/packages/@n8n/nodes-langchain/utils/N8nJsonLoader.ts
+++ b/packages/@n8n/nodes-langchain/utils/N8nJsonLoader.ts
@@ -1,3 +1,7 @@
+import type { Document } from '@langchain/core/documents';
+import type { TextSplitter } from '@langchain/textsplitters';
+import { JSONLoader } from 'langchain/document_loaders/fs/json';
+import { TextLoader } from 'langchain/document_loaders/fs/text';
 import {
 	type IExecuteFunctions,
 	type INodeExecutionData,
@@ -5,10 +9,6 @@ import {
 	NodeOperationError,
 } from 'n8n-workflow';
 
-import type { TextSplitter } from '@langchain/textsplitters';
-import type { Document } from '@langchain/core/documents';
-import { JSONLoader } from 'langchain/document_loaders/fs/json';
-import { TextLoader } from 'langchain/document_loaders/fs/text';
 import { getMetadataFiltersValues } from './helpers';
 
 export class N8nJsonLoader {
diff --git a/packages/@n8n/nodes-langchain/utils/N8nTool.test.ts b/packages/@n8n/nodes-langchain/utils/N8nTool.test.ts
index 6f12b18079551..40a1ca70d3526 100644
--- a/packages/@n8n/nodes-langchain/utils/N8nTool.test.ts
+++ b/packages/@n8n/nodes-langchain/utils/N8nTool.test.ts
@@ -1,8 +1,9 @@
-import { N8nTool } from './N8nTool';
+import { DynamicStructuredTool, DynamicTool } from '@langchain/core/tools';
 import { createMockExecuteFunction } from 'n8n-nodes-base/test/nodes/Helpers';
-import { z } from 'zod';
 import type { INode } from 'n8n-workflow';
-import { DynamicStructuredTool, DynamicTool } from '@langchain/core/tools';
+import { z } from 'zod';
+
+import { N8nTool } from './N8nTool';
 
 const mockNode: INode = {
 	id: '1',
diff --git a/packages/@n8n/nodes-langchain/utils/N8nTool.ts b/packages/@n8n/nodes-langchain/utils/N8nTool.ts
index 2cb89630f0113..f568955beb7f8 100644
--- a/packages/@n8n/nodes-langchain/utils/N8nTool.ts
+++ b/packages/@n8n/nodes-langchain/utils/N8nTool.ts
@@ -1,8 +1,8 @@
 import type { DynamicStructuredToolInput } from '@langchain/core/tools';
 import { DynamicStructuredTool, DynamicTool } from '@langchain/core/tools';
+import { StructuredOutputParser } from 'langchain/output_parsers';
 import type { ISupplyDataFunctions, IDataObject } from 'n8n-workflow';
 import { NodeConnectionType, jsonParse, NodeOperationError } from 'n8n-workflow';
-import { StructuredOutputParser } from 'langchain/output_parsers';
 import type { ZodTypeAny } from 'zod';
 import { ZodBoolean, ZodNullable, ZodNumber, ZodObject, ZodOptional } from 'zod';
 
diff --git a/packages/@n8n/nodes-langchain/utils/descriptions.ts b/packages/@n8n/nodes-langchain/utils/descriptions.ts
index ef683df3e9539..e629bab812729 100644
--- a/packages/@n8n/nodes-langchain/utils/descriptions.ts
+++ b/packages/@n8n/nodes-langchain/utils/descriptions.ts
@@ -71,13 +71,12 @@ export const promptTypeOptions: INodeProperties = {
 	type: 'options',
 	options: [
 		{
-			// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
-			name: 'Take from previous node automatically',
+			name: 'Connected Chat Trigger Node',
 			value: 'auto',
-			description: 'Looks for an input field called chatInput',
+			description:
+				"Looks for an input field called 'chatInput' that is coming from a directly connected Chat Trigger",
 		},
 		{
-			// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
 			name: 'Define below',
 			value: 'define',
 			description: 'Use an expression to reference data in previous nodes or enter static text',
diff --git a/packages/@n8n/nodes-langchain/utils/helpers.ts b/packages/@n8n/nodes-langchain/utils/helpers.ts
index f19cf67153526..6b5816e7b8af1 100644
--- a/packages/@n8n/nodes-langchain/utils/helpers.ts
+++ b/packages/@n8n/nodes-langchain/utils/helpers.ts
@@ -130,7 +130,7 @@ export function getSessionId(
 		if (sessionId === '' || sessionId === undefined) {
 			throw new NodeOperationError(ctx.getNode(), 'Key parameter is empty', {
 				description:
-					"Provide a key to use as session ID in the 'Key' parameter or use the 'Take from previous node automatically' option to use the session ID from the previous node, e.t. chat trigger node",
+					"Provide a key to use as session ID in the 'Key' parameter or use the 'Connected Chat Trigger Node' option to use the session ID from your Chat Trigger",
 				itemIndex,
 			});
 		}
diff --git a/packages/@n8n/nodes-langchain/utils/logWrapper.ts b/packages/@n8n/nodes-langchain/utils/logWrapper.ts
index fa1a38b31a5e7..073b00516290a 100644
--- a/packages/@n8n/nodes-langchain/utils/logWrapper.ts
+++ b/packages/@n8n/nodes-langchain/utils/logWrapper.ts
@@ -394,7 +394,6 @@ export function logWrapper(
 					return async (
 						query: string,
 						k?: number,
-						// @ts-ignore
 						filter?: BiquadFilterType | undefined,
 						_callbacks?: Callbacks | undefined,
 					): Promise<Document[]> => {
diff --git a/packages/@n8n/task-runner/jest.config.js b/packages/@n8n/task-runner/jest.config.js
index 5c3abe1ef788c..2a3a7a1e02559 100644
--- a/packages/@n8n/task-runner/jest.config.js
+++ b/packages/@n8n/task-runner/jest.config.js
@@ -1,5 +1,6 @@
 /** @type {import('jest').Config} */
 module.exports = {
 	...require('../../../jest.config'),
+	setupFilesAfterEnv: ['n8n-workflow/test/setup.ts'],
 	testTimeout: 10_000,
 };
diff --git a/packages/@n8n/task-runner/package.json b/packages/@n8n/task-runner/package.json
index daec02c8e98f9..212909990e5da 100644
--- a/packages/@n8n/task-runner/package.json
+++ b/packages/@n8n/task-runner/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/task-runner",
-  "version": "1.9.0",
+  "version": "1.11.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "start": "node dist/start.js",
@@ -35,17 +35,18 @@
   },
   "dependencies": {
     "@n8n/config": "workspace:*",
-    "@sentry/integrations": "catalog:",
     "@sentry/node": "catalog:",
     "acorn": "8.14.0",
     "acorn-walk": "8.3.4",
+    "lodash": "catalog:",
     "n8n-core": "workspace:*",
     "n8n-workflow": "workspace:*",
-    "nanoid": "^3.3.6",
+    "nanoid": "catalog:",
     "typedi": "catalog:",
     "ws": "^8.18.0"
   },
   "devDependencies": {
+    "@types/lodash": "catalog:",
     "luxon": "catalog:"
   }
 }
diff --git a/packages/@n8n/task-runner/src/__tests__/error-reporter.test.ts b/packages/@n8n/task-runner/src/__tests__/error-reporter.test.ts
deleted file mode 100644
index 9345819329b2c..0000000000000
--- a/packages/@n8n/task-runner/src/__tests__/error-reporter.test.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { mock } from 'jest-mock-extended';
-import { ApplicationError } from 'n8n-workflow';
-
-import { ErrorReporter } from '../error-reporter';
-
-describe('ErrorReporter', () => {
-	const errorReporting = new ErrorReporter(mock());
-
-	describe('beforeSend', () => {
-		it('should return null if originalException is an ApplicationError with level warning', () => {
-			const hint = { originalException: new ApplicationError('Test error', { level: 'warning' }) };
-			expect(errorReporting.beforeSend(mock(), hint)).toBeNull();
-		});
-
-		it('should return event if originalException is an ApplicationError with level error', () => {
-			const hint = { originalException: new ApplicationError('Test error', { level: 'error' }) };
-			expect(errorReporting.beforeSend(mock(), hint)).not.toBeNull();
-		});
-
-		it('should return null if originalException is an Error with a non-unique stack', () => {
-			const hint = { originalException: new Error('Test error') };
-			errorReporting.beforeSend(mock(), hint);
-			expect(errorReporting.beforeSend(mock(), hint)).toBeNull();
-		});
-
-		it('should return event if originalException is an Error with a unique stack', () => {
-			const hint = { originalException: new Error('Test error') };
-			expect(errorReporting.beforeSend(mock(), hint)).not.toBeNull();
-		});
-	});
-});
diff --git a/packages/@n8n/task-runner/src/config/base-runner-config.ts b/packages/@n8n/task-runner/src/config/base-runner-config.ts
index a1059adf4b8c1..d08056c5ae32a 100644
--- a/packages/@n8n/task-runner/src/config/base-runner-config.ts
+++ b/packages/@n8n/task-runner/src/config/base-runner-config.ts
@@ -37,6 +37,9 @@ export class BaseRunnerConfig {
 	@Env('GENERIC_TIMEZONE')
 	timezone: string = 'America/New_York';
 
+	@Env('N8N_RUNNERS_TASK_TIMEOUT')
+	taskTimeout: number = 60;
+
 	@Nested
 	healthcheckServer!: HealthcheckServerConfig;
 }
diff --git a/packages/@n8n/task-runner/src/error-reporter.ts b/packages/@n8n/task-runner/src/error-reporter.ts
deleted file mode 100644
index 167cc37c924b1..0000000000000
--- a/packages/@n8n/task-runner/src/error-reporter.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import { RewriteFrames } from '@sentry/integrations';
-import { init, setTag, captureException, close } from '@sentry/node';
-import type { ErrorEvent, EventHint } from '@sentry/types';
-import * as a from 'assert/strict';
-import { createHash } from 'crypto';
-import { ApplicationError } from 'n8n-workflow';
-
-import type { SentryConfig } from '@/config/sentry-config';
-
-/**
- * Handles error reporting using Sentry
- */
-export class ErrorReporter {
-	private isInitialized = false;
-
-	/** Hashes of error stack traces, to deduplicate error reports. */
-	private readonly seenErrors = new Set<string>();
-
-	private get dsn() {
-		return this.sentryConfig.sentryDsn;
-	}
-
-	constructor(private readonly sentryConfig: SentryConfig) {
-		a.ok(this.dsn, 'Sentry DSN is required to initialize Sentry');
-	}
-
-	async start() {
-		if (this.isInitialized) return;
-
-		// Collect longer stacktraces
-		Error.stackTraceLimit = 50;
-
-		process.on('uncaughtException', captureException);
-
-		const ENABLED_INTEGRATIONS = [
-			'InboundFilters',
-			'FunctionToString',
-			'LinkedErrors',
-			'OnUnhandledRejection',
-			'ContextLines',
-		];
-
-		setTag('server_type', 'task_runner');
-
-		init({
-			dsn: this.dsn,
-			release: this.sentryConfig.n8nVersion,
-			environment: this.sentryConfig.environment,
-			enableTracing: false,
-			serverName: this.sentryConfig.deploymentName,
-			beforeBreadcrumb: () => null,
-			beforeSend: async (event, hint) => await this.beforeSend(event, hint),
-			integrations: (integrations) => [
-				...integrations.filter(({ name }) => ENABLED_INTEGRATIONS.includes(name)),
-				new RewriteFrames({ root: process.cwd() }),
-			],
-		});
-
-		this.isInitialized = true;
-	}
-
-	async stop() {
-		if (!this.isInitialized) {
-			return;
-		}
-
-		await close(1000);
-	}
-
-	async beforeSend(event: ErrorEvent, { originalException }: EventHint) {
-		if (!originalException) return null;
-
-		if (originalException instanceof Promise) {
-			originalException = await originalException.catch((error) => error as Error);
-		}
-
-		if (originalException instanceof ApplicationError) {
-			const { level, extra, tags } = originalException;
-			if (level === 'warning') return null;
-			event.level = level;
-			if (extra) event.extra = { ...event.extra, ...extra };
-			if (tags) event.tags = { ...event.tags, ...tags };
-		}
-
-		if (originalException instanceof Error && originalException.stack) {
-			const eventHash = createHash('sha1').update(originalException.stack).digest('base64');
-			if (this.seenErrors.has(eventHash)) return null;
-			this.seenErrors.add(eventHash);
-		}
-
-		return event;
-	}
-}
diff --git a/packages/@n8n/task-runner/src/healthcheck-server.ts b/packages/@n8n/task-runner/src/health-check-server.ts
similarity index 88%
rename from packages/@n8n/task-runner/src/healthcheck-server.ts
rename to packages/@n8n/task-runner/src/health-check-server.ts
index c6d8965a86b94..9cb4cae6a0440 100644
--- a/packages/@n8n/task-runner/src/healthcheck-server.ts
+++ b/packages/@n8n/task-runner/src/health-check-server.ts
@@ -1,7 +1,7 @@
 import { ApplicationError } from 'n8n-workflow';
 import { createServer } from 'node:http';
 
-export class HealthcheckServer {
+export class HealthCheckServer {
 	private server = createServer((_, res) => {
 		res.writeHead(200);
 		res.end('OK');
@@ -21,7 +21,7 @@ export class HealthcheckServer {
 
 			this.server.listen(port, host, () => {
 				this.server.removeListener('error', portInUseErrorHandler);
-				console.log(`Healthcheck server listening on ${host}, port ${port}`);
+				console.log(`Health check server listening on ${host}, port ${port}`);
 				resolve();
 			});
 		});
diff --git a/packages/@n8n/task-runner/src/js-task-runner/__tests__/js-task-runner.test.ts b/packages/@n8n/task-runner/src/js-task-runner/__tests__/js-task-runner.test.ts
index 439de19eac95a..dbb94038946fd 100644
--- a/packages/@n8n/task-runner/src/js-task-runner/__tests__/js-task-runner.test.ts
+++ b/packages/@n8n/task-runner/src/js-task-runner/__tests__/js-task-runner.test.ts
@@ -1,4 +1,6 @@
+import { mock } from 'jest-mock-extended';
 import { DateTime } from 'luxon';
+import type { IBinaryData } from 'n8n-workflow';
 import { setGlobalState, type CodeExecutionMode, type IDataObject } from 'n8n-workflow';
 import fs from 'node:fs';
 import { builtinModules } from 'node:module';
@@ -7,10 +9,15 @@ import type { BaseRunnerConfig } from '@/config/base-runner-config';
 import type { JsRunnerConfig } from '@/config/js-runner-config';
 import { MainConfig } from '@/config/main-config';
 import { ExecutionError } from '@/js-task-runner/errors/execution-error';
+import { UnsupportedFunctionError } from '@/js-task-runner/errors/unsupported-function.error';
 import { ValidationError } from '@/js-task-runner/errors/validation-error';
 import type { JSExecSettings } from '@/js-task-runner/js-task-runner';
 import { JsTaskRunner } from '@/js-task-runner/js-task-runner';
-import type { DataRequestResponse, InputDataChunkDefinition } from '@/runner-types';
+import {
+	UNSUPPORTED_HELPER_FUNCTIONS,
+	type DataRequestResponse,
+	type InputDataChunkDefinition,
+} from '@/runner-types';
 import type { Task } from '@/task-runner';
 
 import {
@@ -35,6 +42,7 @@ describe('JsTaskRunner', () => {
 				grantToken: 'grantToken',
 				maxConcurrency: 1,
 				taskBrokerUri: 'http://localhost',
+				taskTimeout: 60,
 				...baseRunnerOpts,
 			},
 			jsRunnerConfig: {
@@ -61,7 +69,7 @@ describe('JsTaskRunner', () => {
 		runner?: JsTaskRunner;
 	}) => {
 		jest.spyOn(runner, 'requestData').mockResolvedValue(taskData);
-		return await runner.executeTask(task);
+		return await runner.executeTask(task, mock<AbortSignal>());
 	};
 
 	afterEach(() => {
@@ -135,6 +143,36 @@ describe('JsTaskRunner', () => {
 				]);
 			},
 		);
+
+		it('should not throw when using unsupported console methods', async () => {
+			const task = newTaskWithSettings({
+				code: `
+					console.warn('test');
+					console.error('test');
+					console.info('test');
+					console.debug('test');
+					console.trace('test');
+					console.dir({});
+					console.time('test');
+					console.timeEnd('test');
+					console.timeLog('test');
+					console.assert(true);
+					console.clear();
+					console.group('test');
+					console.groupEnd();
+					console.table([]);
+					return {json: {}}
+				`,
+				nodeMode: 'runOnceForAllItems',
+			});
+
+			await expect(
+				execTaskWithParams({
+					task,
+					taskData: newDataRequestResponse([wrapIntoJson({})]),
+				}),
+			).resolves.toBeDefined();
+		});
 	});
 
 	describe('built-in methods and variables available in the context', () => {
@@ -213,6 +251,7 @@ describe('JsTaskRunner', () => {
 				['$runIndex', 0],
 				['{ wf: $workflow }', { wf: { active: true, id: '1', name: 'Test Workflow' } }],
 				['$vars', { var: 'value' }],
+				['$getWorkflowStaticData("global")', {}],
 			],
 			'Node.js internal functions': [
 				['typeof Function', 'function'],
@@ -363,6 +402,291 @@ describe('JsTaskRunner', () => {
 			});
 		});
 
+		describe("$getWorkflowStaticData('global')", () => {
+			it('should have the global workflow static data available in runOnceForAllItems', async () => {
+				const outcome = await execTaskWithParams({
+					task: newTaskWithSettings({
+						code: 'return { val: $getWorkflowStaticData("global") }',
+						nodeMode: 'runOnceForAllItems',
+					}),
+					taskData: newDataRequestResponse(inputItems.map(wrapIntoJson), {
+						staticData: {
+							global: { key: 'value' },
+						},
+					}),
+				});
+
+				expect(outcome.result).toEqual([wrapIntoJson({ val: { key: 'value' } })]);
+			});
+
+			it('should have the global workflow static data available in runOnceForEachItem', async () => {
+				const outcome = await execTaskWithParams({
+					task: newTaskWithSettings({
+						code: 'return { val: $getWorkflowStaticData("global") }',
+						nodeMode: 'runOnceForEachItem',
+					}),
+					taskData: newDataRequestResponse(inputItems.map(wrapIntoJson), {
+						staticData: {
+							global: { key: 'value' },
+						},
+					}),
+				});
+
+				expect(outcome.result).toEqual([
+					withPairedItem(0, wrapIntoJson({ val: { key: 'value' } })),
+				]);
+			});
+
+			test.each<[CodeExecutionMode]>([['runOnceForAllItems'], ['runOnceForEachItem']])(
+				"does not return static data if it hasn't been modified in %s",
+				async (mode) => {
+					const outcome = await execTaskWithParams({
+						task: newTaskWithSettings({
+							code: `
+								const staticData = $getWorkflowStaticData("global");
+								return { val: staticData };
+							`,
+							nodeMode: mode,
+						}),
+						taskData: newDataRequestResponse(inputItems.map(wrapIntoJson), {
+							staticData: {
+								global: { key: 'value' },
+							},
+						}),
+					});
+
+					expect(outcome.staticData).toBeUndefined();
+				},
+			);
+
+			test.each<[CodeExecutionMode]>([['runOnceForAllItems'], ['runOnceForEachItem']])(
+				'returns the updated static data in %s',
+				async (mode) => {
+					const outcome = await execTaskWithParams({
+						task: newTaskWithSettings({
+							code: `
+								const staticData = $getWorkflowStaticData("global");
+								staticData.newKey = 'newValue';
+								return { val: staticData };
+							`,
+							nodeMode: mode,
+						}),
+						taskData: newDataRequestResponse(inputItems.map(wrapIntoJson), {
+							staticData: {
+								global: { key: 'value' },
+								'node:OtherNode': { some: 'data' },
+							},
+						}),
+					});
+
+					expect(outcome.staticData).toEqual({
+						global: { key: 'value', newKey: 'newValue' },
+						'node:OtherNode': { some: 'data' },
+					});
+				},
+			);
+		});
+
+		describe("$getWorkflowStaticData('node')", () => {
+			const createTaskDataWithNodeStaticData = (nodeStaticData: IDataObject) => {
+				const taskData = newDataRequestResponse(inputItems.map(wrapIntoJson));
+				const taskDataKey = `node:${taskData.node.name}`;
+				taskData.workflow.staticData = {
+					global: { 'global-key': 'global-value' },
+					'node:OtherNode': { 'other-key': 'other-value' },
+					[taskDataKey]: nodeStaticData,
+				};
+
+				return taskData;
+			};
+
+			it('should have the node workflow static data available in runOnceForAllItems', async () => {
+				const outcome = await execTaskWithParams({
+					task: newTaskWithSettings({
+						code: 'return { val: $getWorkflowStaticData("node") }',
+						nodeMode: 'runOnceForAllItems',
+					}),
+					taskData: createTaskDataWithNodeStaticData({ key: 'value' }),
+				});
+
+				expect(outcome.result).toEqual([wrapIntoJson({ val: { key: 'value' } })]);
+			});
+
+			it('should have the node workflow static data available in runOnceForEachItem', async () => {
+				const outcome = await execTaskWithParams({
+					task: newTaskWithSettings({
+						code: 'return { val: $getWorkflowStaticData("node") }',
+						nodeMode: 'runOnceForEachItem',
+					}),
+					taskData: createTaskDataWithNodeStaticData({ key: 'value' }),
+				});
+
+				expect(outcome.result).toEqual([
+					withPairedItem(0, wrapIntoJson({ val: { key: 'value' } })),
+				]);
+			});
+
+			test.each<[CodeExecutionMode]>([['runOnceForAllItems'], ['runOnceForEachItem']])(
+				"does not return static data if it hasn't been modified in %s",
+				async (mode) => {
+					const outcome = await execTaskWithParams({
+						task: newTaskWithSettings({
+							code: `
+								const staticData = $getWorkflowStaticData("node");
+								return { val: staticData };
+							`,
+							nodeMode: mode,
+						}),
+						taskData: createTaskDataWithNodeStaticData({ key: 'value' }),
+					});
+
+					expect(outcome.staticData).toBeUndefined();
+				},
+			);
+
+			test.each<[CodeExecutionMode]>([['runOnceForAllItems'], ['runOnceForEachItem']])(
+				'returns the updated static data in %s',
+				async (mode) => {
+					const outcome = await execTaskWithParams({
+						task: newTaskWithSettings({
+							code: `
+								const staticData = $getWorkflowStaticData("node");
+								staticData.newKey = 'newValue';
+								return { val: staticData };
+							`,
+							nodeMode: mode,
+						}),
+						taskData: createTaskDataWithNodeStaticData({ key: 'value' }),
+					});
+
+					expect(outcome.staticData).toEqual({
+						global: { 'global-key': 'global-value' },
+						'node:JsCode': {
+							key: 'value',
+							newKey: 'newValue',
+						},
+						'node:OtherNode': {
+							'other-key': 'other-value',
+						},
+					});
+				},
+			);
+		});
+
+		describe('helpers', () => {
+			const binaryDataFile: IBinaryData = {
+				data: 'data',
+				fileName: 'file.txt',
+				mimeType: 'text/plain',
+			};
+
+			const groups = [
+				{
+					method: 'helpers.assertBinaryData',
+					invocation: "helpers.assertBinaryData(0, 'binaryFile')",
+					expectedParams: [0, 'binaryFile'],
+				},
+				{
+					method: 'helpers.getBinaryDataBuffer',
+					invocation: "helpers.getBinaryDataBuffer(0, 'binaryFile')",
+					expectedParams: [0, 'binaryFile'],
+				},
+				{
+					method: 'helpers.prepareBinaryData',
+					invocation: "helpers.prepareBinaryData(Buffer.from('123'), 'file.txt', 'text/plain')",
+					expectedParams: [Buffer.from('123'), 'file.txt', 'text/plain'],
+				},
+				{
+					method: 'helpers.setBinaryDataBuffer',
+					invocation:
+						"helpers.setBinaryDataBuffer({ data: '123', mimeType: 'text/plain' }, Buffer.from('321'))",
+					expectedParams: [{ data: '123', mimeType: 'text/plain' }, Buffer.from('321')],
+				},
+				{
+					method: 'helpers.binaryToString',
+					invocation: "helpers.binaryToString(Buffer.from('123'), 'utf8')",
+					expectedParams: [Buffer.from('123'), 'utf8'],
+				},
+				{
+					method: 'helpers.httpRequest',
+					invocation: "helpers.httpRequest({ method: 'GET', url: 'http://localhost' })",
+					expectedParams: [{ method: 'GET', url: 'http://localhost' }],
+				},
+			];
+
+			for (const group of groups) {
+				it(`${group.method} for runOnceForAllItems`, async () => {
+					// Arrange
+					const rpcCallSpy = jest
+						.spyOn(defaultTaskRunner, 'makeRpcCall')
+						.mockResolvedValue(undefined);
+
+					// Act
+					await execTaskWithParams({
+						task: newTaskWithSettings({
+							code: `await ${group.invocation}; return []`,
+							nodeMode: 'runOnceForAllItems',
+						}),
+						taskData: newDataRequestResponse(
+							[{ json: {}, binary: { binaryFile: binaryDataFile } }],
+							{},
+						),
+					});
+
+					expect(rpcCallSpy).toHaveBeenCalledWith('1', group.method, group.expectedParams);
+				});
+
+				it(`${group.method} for runOnceForEachItem`, async () => {
+					// Arrange
+					const rpcCallSpy = jest
+						.spyOn(defaultTaskRunner, 'makeRpcCall')
+						.mockResolvedValue(undefined);
+
+					// Act
+					await execTaskWithParams({
+						task: newTaskWithSettings({
+							code: `await ${group.invocation}; return {}`,
+							nodeMode: 'runOnceForEachItem',
+						}),
+						taskData: newDataRequestResponse(
+							[{ json: {}, binary: { binaryFile: binaryDataFile } }],
+							{},
+						),
+					});
+
+					expect(rpcCallSpy).toHaveBeenCalledWith('1', group.method, group.expectedParams);
+				});
+			}
+
+			describe('unsupported methods', () => {
+				for (const unsupportedFunction of UNSUPPORTED_HELPER_FUNCTIONS) {
+					it(`should throw an error if ${unsupportedFunction} is used in runOnceForAllItems`, async () => {
+						// Act
+
+						await expect(
+							async () =>
+								await executeForAllItems({
+									code: `${unsupportedFunction}()`,
+									inputItems,
+								}),
+						).rejects.toThrow(UnsupportedFunctionError);
+					});
+
+					it(`should throw an error if ${unsupportedFunction} is used in runOnceForEachItem`, async () => {
+						// Act
+
+						await expect(
+							async () =>
+								await executeForEachItem({
+									code: `${unsupportedFunction}()`,
+									inputItems,
+								}),
+						).rejects.toThrow(UnsupportedFunctionError);
+					});
+				}
+			});
+		});
+
 		it('should allow access to Node.js Buffers', async () => {
 			const outcomeAll = await execTaskWithParams({
 				task: newTaskWithSettings({
diff --git a/packages/@n8n/task-runner/src/js-task-runner/__tests__/task-runner.test.ts b/packages/@n8n/task-runner/src/js-task-runner/__tests__/task-runner.test.ts
index c633e9568806d..e12770f7705b3 100644
--- a/packages/@n8n/task-runner/src/js-task-runner/__tests__/task-runner.test.ts
+++ b/packages/@n8n/task-runner/src/js-task-runner/__tests__/task-runner.test.ts
@@ -21,6 +21,7 @@ describe('TestRunner', () => {
 				maxPayloadSize: 1024,
 				taskBrokerUri: 'http://localhost:8080',
 				timezone: 'America/New_York',
+				taskTimeout: 60,
 				healthcheckServer: {
 					enabled: false,
 					host: 'localhost',
@@ -37,6 +38,8 @@ describe('TestRunner', () => {
 					maxPayload: 1024,
 				}),
 			);
+
+			runner.clearIdleTimer();
 		});
 
 		it('should handle different taskBrokerUri formats correctly', () => {
@@ -48,6 +51,7 @@ describe('TestRunner', () => {
 				maxPayloadSize: 1024,
 				taskBrokerUri: 'https://example.com:3000/path',
 				timezone: 'America/New_York',
+				taskTimeout: 60,
 				healthcheckServer: {
 					enabled: false,
 					host: 'localhost',
@@ -64,6 +68,8 @@ describe('TestRunner', () => {
 					maxPayload: 1024,
 				}),
 			);
+
+			runner.clearIdleTimer();
 		});
 
 		it('should throw an error if taskBrokerUri is invalid', () => {
@@ -77,6 +83,7 @@ describe('TestRunner', () => {
 						maxPayloadSize: 1024,
 						taskBrokerUri: 'not-a-valid-uri',
 						timezone: 'America/New_York',
+						taskTimeout: 60,
 						healthcheckServer: {
 							enabled: false,
 							host: 'localhost',
@@ -86,4 +93,65 @@ describe('TestRunner', () => {
 			).toThrowError(/Invalid URL/);
 		});
 	});
+
+	describe('taskCancelled', () => {
+		it('should reject pending requests when task is cancelled', () => {
+			const runner = new TestRunner({
+				taskType: 'test-task',
+				maxConcurrency: 5,
+				idleTimeout: 60,
+				grantToken: 'test-token',
+				maxPayloadSize: 1024,
+				taskBrokerUri: 'http://localhost:8080',
+				timezone: 'America/New_York',
+				taskTimeout: 60,
+				healthcheckServer: {
+					enabled: false,
+					host: 'localhost',
+					port: 8081,
+				},
+			});
+
+			const taskId = 'test-task';
+			runner.runningTasks.set(taskId, {
+				taskId,
+				active: false,
+				cancelled: false,
+			});
+
+			const dataRequestReject = jest.fn();
+			const nodeTypesRequestReject = jest.fn();
+
+			runner.dataRequests.set('data-req', {
+				taskId,
+				requestId: 'data-req',
+				resolve: jest.fn(),
+				reject: dataRequestReject,
+			});
+
+			runner.nodeTypesRequests.set('node-req', {
+				taskId,
+				requestId: 'node-req',
+				resolve: jest.fn(),
+				reject: nodeTypesRequestReject,
+			});
+
+			runner.taskCancelled(taskId, 'test-reason');
+
+			expect(dataRequestReject).toHaveBeenCalledWith(
+				expect.objectContaining({
+					message: 'Task cancelled: test-reason',
+				}),
+			);
+
+			expect(nodeTypesRequestReject).toHaveBeenCalledWith(
+				expect.objectContaining({
+					message: 'Task cancelled: test-reason',
+				}),
+			);
+
+			expect(runner.dataRequests.size).toBe(0);
+			expect(runner.nodeTypesRequests.size).toBe(0);
+		});
+	});
 });
diff --git a/packages/@n8n/task-runner/src/js-task-runner/__tests__/test-data.ts b/packages/@n8n/task-runner/src/js-task-runner/__tests__/test-data.ts
index ef910e838f973..f13939e51e81e 100644
--- a/packages/@n8n/task-runner/src/js-task-runner/__tests__/test-data.ts
+++ b/packages/@n8n/task-runner/src/js-task-runner/__tests__/test-data.ts
@@ -50,7 +50,9 @@ export const newTaskData = (opts: Partial<ITaskData> & Pick<ITaskData, 'source'>
  */
 export const newDataRequestResponse = (
 	inputData: INodeExecutionData[],
-	opts: Partial<DataRequestResponse> = {},
+	opts: Partial<DataRequestResponse> & {
+		staticData?: IDataObject;
+	} = {},
 ): DataRequestResponse => {
 	const codeNode = newNode({
 		name: 'JsCode',
@@ -81,6 +83,7 @@ export const newDataRequestResponse = (
 				},
 			},
 			nodes: [manualTriggerNode, codeNode],
+			staticData: opts.staticData,
 		},
 		inputData: {
 			main: [inputData],
diff --git a/packages/@n8n/task-runner/src/js-task-runner/built-ins-parser/built-ins-parser.ts b/packages/@n8n/task-runner/src/js-task-runner/built-ins-parser/built-ins-parser.ts
index 7a5c7baf4631d..fea0d9446911d 100644
--- a/packages/@n8n/task-runner/src/js-task-runner/built-ins-parser/built-ins-parser.ts
+++ b/packages/@n8n/task-runner/src/js-task-runner/built-ins-parser/built-ins-parser.ts
@@ -21,7 +21,7 @@ export class BuiltInsParser {
 	/**
 	 * Parses which built-in variables are accessed in the given code
 	 */
-	public parseUsedBuiltIns(code: string): Result<BuiltInsParserState, Error> {
+	parseUsedBuiltIns(code: string): Result<BuiltInsParserState, Error> {
 		return toResult(() => {
 			const wrappedCode = `async function VmCodeWrapper() { ${code} }`;
 			const ast = parse(wrappedCode, { ecmaVersion: 2025, sourceType: 'module' });
diff --git a/packages/@n8n/task-runner/src/js-task-runner/errors/__tests__/execution-error.test.ts b/packages/@n8n/task-runner/src/js-task-runner/errors/__tests__/execution-error.test.ts
index c85e52f9772bd..53270c25993fb 100644
--- a/packages/@n8n/task-runner/src/js-task-runner/errors/__tests__/execution-error.test.ts
+++ b/packages/@n8n/task-runner/src/js-task-runner/errors/__tests__/execution-error.test.ts
@@ -36,7 +36,11 @@ describe('ExecutionError', () => {
 
 	it('should serialize correctly', () => {
 		const error = new Error('a.unknown is not a function');
-		error.stack = defaultStack;
+		Object.defineProperty(error, 'stack', {
+			value: defaultStack,
+			enumerable: true,
+		});
+		// error.stack = defaultStack;
 
 		const executionError = new ExecutionError(error, 1);
 
diff --git a/packages/@n8n/task-runner/src/js-task-runner/errors/execution-error.ts b/packages/@n8n/task-runner/src/js-task-runner/errors/execution-error.ts
index 63a2dd5e0b231..ef593d95894d2 100644
--- a/packages/@n8n/task-runner/src/js-task-runner/errors/execution-error.ts
+++ b/packages/@n8n/task-runner/src/js-task-runner/errors/execution-error.ts
@@ -10,8 +10,6 @@ export class ExecutionError extends SerializableError {
 
 	context: { itemIndex: number } | undefined = undefined;
 
-	stack = '';
-
 	lineNumber: number | undefined = undefined;
 
 	constructor(error: ErrorLike, itemIndex?: number) {
@@ -22,7 +20,12 @@ export class ExecutionError extends SerializableError {
 			this.context = { itemIndex: this.itemIndex };
 		}
 
-		this.stack = error.stack ?? '';
+		// Override the stack trace with the given error's stack trace. Since
+		// node v22 it's not writable, so we can't assign it directly
+		Object.defineProperty(this, 'stack', {
+			value: error.stack,
+			enumerable: true,
+		});
 
 		this.populateFromStack();
 	}
@@ -31,7 +34,7 @@ export class ExecutionError extends SerializableError {
 	 * Populate error `message` and `description` from error `stack`.
 	 */
 	private populateFromStack() {
-		const stackRows = this.stack.split('\n');
+		const stackRows = (this.stack ?? '').split('\n');
 
 		if (stackRows.length === 0) {
 			this.message = 'Unknown error';
diff --git a/packages/@n8n/task-runner/src/js-task-runner/errors/task-cancelled-error.ts b/packages/@n8n/task-runner/src/js-task-runner/errors/task-cancelled-error.ts
new file mode 100644
index 0000000000000..1970c11fcd9ef
--- /dev/null
+++ b/packages/@n8n/task-runner/src/js-task-runner/errors/task-cancelled-error.ts
@@ -0,0 +1,7 @@
+import { ApplicationError } from 'n8n-workflow';
+
+export class TaskCancelledError extends ApplicationError {
+	constructor(reason: string) {
+		super(`Task cancelled: ${reason}`, { level: 'warning' });
+	}
+}
diff --git a/packages/@n8n/task-runner/src/js-task-runner/errors/timeout-error.ts b/packages/@n8n/task-runner/src/js-task-runner/errors/timeout-error.ts
new file mode 100644
index 0000000000000..ef3cc89751862
--- /dev/null
+++ b/packages/@n8n/task-runner/src/js-task-runner/errors/timeout-error.ts
@@ -0,0 +1,30 @@
+import { ApplicationError } from 'n8n-workflow';
+
+export class TimeoutError extends ApplicationError {
+	description: string;
+
+	constructor(taskTimeout: number) {
+		super(
+			`Task execution timed out after ${taskTimeout} ${taskTimeout === 1 ? 'second' : 'seconds'}`,
+		);
+
+		const subtitle = 'The task runner was taking too long on this task, so the task was aborted.';
+
+		const fixes = {
+			optimizeScript:
+				'Optimize your script to prevent long-running tasks, e.g. by processing data in smaller batches.',
+			ensureTermination:
+				'Ensure that all paths in your script are able to terminate, i.e. no infinite loops.',
+		};
+
+		const suggestions = [fixes.optimizeScript, fixes.ensureTermination];
+
+		const suggestionsText = suggestions
+			.map((suggestion, index) => `${index + 1}. ${suggestion}`)
+			.join('<br/>');
+
+		const description = `${subtitle} You can try the following:<br/><br/>${suggestionsText}`;
+
+		this.description = description;
+	}
+}
diff --git a/packages/@n8n/task-runner/src/js-task-runner/errors/unsupported-function.error.ts b/packages/@n8n/task-runner/src/js-task-runner/errors/unsupported-function.error.ts
new file mode 100644
index 0000000000000..ad55ee0bbfa26
--- /dev/null
+++ b/packages/@n8n/task-runner/src/js-task-runner/errors/unsupported-function.error.ts
@@ -0,0 +1,13 @@
+import { ApplicationError } from 'n8n-workflow';
+
+/**
+ * Error that indicates that a specific function is not available in the
+ * Code Node.
+ */
+export class UnsupportedFunctionError extends ApplicationError {
+	constructor(functionName: string) {
+		super(`The function "${functionName}" is not supported in the Code Node`, {
+			level: 'info',
+		});
+	}
+}
diff --git a/packages/@n8n/task-runner/src/js-task-runner/js-task-runner.ts b/packages/@n8n/task-runner/src/js-task-runner/js-task-runner.ts
index 005267862ee27..04e05fb30aed6 100644
--- a/packages/@n8n/task-runner/src/js-task-runner/js-task-runner.ts
+++ b/packages/@n8n/task-runner/src/js-task-runner/js-task-runner.ts
@@ -1,5 +1,6 @@
+import set from 'lodash/set';
 import { getAdditionalKeys } from 'n8n-core';
-import { WorkflowDataProxy, Workflow } from 'n8n-workflow';
+import { WorkflowDataProxy, Workflow, ObservableObject } from 'n8n-workflow';
 import type {
 	CodeExecutionMode,
 	IWorkflowExecuteAdditionalData,
@@ -19,11 +20,14 @@ import * as a from 'node:assert';
 import { runInNewContext, type Context } from 'node:vm';
 
 import type { MainConfig } from '@/config/main-config';
-import type {
-	DataRequestResponse,
-	InputDataChunkDefinition,
-	PartialAdditionalData,
-	TaskResultData,
+import { UnsupportedFunctionError } from '@/js-task-runner/errors/unsupported-function.error';
+import {
+	EXPOSED_RPC_METHODS,
+	UNSUPPORTED_HELPER_FUNCTIONS,
+	type DataRequestResponse,
+	type InputDataChunkDefinition,
+	type PartialAdditionalData,
+	type TaskResultData,
 } from '@/runner-types';
 import { type Task, TaskRunner } from '@/task-runner';
 
@@ -32,11 +36,16 @@ import { BuiltInsParserState } from './built-ins-parser/built-ins-parser-state';
 import { isErrorLike } from './errors/error-like';
 import { ExecutionError } from './errors/execution-error';
 import { makeSerializable } from './errors/serializable-error';
+import { TimeoutError } from './errors/timeout-error';
 import type { RequireResolver } from './require-resolver';
 import { createRequireResolver } from './require-resolver';
 import { validateRunForAllItemsOutput, validateRunForEachItemOutput } from './result-validation';
 import { DataRequestResponseReconstruct } from '../data-request/data-request-response-reconstruct';
 
+export interface RPCCallObject {
+	[name: string]: ((...args: unknown[]) => Promise<unknown>) | RPCCallObject;
+}
+
 export interface JSExecSettings {
 	code: string;
 	nodeMode: CodeExecutionMode;
@@ -94,7 +103,7 @@ export class JsTaskRunner extends TaskRunner {
 		});
 	}
 
-	async executeTask(task: Task<JSExecSettings>): Promise<TaskResultData> {
+	async executeTask(task: Task<JSExecSettings>, signal: AbortSignal): Promise<TaskResultData> {
 		const settings = task.settings;
 		a.ok(settings, 'JS Code not sent to runner');
 
@@ -120,7 +129,13 @@ export class JsTaskRunner extends TaskRunner {
 			nodeTypes: this.nodeTypes,
 		});
 
+		const noOp = () => {};
 		const customConsole = {
+			// all except `log` are dummy methods that disregard without throwing, following existing Code node behavior
+			...Object.keys(console).reduce<Record<string, () => void>>((acc, name) => {
+				acc[name] = noOp;
+				return acc;
+			}, {}),
 			// Send log output back to the main process. It will take care of forwarding
 			// it to the UI or printing to console.
 			log: (...args: unknown[]) => {
@@ -131,14 +146,17 @@ export class JsTaskRunner extends TaskRunner {
 			},
 		};
 
+		workflow.staticData = ObservableObject.create(workflow.staticData);
+
 		const result =
 			settings.nodeMode === 'runOnceForAllItems'
-				? await this.runForAllItems(task.taskId, settings, data, workflow, customConsole)
-				: await this.runForEachItem(task.taskId, settings, data, workflow, customConsole);
+				? await this.runForAllItems(task.taskId, settings, data, workflow, customConsole, signal)
+				: await this.runForEachItem(task.taskId, settings, data, workflow, customConsole, signal);
 
 		return {
 			result,
 			customData: data.runExecutionData.resultData.metadata,
+			staticData: workflow.staticData.__dataChanged ? workflow.staticData : undefined,
 		};
 	}
 
@@ -183,6 +201,7 @@ export class JsTaskRunner extends TaskRunner {
 		data: JsTaskData,
 		workflow: Workflow,
 		customConsole: CustomConsole,
+		signal: AbortSignal,
 	): Promise<INodeExecutionData[]> {
 		const dataProxy = this.createDataProxy(data, workflow, data.itemIndex);
 		const inputItems = data.connectionInputData;
@@ -192,17 +211,33 @@ export class JsTaskRunner extends TaskRunner {
 			module: {},
 			console: customConsole,
 			items: inputItems,
-
+			$getWorkflowStaticData: (type: 'global' | 'node') => workflow.getStaticData(type, data.node),
 			...this.getNativeVariables(),
 			...dataProxy,
 			...this.buildRpcCallObject(taskId),
 		};
 
 		try {
-			const result = (await runInNewContext(
-				`globalThis.global = globalThis; module.exports = async function VmCodeWrapper() {${settings.code}\n}()`,
-				context,
-			)) as TaskResultData['result'];
+			const result = await new Promise<TaskResultData['result']>((resolve, reject) => {
+				const abortHandler = () => {
+					reject(new TimeoutError(this.taskTimeout));
+				};
+
+				signal.addEventListener('abort', abortHandler, { once: true });
+
+				const taskResult = runInNewContext(
+					`globalThis.global = globalThis; module.exports = async function VmCodeWrapper() {${settings.code}\n}()`,
+					context,
+					{ timeout: this.taskTimeout * 1000 },
+				) as Promise<TaskResultData['result']>;
+
+				void taskResult
+					.then(resolve)
+					.catch(reject)
+					.finally(() => {
+						signal.removeEventListener('abort', abortHandler);
+					});
+			});
 
 			if (result === null) {
 				return [];
@@ -230,6 +265,7 @@ export class JsTaskRunner extends TaskRunner {
 		data: JsTaskData,
 		workflow: Workflow,
 		customConsole: CustomConsole,
+		signal: AbortSignal,
 	): Promise<INodeExecutionData[]> {
 		const inputItems = data.connectionInputData;
 		const returnData: INodeExecutionData[] = [];
@@ -248,17 +284,34 @@ export class JsTaskRunner extends TaskRunner {
 				module: {},
 				console: customConsole,
 				item,
-
+				$getWorkflowStaticData: (type: 'global' | 'node') =>
+					workflow.getStaticData(type, data.node),
 				...this.getNativeVariables(),
 				...dataProxy,
 				...this.buildRpcCallObject(taskId),
 			};
 
 			try {
-				let result = (await runInNewContext(
-					`module.exports = async function VmCodeWrapper() {${settings.code}\n}()`,
-					context,
-				)) as INodeExecutionData | undefined;
+				let result = await new Promise<INodeExecutionData | undefined>((resolve, reject) => {
+					const abortHandler = () => {
+						reject(new TimeoutError(this.taskTimeout));
+					};
+
+					signal.addEventListener('abort', abortHandler);
+
+					const taskResult = runInNewContext(
+						`module.exports = async function VmCodeWrapper() {${settings.code}\n}()`,
+						context,
+						{ timeout: this.taskTimeout * 1000 },
+					) as Promise<INodeExecutionData>;
+
+					void taskResult
+						.then(resolve)
+						.catch(reject)
+						.finally(() => {
+							signal.removeEventListener('abort', abortHandler);
+						});
+				});
 
 				// Filter out null values
 				if (result === null) {
@@ -394,4 +447,24 @@ export class JsTaskRunner extends TaskRunner {
 			this.nodeTypes.addNodeTypeDescriptions(nodeTypes);
 		}
 	}
+
+	private buildRpcCallObject(taskId: string) {
+		const rpcObject: RPCCallObject = {};
+
+		for (const rpcMethod of EXPOSED_RPC_METHODS) {
+			set(
+				rpcObject,
+				rpcMethod.split('.'),
+				async (...args: unknown[]) => await this.makeRpcCall(taskId, rpcMethod, args),
+			);
+		}
+
+		for (const rpcMethod of UNSUPPORTED_HELPER_FUNCTIONS) {
+			set(rpcObject, rpcMethod.split('.'), () => {
+				throw new UnsupportedFunctionError(rpcMethod);
+			});
+		}
+
+		return rpcObject;
+	}
 }
diff --git a/packages/@n8n/task-runner/src/message-types.ts b/packages/@n8n/task-runner/src/message-types.ts
index 71f236b52a3df..40f7aeca77a33 100644
--- a/packages/@n8n/task-runner/src/message-types.ts
+++ b/packages/@n8n/task-runner/src/message-types.ts
@@ -2,7 +2,7 @@ import type { INodeTypeBaseDescription } from 'n8n-workflow';
 
 import type {
 	NeededNodeType,
-	RPC_ALLOW_LIST,
+	AVAILABLE_RPC_METHODS,
 	TaskDataRequestParams,
 	TaskResultData,
 } from './runner-types';
@@ -105,7 +105,7 @@ export namespace BrokerMessage {
 			type: 'broker:rpc';
 			callId: string;
 			taskId: string;
-			name: (typeof RPC_ALLOW_LIST)[number];
+			name: (typeof AVAILABLE_RPC_METHODS)[number];
 			params: unknown[];
 		}
 
@@ -239,7 +239,7 @@ export namespace RunnerMessage {
 			type: 'runner:rpc';
 			callId: string;
 			taskId: string;
-			name: (typeof RPC_ALLOW_LIST)[number];
+			name: (typeof AVAILABLE_RPC_METHODS)[number];
 			params: unknown[];
 		}
 
diff --git a/packages/@n8n/task-runner/src/polyfills.ts b/packages/@n8n/task-runner/src/polyfills.ts
new file mode 100644
index 0000000000000..7d8a83dd0ed8f
--- /dev/null
+++ b/packages/@n8n/task-runner/src/polyfills.ts
@@ -0,0 +1,5 @@
+// WebCrypto Polyfill for older versions of Node.js 18
+if (!globalThis.crypto?.getRandomValues) {
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-var-requires, @typescript-eslint/no-unsafe-member-access
+	globalThis.crypto = require('node:crypto').webcrypto;
+}
diff --git a/packages/@n8n/task-runner/src/runner-types.ts b/packages/@n8n/task-runner/src/runner-types.ts
index 174d652e7fed5..e4e76189e2ae3 100644
--- a/packages/@n8n/task-runner/src/runner-types.ts
+++ b/packages/@n8n/task-runner/src/runner-types.ts
@@ -61,6 +61,7 @@ export interface DataRequestResponse {
 export interface TaskResultData {
 	result: INodeExecutionData[];
 	customData?: Record<string, string>;
+	staticData?: IDataObject;
 }
 
 export interface TaskData {
@@ -99,31 +100,73 @@ export interface PartialAdditionalData {
 	variables: IDataObject;
 }
 
-export const RPC_ALLOW_LIST = [
-	'helpers.httpRequestWithAuthentication',
-	'helpers.requestWithAuthenticationPaginated',
-	// "helpers.normalizeItems"
-	// "helpers.constructExecutionMetaData"
-	// "helpers.assertBinaryData"
+/** RPC methods that are exposed directly to the Code Node */
+export const EXPOSED_RPC_METHODS = [
+	// assertBinaryData(itemIndex: number, propertyName: string): Promise<IBinaryData>
+	'helpers.assertBinaryData',
+
+	// getBinaryDataBuffer(itemIndex: number, propertyName: string): Promise<Buffer>
 	'helpers.getBinaryDataBuffer',
-	// "helpers.copyInputItems"
-	// "helpers.returnJsonArray"
-	'helpers.getSSHClient',
-	'helpers.createReadStream',
-	// "helpers.getStoragePath"
-	'helpers.writeContentToFile',
+
+	// prepareBinaryData(binaryData: Buffer, fileName?: string, mimeType?: string): Promise<IBinaryData>
 	'helpers.prepareBinaryData',
+
+	// setBinaryDataBuffer(metadata: IBinaryData, buffer: Buffer): Promise<IBinaryData>
 	'helpers.setBinaryDataBuffer',
+
+	// binaryToString(body: Buffer, encoding?: string): string
+	'helpers.binaryToString',
+
+	// httpRequest(opts: IHttpRequestOptions): Promise<IN8nHttpFullResponse | IN8nHttpResponse>
+	'helpers.httpRequest',
+];
+
+/** Helpers that exist but that we are not exposing to the Code Node */
+export const UNSUPPORTED_HELPER_FUNCTIONS = [
+	// These rely on checking the credentials from the current node type (Code Node)
+	// and hence they can't even work (Code Node doesn't have credentials)
+	'helpers.httpRequestWithAuthentication',
+	'helpers.requestWithAuthenticationPaginated',
+
+	// This has been removed
 	'helpers.copyBinaryFile',
-	'helpers.binaryToBuffer',
-	// "helpers.binaryToString"
-	// "helpers.getBinaryPath"
+
+	// We can't support streams over RPC without implementing it ourselves
+	'helpers.createReadStream',
 	'helpers.getBinaryStream',
+
+	// Makes no sense to support this, as it returns either a stream or a buffer
+	// and we can't support streams over RPC
+	'helpers.binaryToBuffer',
+
+	// These are pretty low-level, so we shouldn't expose them
+	// (require binary data id, which we don't expose)
 	'helpers.getBinaryMetadata',
+	'helpers.getStoragePath',
+	'helpers.getBinaryPath',
+
+	// We shouldn't allow arbitrary FS writes
+	'helpers.writeContentToFile',
+
+	// Not something we need to expose. Can be done in the node itself
+	// copyInputItems(items: INodeExecutionData[], properties: string[]): IDataObject[]
+	'helpers.copyInputItems',
+
+	// Code Node does these automatically already
+	'helpers.returnJsonArray',
+	'helpers.normalizeItems',
+
+	// The client is instantiated and lives on the n8n instance, so we can't
+	// expose it over RPC without implementing object marshalling
+	'helpers.getSSHClient',
+
+	// Doesn't make sense to expose
 	'helpers.createDeferredPromise',
-	'helpers.httpRequest',
-	'logNodeOutput',
-] as const;
+	'helpers.constructExecutionMetaData',
+];
+
+/** List of all RPC methods that task runner supports */
+export const AVAILABLE_RPC_METHODS = [...EXPOSED_RPC_METHODS, 'logNodeOutput'] as const;
 
 /** Node types needed for the runner to execute a task. */
 export type NeededNodeType = { name: string; version: number };
diff --git a/packages/@n8n/task-runner/src/start.ts b/packages/@n8n/task-runner/src/start.ts
index f68779f38d135..391b6ba156c66 100644
--- a/packages/@n8n/task-runner/src/start.ts
+++ b/packages/@n8n/task-runner/src/start.ts
@@ -1,17 +1,18 @@
+import './polyfills';
+import type { ErrorReporter } from 'n8n-core';
 import { ensureError, setGlobalState } from 'n8n-workflow';
 import Container from 'typedi';
 
 import { MainConfig } from './config/main-config';
-import type { ErrorReporter } from './error-reporter';
-import type { HealthcheckServer } from './healthcheck-server';
+import type { HealthCheckServer } from './health-check-server';
 import { JsTaskRunner } from './js-task-runner/js-task-runner';
 
-let healthcheckServer: HealthcheckServer | undefined;
+let healthCheckServer: HealthCheckServer | undefined;
 let runner: JsTaskRunner | undefined;
 let isShuttingDown = false;
 let errorReporter: ErrorReporter | undefined;
 
-function createSignalHandler(signal: string) {
+function createSignalHandler(signal: string, timeoutInS = 10) {
 	return async function onSignal() {
 		if (isShuttingDown) {
 			return;
@@ -19,16 +20,21 @@ function createSignalHandler(signal: string) {
 
 		console.log(`Received ${signal} signal, shutting down...`);
 
+		setTimeout(() => {
+			console.error('Shutdown timeout reached, forcing shutdown...');
+			process.exit(1);
+		}, timeoutInS * 1000).unref();
+
 		isShuttingDown = true;
 		try {
 			if (runner) {
 				await runner.stop();
 				runner = undefined;
-				void healthcheckServer?.stop();
+				void healthCheckServer?.stop();
 			}
 
 			if (errorReporter) {
-				await errorReporter.stop();
+				await errorReporter.shutdown();
 				errorReporter = undefined;
 			}
 		} catch (e) {
@@ -49,22 +55,23 @@ void (async function start() {
 	});
 
 	if (config.sentryConfig.sentryDsn) {
-		const { ErrorReporter } = await import('@/error-reporter');
-		errorReporter = new ErrorReporter(config.sentryConfig);
-		await errorReporter.start();
+		const { ErrorReporter } = await import('n8n-core');
+		errorReporter = new ErrorReporter();
+		await errorReporter.init('task_runner', config.sentryConfig.sentryDsn);
 	}
 
 	runner = new JsTaskRunner(config);
 	runner.on('runner:reached-idle-timeout', () => {
-		void createSignalHandler('IDLE_TIMEOUT')();
+		// Use shorter timeout since we know we don't have any tasks running
+		void createSignalHandler('IDLE_TIMEOUT', 1)();
 	});
 
 	const { enabled, host, port } = config.baseRunnerConfig.healthcheckServer;
 
 	if (enabled) {
-		const { HealthcheckServer } = await import('./healthcheck-server');
-		healthcheckServer = new HealthcheckServer();
-		await healthcheckServer.start(host, port);
+		const { HealthCheckServer } = await import('./health-check-server');
+		healthCheckServer = new HealthCheckServer();
+		await healthCheckServer.start(host, port);
 	}
 
 	process.on('SIGINT', createSignalHandler('SIGINT'));
diff --git a/packages/@n8n/task-runner/src/task-runner.ts b/packages/@n8n/task-runner/src/task-runner.ts
index f0af115b5a792..4254aad99c29f 100644
--- a/packages/@n8n/task-runner/src/task-runner.ts
+++ b/packages/@n8n/task-runner/src/task-runner.ts
@@ -1,3 +1,4 @@
+import { isSerializedBuffer, toBuffer } from 'n8n-core';
 import { ApplicationError, ensureError, randomInt } from 'n8n-workflow';
 import { nanoid } from 'nanoid';
 import { EventEmitter } from 'node:events';
@@ -6,7 +7,9 @@ import { type MessageEvent, WebSocket } from 'ws';
 import type { BaseRunnerConfig } from '@/config/base-runner-config';
 import type { BrokerMessage, RunnerMessage } from '@/message-types';
 import { TaskRunnerNodeTypes } from '@/node-types';
-import { RPC_ALLOW_LIST, type TaskResultData } from '@/runner-types';
+import type { TaskResultData } from '@/runner-types';
+
+import { TaskCancelledError } from './js-task-runner/errors/task-cancelled-error';
 
 export interface Task<T = unknown> {
 	taskId: string;
@@ -21,12 +24,14 @@ export interface TaskOffer {
 }
 
 interface DataRequest {
+	taskId: string;
 	requestId: string;
 	resolve: (data: unknown) => void;
 	reject: (error: unknown) => void;
 }
 
 interface NodeTypesRequest {
+	taskId: string;
 	requestId: string;
 	resolve: (data: unknown) => void;
 	reject: (error: unknown) => void;
@@ -38,10 +43,6 @@ interface RPCCall {
 	reject: (error: unknown) => void;
 }
 
-export interface RPCCallObject {
-	[name: string]: ((...args: unknown[]) => Promise<unknown>) | RPCCallObject;
-}
-
 const OFFER_VALID_TIME_MS = 5000;
 const OFFER_VALID_EXTRA_MS = 100;
 
@@ -82,14 +83,20 @@ export abstract class TaskRunner extends EventEmitter {
 
 	private idleTimer: NodeJS.Timeout | undefined;
 
+	/** How long (in seconds) a task is allowed to take for completion, else the task will be aborted. */
+	protected readonly taskTimeout: number;
+
 	/** How long (in seconds) a runner may be idle for before exit. */
 	private readonly idleTimeout: number;
 
+	protected taskCancellations = new Map<Task['taskId'], AbortController>();
+
 	constructor(opts: TaskRunnerOpts) {
 		super();
 		this.taskType = opts.taskType;
 		this.name = opts.name ?? 'Node.js Task Runner SDK';
 		this.maxConcurrency = opts.maxConcurrency;
+		this.taskTimeout = opts.taskTimeout;
 		this.idleTimeout = opts.idleTimeout;
 
 		const { host: taskBrokerHost } = new URL(opts.taskBrokerUri);
@@ -210,7 +217,7 @@ export abstract class TaskRunner extends EventEmitter {
 				this.offerAccepted(message.offerId, message.taskId);
 				break;
 			case 'broker:taskcancel':
-				this.taskCancelled(message.taskId);
+				this.taskCancelled(message.taskId, message.reason);
 				break;
 			case 'broker:tasksettings':
 				void this.receivedSettings(message.taskId, message.settings);
@@ -285,17 +292,35 @@ export abstract class TaskRunner extends EventEmitter {
 		});
 	}
 
-	taskCancelled(taskId: string) {
+	taskCancelled(taskId: string, reason: string) {
 		const task = this.runningTasks.get(taskId);
 		if (!task) {
 			return;
 		}
 		task.cancelled = true;
-		if (task.active) {
-			// TODO
-		} else {
-			this.runningTasks.delete(taskId);
+
+		for (const [requestId, request] of this.dataRequests.entries()) {
+			if (request.taskId === taskId) {
+				request.reject(new TaskCancelledError(reason));
+				this.dataRequests.delete(requestId);
+			}
 		}
+
+		for (const [requestId, request] of this.nodeTypesRequests.entries()) {
+			if (request.taskId === taskId) {
+				request.reject(new TaskCancelledError(reason));
+				this.nodeTypesRequests.delete(requestId);
+			}
+		}
+
+		const controller = this.taskCancellations.get(taskId);
+		if (controller) {
+			controller.abort();
+			this.taskCancellations.delete(taskId);
+		}
+
+		if (!task.active) this.runningTasks.delete(taskId);
+
 		this.sendOffers();
 	}
 
@@ -328,20 +353,33 @@ export abstract class TaskRunner extends EventEmitter {
 			this.runningTasks.delete(taskId);
 			return;
 		}
+
+		const controller = new AbortController();
+		this.taskCancellations.set(taskId, controller);
+
+		const taskTimeout = setTimeout(() => {
+			if (!task.cancelled) {
+				controller.abort();
+				this.taskCancellations.delete(taskId);
+			}
+		}, this.taskTimeout * 1_000);
+
 		task.settings = settings;
 		task.active = true;
 		try {
-			const data = await this.executeTask(task);
+			const data = await this.executeTask(task, controller.signal);
 			this.taskDone(taskId, data);
 		} catch (error) {
-			this.taskErrored(taskId, error);
+			if (!task.cancelled) this.taskErrored(taskId, error);
 		} finally {
+			clearTimeout(taskTimeout);
+			this.taskCancellations.delete(taskId);
 			this.resetIdleTimer();
 		}
 	}
 
 	// eslint-disable-next-line @typescript-eslint/naming-convention
-	async executeTask(_task: Task): Promise<TaskResultData> {
+	async executeTask(_task: Task, _signal: AbortSignal): Promise<TaskResultData> {
 		throw new ApplicationError('Unimplemented');
 	}
 
@@ -354,6 +392,7 @@ export abstract class TaskRunner extends EventEmitter {
 		const nodeTypesPromise = new Promise<T>((resolve, reject) => {
 			this.nodeTypesRequests.set(requestId, {
 				requestId,
+				taskId,
 				resolve: resolve as (data: unknown) => void,
 				reject,
 			});
@@ -382,6 +421,7 @@ export abstract class TaskRunner extends EventEmitter {
 		const p = new Promise<T>((resolve, reject) => {
 			this.dataRequests.set(requestId, {
 				requestId,
+				taskId,
 				resolve: resolve as (data: unknown) => void,
 				reject,
 			});
@@ -421,7 +461,9 @@ export abstract class TaskRunner extends EventEmitter {
 		});
 
 		try {
-			return await dataPromise;
+			const returnValue = await dataPromise;
+
+			return isSerializedBuffer(returnValue) ? toBuffer(returnValue) : returnValue;
 		} finally {
 			this.rpcCalls.delete(callId);
 		}
@@ -443,24 +485,6 @@ export abstract class TaskRunner extends EventEmitter {
 		}
 	}
 
-	buildRpcCallObject(taskId: string) {
-		const rpcObject: RPCCallObject = {};
-		for (const r of RPC_ALLOW_LIST) {
-			const splitPath = r.split('.');
-			let obj = rpcObject;
-
-			splitPath.forEach((s, index) => {
-				if (index !== splitPath.length - 1) {
-					obj[s] = {};
-					obj = obj[s];
-					return;
-				}
-				obj[s] = async (...args: unknown[]) => await this.makeRpcCall(taskId, r, args);
-			});
-		}
-		return rpcObject;
-	}
-
 	/** Close the connection gracefully and wait until has been closed */
 	async stop() {
 		this.clearIdleTimer();
diff --git a/packages/@n8n_io/eslint-config/base.js b/packages/@n8n_io/eslint-config/base.js
index 629749289a6d5..0864a20a7b786 100644
--- a/packages/@n8n_io/eslint-config/base.js
+++ b/packages/@n8n_io/eslint-config/base.js
@@ -316,6 +316,11 @@ const config = (module.exports = {
 		 */
 		'@typescript-eslint/return-await': ['error', 'always'],
 
+		/**
+		 * https://typescript-eslint.io/rules/explicit-member-accessibility/
+		 */
+		'@typescript-eslint/explicit-member-accessibility': ['error', { accessibility: 'no-public' }],
+
 		// ----------------------------------
 		//       eslint-plugin-import
 		// ----------------------------------
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 87f0c65122733..8e9ff0f7ca483 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "1.71.0",
+  "version": "1.73.0",
   "description": "n8n Workflow Automation Tool",
   "main": "dist/index",
   "types": "dist/index.d.ts",
@@ -98,7 +98,6 @@
     "@n8n_io/license-sdk": "2.13.1",
     "@oclif/core": "4.0.7",
     "@rudderstack/rudder-sdk-node": "2.0.9",
-    "@sentry/integrations": "catalog:",
     "@sentry/node": "catalog:",
     "aws4": "1.11.0",
     "axios": "catalog:",
diff --git a/packages/cli/src/__tests__/active-workflow-manager.test.ts b/packages/cli/src/__tests__/active-workflow-manager.test.ts
new file mode 100644
index 0000000000000..a167f1e5a5cf7
--- /dev/null
+++ b/packages/cli/src/__tests__/active-workflow-manager.test.ts
@@ -0,0 +1,125 @@
+import { mock } from 'jest-mock-extended';
+import type { InstanceSettings } from 'n8n-core';
+import type {
+	WorkflowParameters,
+	INode,
+	INodeType,
+	INodeTypeDescription,
+	WorkflowActivateMode,
+} from 'n8n-workflow';
+import { Workflow } from 'n8n-workflow';
+
+import { ActiveWorkflowManager } from '@/active-workflow-manager';
+import type { NodeTypes } from '@/node-types';
+
+describe('ActiveWorkflowManager', () => {
+	let activeWorkflowManager: ActiveWorkflowManager;
+	const instanceSettings = mock<InstanceSettings>();
+	const nodeTypes = mock<NodeTypes>();
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		activeWorkflowManager = new ActiveWorkflowManager(
+			mock(),
+			mock(),
+			mock(),
+			mock(),
+			mock(),
+			nodeTypes,
+			mock(),
+			mock(),
+			mock(),
+			mock(),
+			mock(),
+			mock(),
+			mock(),
+			mock(),
+			instanceSettings,
+			mock(),
+		);
+	});
+
+	describe('checkIfWorkflowCanBeActivated', () => {
+		const disabledNode = mock<INode>({ type: 'triggerNode', disabled: true });
+		const unknownNode = mock<INode>({ type: 'unknownNode' });
+		const noTriggersNode = mock<INode>({ type: 'noTriggersNode' });
+		const pollNode = mock<INode>({ type: 'pollNode' });
+		const triggerNode = mock<INode>({ type: 'triggerNode' });
+		const webhookNode = mock<INode>({ type: 'webhookNode' });
+
+		nodeTypes.getByNameAndVersion.mockImplementation((type) => {
+			// TODO: getByNameAndVersion signature needs to be updated to allow returning undefined
+			if (type === 'unknownNode') return undefined as unknown as INodeType;
+			const partial: Partial<INodeType> = {
+				poll: undefined,
+				trigger: undefined,
+				webhook: undefined,
+				description: mock<INodeTypeDescription>({
+					properties: [],
+				}),
+			};
+			if (type === 'pollNode') partial.poll = jest.fn();
+			if (type === 'triggerNode') partial.trigger = jest.fn();
+			if (type === 'webhookNode') partial.webhook = jest.fn();
+			return mock(partial);
+		});
+
+		test.each([
+			['should skip disabled nodes', disabledNode, [], false],
+			['should skip nodes marked as ignored', triggerNode, ['triggerNode'], false],
+			['should skip unknown nodes', unknownNode, [], false],
+			['should skip nodes with no trigger method', noTriggersNode, [], false],
+			['should activate if poll method exists', pollNode, [], true],
+			['should activate if trigger method exists', triggerNode, [], true],
+			['should activate if webhook method exists', webhookNode, [], true],
+		])('%s', async (_, node, ignoredNodes, expected) => {
+			const workflow = new Workflow(mock<WorkflowParameters>({ nodeTypes, nodes: [node] }));
+			const canBeActivated = activeWorkflowManager.checkIfWorkflowCanBeActivated(
+				workflow,
+				ignoredNodes,
+			);
+			expect(canBeActivated).toBe(expected);
+		});
+	});
+
+	describe('shouldAddWebhooks', () => {
+		describe('if leader', () => {
+			beforeAll(() => {
+				Object.assign(instanceSettings, { isLeader: true, isFollower: false });
+			});
+
+			test('should return `true` for `init`', () => {
+				// ensure webhooks are populated on init: https://github.com/n8n-io/n8n/pull/8830
+				const result = activeWorkflowManager.shouldAddWebhooks('init');
+				expect(result).toBe(true);
+			});
+
+			test('should return `false` for `leadershipChange`', () => {
+				const result = activeWorkflowManager.shouldAddWebhooks('leadershipChange');
+				expect(result).toBe(false);
+			});
+
+			test('should return `true` for `update` or `activate`', () => {
+				const modes = ['update', 'activate'] as WorkflowActivateMode[];
+				for (const mode of modes) {
+					const result = activeWorkflowManager.shouldAddWebhooks(mode);
+					expect(result).toBe(true);
+				}
+			});
+		});
+
+		describe('if follower', () => {
+			beforeAll(() => {
+				Object.assign(instanceSettings, { isLeader: false, isFollower: true });
+			});
+
+			test('should return `false` for `update` or `activate`', () => {
+				const modes = ['update', 'activate'] as WorkflowActivateMode[];
+				for (const mode of modes) {
+					const result = activeWorkflowManager.shouldAddWebhooks(mode);
+					expect(result).toBe(false);
+				}
+			});
+		});
+	});
+});
diff --git a/packages/cli/src/__tests__/credential-types.test.ts b/packages/cli/src/__tests__/credential-types.test.ts
index 0ccb5ab771838..82780d114cac4 100644
--- a/packages/cli/src/__tests__/credential-types.test.ts
+++ b/packages/cli/src/__tests__/credential-types.test.ts
@@ -1,41 +1,121 @@
-import { Container } from 'typedi';
+import { mock } from 'jest-mock-extended';
+import { UnrecognizedCredentialTypeError } from 'n8n-core';
+import type { ICredentialType, LoadedClass } from 'n8n-workflow';
 
 import { CredentialTypes } from '@/credential-types';
-import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
-import { mockInstance } from '@test/mocking';
+import type { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
 
 describe('CredentialTypes', () => {
-	const mockNodesAndCredentials = mockInstance(LoadNodesAndCredentials, {
-		loadedCredentials: {
-			fakeFirstCredential: {
-				type: {
-					name: 'fakeFirstCredential',
-					displayName: 'Fake First Credential',
-					properties: [],
-				},
-				sourcePath: '',
-			},
-			fakeSecondCredential: {
-				type: {
-					name: 'fakeSecondCredential',
-					displayName: 'Fake Second Credential',
-					properties: [],
-				},
-				sourcePath: '',
-			},
-		},
+	const loadNodesAndCredentials = mock<LoadNodesAndCredentials>();
+
+	const credentialTypes = new CredentialTypes(loadNodesAndCredentials);
+
+	const testCredential: LoadedClass<ICredentialType> = {
+		sourcePath: '',
+		type: mock(),
+	};
+
+	loadNodesAndCredentials.getCredential.mockImplementation((credentialType) => {
+		if (credentialType === 'testCredential') return testCredential;
+		throw new UnrecognizedCredentialTypeError(credentialType);
+	});
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	describe('getByName', () => {
+		test('Should throw error when calling invalid credential name', () => {
+			expect(() => credentialTypes.getByName('unknownCredential')).toThrowError('c');
+		});
+
+		test('Should return correct credential type for valid name', () => {
+			expect(credentialTypes.getByName('testCredential')).toStrictEqual(testCredential.type);
+		});
+	});
+
+	describe('recognizes', () => {
+		test('Should recognize credential type that exists in knownCredentials', () => {
+			const credentialTypes = new CredentialTypes(
+				mock<LoadNodesAndCredentials>({
+					loadedCredentials: {},
+					knownCredentials: { testCredential: mock({ supportedNodes: [] }) },
+				}),
+			);
+
+			expect(credentialTypes.recognizes('testCredential')).toBe(true);
+		});
+
+		test('Should recognize credential type that exists in loadedCredentials', () => {
+			const credentialTypes = new CredentialTypes(
+				mock<LoadNodesAndCredentials>({
+					loadedCredentials: { testCredential },
+					knownCredentials: {},
+				}),
+			);
+
+			expect(credentialTypes.recognizes('testCredential')).toBe(true);
+		});
+
+		test('Should not recognize unknown credential type', () => {
+			expect(credentialTypes.recognizes('unknownCredential')).toBe(false);
+		});
 	});
 
-	const credentialTypes = Container.get(CredentialTypes);
+	describe('getSupportedNodes', () => {
+		test('Should return supported nodes for known credential type', () => {
+			const supportedNodes = ['node1', 'node2'];
+			const credentialTypes = new CredentialTypes(
+				mock<LoadNodesAndCredentials>({
+					knownCredentials: { testCredential: mock({ supportedNodes }) },
+				}),
+			);
+
+			expect(credentialTypes.getSupportedNodes('testCredential')).toEqual(supportedNodes);
+		});
 
-	test('Should throw error when calling invalid credential name', () => {
-		expect(() => credentialTypes.getByName('fakeThirdCredential')).toThrowError();
+		test('Should return empty array for unknown credential type supported nodes', () => {
+			expect(credentialTypes.getSupportedNodes('unknownCredential')).toBeEmptyArray();
+		});
 	});
 
-	test('Should return correct credential type for valid name', () => {
-		const mockedCredentialTypes = mockNodesAndCredentials.loadedCredentials;
-		expect(credentialTypes.getByName('fakeFirstCredential')).toStrictEqual(
-			mockedCredentialTypes.fakeFirstCredential.type,
-		);
+	describe('getParentTypes', () => {
+		test('Should return parent types for credential type with extends', () => {
+			const credentialTypes = new CredentialTypes(
+				mock<LoadNodesAndCredentials>({
+					knownCredentials: {
+						childType: { extends: ['parentType1', 'parentType2'] },
+						parentType1: { extends: ['grandparentType'] },
+						parentType2: { extends: [] },
+						grandparentType: { extends: [] },
+					},
+				}),
+			);
+
+			const parentTypes = credentialTypes.getParentTypes('childType');
+			expect(parentTypes).toContain('parentType1');
+			expect(parentTypes).toContain('parentType2');
+			expect(parentTypes).toContain('grandparentType');
+		});
+
+		test('Should return empty array for credential type without extends', () => {
+			const credentialTypes = new CredentialTypes(
+				mock<LoadNodesAndCredentials>({
+					knownCredentials: { testCredential: { extends: [] } },
+				}),
+			);
+
+			expect(credentialTypes.getParentTypes('testCredential')).toBeEmptyArray();
+		});
+
+		test('Should return empty array for unknown credential type parent types', () => {
+			const credentialTypes = new CredentialTypes(
+				mock<LoadNodesAndCredentials>({
+					knownCredentials: {},
+				}),
+			);
+
+			expect(credentialTypes.getParentTypes('unknownCredential')).toBeEmptyArray();
+		});
 	});
 });
diff --git a/packages/cli/src/__tests__/credentials-helper.test.ts b/packages/cli/src/__tests__/credentials-helper.test.ts
index 62cab968e4570..7deffcd2295e1 100644
--- a/packages/cli/src/__tests__/credentials-helper.test.ts
+++ b/packages/cli/src/__tests__/credentials-helper.test.ts
@@ -1,3 +1,4 @@
+import { mock } from 'jest-mock-extended';
 import type {
 	IAuthenticateGeneric,
 	ICredentialDataDecryptedObject,
@@ -5,59 +6,25 @@ import type {
 	IHttpRequestOptions,
 	INode,
 	INodeProperties,
+	INodeTypes,
 } from 'n8n-workflow';
-import { NodeConnectionType, deepCopy } from 'n8n-workflow';
-import { Workflow } from 'n8n-workflow';
-import Container from 'typedi';
+import { deepCopy, Workflow } from 'n8n-workflow';
 
+import { CredentialTypes } from '@/credential-types';
 import { CredentialsHelper } from '@/credentials-helper';
-import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
-import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
-import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
-import { NodeTypes } from '@/node-types';
-import { mockInstance } from '@test/mocking';
+import type { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
 
 describe('CredentialsHelper', () => {
-	mockInstance(CredentialsRepository);
-	mockInstance(SharedCredentialsRepository);
-	const mockNodesAndCredentials = mockInstance(LoadNodesAndCredentials, {
-		loadedNodes: {
-			'test.set': {
-				sourcePath: '',
-				type: {
-					description: {
-						displayName: 'Set',
-						name: 'set',
-						group: ['input'],
-						version: 1,
-						description: 'Sets a value',
-						defaults: {
-							name: 'Set',
-							color: '#0000FF',
-						},
-						inputs: [NodeConnectionType.Main],
-						outputs: [NodeConnectionType.Main],
-						properties: [
-							{
-								displayName: 'Value1',
-								name: 'value1',
-								type: 'string',
-								default: 'default-value1',
-							},
-							{
-								displayName: 'Value2',
-								name: 'value2',
-								type: 'string',
-								default: 'default-value2',
-							},
-						],
-					},
-				},
-			},
-		},
-	});
+	const nodeTypes = mock<INodeTypes>();
+	const mockNodesAndCredentials = mock<LoadNodesAndCredentials>();
 
-	const nodeTypes = mockInstance(NodeTypes);
+	const credentialsHelper = new CredentialsHelper(
+		new CredentialTypes(mockNodesAndCredentials),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+	);
 
 	describe('authenticate', () => {
 		const tests: Array<{
@@ -272,19 +239,16 @@ describe('CredentialsHelper', () => {
 
 		for (const testData of tests) {
 			test(testData.description, async () => {
-				//@ts-expect-error `loadedCredentials` is a getter and we are replacing it here with a property
-				mockNodesAndCredentials.loadedCredentials = {
-					[testData.input.credentialType.name]: {
-						type: testData.input.credentialType,
-						sourcePath: '',
-					},
-				};
+				const { credentialType } = testData.input;
 
-				const credentialsHelper = Container.get(CredentialsHelper);
+				mockNodesAndCredentials.getCredential.calledWith(credentialType.name).mockReturnValue({
+					type: credentialType,
+					sourcePath: '',
+				});
 
 				const result = await credentialsHelper.authenticate(
 					testData.input.credentials,
-					testData.input.credentialType.name,
+					credentialType.name,
 					deepCopy(incomingRequestOptions),
 					workflow,
 					node,
diff --git a/packages/cli/src/__tests__/error-reporting.test.ts b/packages/cli/src/__tests__/error-reporting.test.ts
deleted file mode 100644
index 5e472b8b99c12..0000000000000
--- a/packages/cli/src/__tests__/error-reporting.test.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { GlobalConfig } from '@n8n/config';
-import type { ClientOptions, ErrorEvent } from '@sentry/types';
-import { strict as assert } from 'node:assert';
-import { Container } from 'typedi';
-
-import { InternalServerError } from '@/errors/response-errors/internal-server.error';
-
-const init = jest.fn();
-
-jest.mock('@sentry/integrations');
-jest.mock('@sentry/node', () => ({
-	init,
-	setTag: jest.fn(),
-	captureException: jest.fn(),
-	Integrations: {},
-}));
-
-jest.spyOn(process, 'on');
-
-describe('initErrorHandling', () => {
-	let beforeSend: ClientOptions['beforeSend'];
-
-	beforeAll(async () => {
-		Container.get(GlobalConfig).sentry.backendDsn = 'backend-dsn';
-		const errorReporting = require('@/error-reporting');
-		await errorReporting.initErrorHandling();
-		const options = (init.mock.calls[0] as [ClientOptions])[0];
-		beforeSend = options.beforeSend;
-	});
-
-	it('ignores errors with level warning', async () => {
-		const originalException = new InternalServerError('test');
-		originalException.level = 'warning';
-
-		const event = {} as ErrorEvent;
-
-		assert(beforeSend);
-		expect(await beforeSend(event, { originalException })).toEqual(null);
-	});
-
-	it('keeps events with a cause with error level', async () => {
-		const cause = new Error('cause-error');
-
-		const originalException = new InternalServerError('test', cause);
-		const event = {} as ErrorEvent;
-
-		assert(beforeSend);
-		expect(await beforeSend(event, { originalException })).toEqual(event);
-	});
-
-	it('ignores events with error cause with warning level', async () => {
-		const cause: Error & { level?: 'warning' } = new Error('cause-error');
-		cause.level = 'warning';
-
-		const originalException = new InternalServerError('test', cause);
-		const event = {} as ErrorEvent;
-
-		assert(beforeSend);
-		expect(await beforeSend(event, { originalException })).toEqual(null);
-	});
-});
diff --git a/packages/cli/src/__tests__/license.test.ts b/packages/cli/src/__tests__/license.test.ts
index d33d7c37cff48..aa0aba1d5380d 100644
--- a/packages/cli/src/__tests__/license.test.ts
+++ b/packages/cli/src/__tests__/license.test.ts
@@ -38,7 +38,7 @@ describe('License', () => {
 			license: licenseConfig,
 			multiMainSetup: { enabled: false },
 		});
-		license = new License(mockLogger(), instanceSettings, mock(), mock(), mock(), globalConfig);
+		license = new License(mockLogger(), instanceSettings, mock(), mock(), globalConfig);
 		await license.init();
 	});
 
@@ -70,7 +70,6 @@ describe('License', () => {
 			mock<InstanceSettings>({ instanceType: 'worker' }),
 			mock(),
 			mock(),
-			mock(),
 			mock<GlobalConfig>({ license: licenseConfig }),
 		);
 		await license.init();
@@ -211,7 +210,6 @@ describe('License', () => {
 						mock<InstanceSettings>({ instanceType: 'main' }),
 						mock(),
 						mock(),
-						mock(),
 						globalConfig,
 					).init();
 
@@ -229,7 +227,6 @@ describe('License', () => {
 						mock(),
 						mock(),
 						mock(),
-						mock(),
 					).init();
 
 					expect(LicenseManager).toHaveBeenCalledWith(
@@ -250,7 +247,7 @@ describe('License', () => {
 						});
 						config.set('multiMainSetup.instanceType', status);
 
-						await new License(mockLogger(), mock(), mock(), mock(), mock(), globalConfig).init();
+						await new License(mockLogger(), mock(), mock(), mock(), globalConfig).init();
 
 						expect(LicenseManager).toHaveBeenCalledWith(
 							expect.objectContaining({ autoRenewEnabled: false, renewOnInit: false }),
@@ -267,7 +264,7 @@ describe('License', () => {
 					});
 					config.set('multiMainSetup.instanceType', status);
 
-					await new License(mockLogger(), mock(), mock(), mock(), mock(), globalConfig).init();
+					await new License(mockLogger(), mock(), mock(), mock(), globalConfig).init();
 
 					expect(LicenseManager).toHaveBeenCalledWith(
 						expect.objectContaining({ autoRenewEnabled: false, renewOnInit: false }),
@@ -281,7 +278,7 @@ describe('License', () => {
 					});
 					config.set('multiMainSetup.instanceType', 'leader');
 
-					await new License(mockLogger(), mock(), mock(), mock(), mock(), globalConfig).init();
+					await new License(mockLogger(), mock(), mock(), mock(), globalConfig).init();
 
 					expect(LicenseManager).toHaveBeenCalledWith(
 						expect.objectContaining({ autoRenewEnabled: true, renewOnInit: true }),
@@ -293,7 +290,7 @@ describe('License', () => {
 
 	describe('reinit', () => {
 		it('should reinitialize license manager', async () => {
-			const license = new License(mockLogger(), mock(), mock(), mock(), mock(), mock());
+			const license = new License(mockLogger(), mock(), mock(), mock(), mock());
 			await license.init();
 
 			const initSpy = jest.spyOn(license, 'init');
diff --git a/packages/cli/src/__tests__/load-nodes-and-credentials.test.ts b/packages/cli/src/__tests__/load-nodes-and-credentials.test.ts
index bcf485445fea5..75aa6023019c6 100644
--- a/packages/cli/src/__tests__/load-nodes-and-credentials.test.ts
+++ b/packages/cli/src/__tests__/load-nodes-and-credentials.test.ts
@@ -1,5 +1,7 @@
 import { mock } from 'jest-mock-extended';
 import type { DirectoryLoader } from 'n8n-core';
+import type { INodeProperties, INodeTypeDescription } from 'n8n-workflow';
+import { NodeConnectionType } from 'n8n-workflow';
 
 import { LoadNodesAndCredentials } from '../load-nodes-and-credentials';
 
@@ -8,7 +10,7 @@ describe('LoadNodesAndCredentials', () => {
 		let instance: LoadNodesAndCredentials;
 
 		beforeEach(() => {
-			instance = new LoadNodesAndCredentials(mock(), mock(), mock());
+			instance = new LoadNodesAndCredentials(mock(), mock(), mock(), mock());
 			instance.loaders.package1 = mock<DirectoryLoader>({
 				directory: '/icons/package1',
 			});
@@ -34,4 +36,179 @@ describe('LoadNodesAndCredentials', () => {
 			expect(result).toBeUndefined();
 		});
 	});
+
+	describe('convertNodeToAiTool', () => {
+		const instance = new LoadNodesAndCredentials(mock(), mock(), mock(), mock());
+
+		let fullNodeWrapper: { description: INodeTypeDescription };
+
+		beforeEach(() => {
+			fullNodeWrapper = {
+				description: {
+					displayName: 'Test Node',
+					name: 'testNode',
+					group: ['test'],
+					description: 'A test node',
+					version: 1,
+					defaults: {},
+					inputs: [NodeConnectionType.Main],
+					outputs: [NodeConnectionType.Main],
+					properties: [],
+				},
+			};
+		});
+
+		it('should modify the name and displayName correctly', () => {
+			const result = instance.convertNodeToAiTool(fullNodeWrapper);
+			expect(result.description.name).toBe('testNodeTool');
+			expect(result.description.displayName).toBe('Test Node Tool');
+		});
+
+		it('should update inputs and outputs', () => {
+			const result = instance.convertNodeToAiTool(fullNodeWrapper);
+			expect(result.description.inputs).toEqual([]);
+			expect(result.description.outputs).toEqual([NodeConnectionType.AiTool]);
+		});
+
+		it('should remove the usableAsTool property', () => {
+			fullNodeWrapper.description.usableAsTool = true;
+			const result = instance.convertNodeToAiTool(fullNodeWrapper);
+			expect(result.description.usableAsTool).toBeUndefined();
+		});
+
+		it("should add toolDescription property if it doesn't exist", () => {
+			const result = instance.convertNodeToAiTool(fullNodeWrapper);
+			const toolDescriptionProp = result.description.properties.find(
+				(prop) => prop.name === 'toolDescription',
+			);
+			expect(toolDescriptionProp).toBeDefined();
+			expect(toolDescriptionProp?.type).toBe('string');
+			expect(toolDescriptionProp?.default).toBe(fullNodeWrapper.description.description);
+		});
+
+		it('should set codex categories correctly', () => {
+			const result = instance.convertNodeToAiTool(fullNodeWrapper);
+			expect(result.description.codex).toEqual({
+				categories: ['AI'],
+				subcategories: {
+					AI: ['Tools'],
+					Tools: ['Other Tools'],
+				},
+				resources: {},
+			});
+		});
+
+		it('should preserve existing properties', () => {
+			const existingProp: INodeProperties = {
+				displayName: 'Existing Prop',
+				name: 'existingProp',
+				type: 'string',
+				default: 'test',
+			};
+			fullNodeWrapper.description.properties = [existingProp];
+			const result = instance.convertNodeToAiTool(fullNodeWrapper);
+			expect(result.description.properties).toHaveLength(3); // Existing prop + toolDescription + notice
+			expect(result.description.properties).toContainEqual(existingProp);
+		});
+
+		it('should handle nodes with resource property', () => {
+			const resourceProp: INodeProperties = {
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [{ name: 'User', value: 'user' }],
+				default: 'user',
+			};
+			fullNodeWrapper.description.properties = [resourceProp];
+			const result = instance.convertNodeToAiTool(fullNodeWrapper);
+			expect(result.description.properties[1].name).toBe('descriptionType');
+			expect(result.description.properties[2].name).toBe('toolDescription');
+			expect(result.description.properties[3]).toEqual(resourceProp);
+		});
+
+		it('should handle nodes with operation property', () => {
+			const operationProp: INodeProperties = {
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'options',
+				options: [{ name: 'Create', value: 'create' }],
+				default: 'create',
+			};
+			fullNodeWrapper.description.properties = [operationProp];
+			const result = instance.convertNodeToAiTool(fullNodeWrapper);
+			expect(result.description.properties[1].name).toBe('descriptionType');
+			expect(result.description.properties[2].name).toBe('toolDescription');
+			expect(result.description.properties[3]).toEqual(operationProp);
+		});
+
+		it('should handle nodes with both resource and operation properties', () => {
+			const resourceProp: INodeProperties = {
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [{ name: 'User', value: 'user' }],
+				default: 'user',
+			};
+			const operationProp: INodeProperties = {
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'options',
+				options: [{ name: 'Create', value: 'create' }],
+				default: 'create',
+			};
+			fullNodeWrapper.description.properties = [resourceProp, operationProp];
+			const result = instance.convertNodeToAiTool(fullNodeWrapper);
+			expect(result.description.properties[1].name).toBe('descriptionType');
+			expect(result.description.properties[2].name).toBe('toolDescription');
+			expect(result.description.properties[3]).toEqual(resourceProp);
+			expect(result.description.properties[4]).toEqual(operationProp);
+		});
+
+		it('should handle nodes with empty properties', () => {
+			fullNodeWrapper.description.properties = [];
+			const result = instance.convertNodeToAiTool(fullNodeWrapper);
+			expect(result.description.properties).toHaveLength(2);
+			expect(result.description.properties[1].name).toBe('toolDescription');
+		});
+
+		it('should handle nodes with existing codex property', () => {
+			fullNodeWrapper.description.codex = {
+				categories: ['Existing'],
+				subcategories: {
+					Existing: ['Category'],
+				},
+				resources: {
+					primaryDocumentation: [{ url: 'https://example.com' }],
+				},
+			};
+			const result = instance.convertNodeToAiTool(fullNodeWrapper);
+			expect(result.description.codex).toEqual({
+				categories: ['AI'],
+				subcategories: {
+					AI: ['Tools'],
+					Tools: ['Other Tools'],
+				},
+				resources: {
+					primaryDocumentation: [{ url: 'https://example.com' }],
+				},
+			});
+		});
+
+		it('should handle nodes with very long names', () => {
+			fullNodeWrapper.description.name = 'veryLongNodeNameThatExceedsNormalLimits'.repeat(10);
+			fullNodeWrapper.description.displayName =
+				'Very Long Node Name That Exceeds Normal Limits'.repeat(10);
+			const result = instance.convertNodeToAiTool(fullNodeWrapper);
+			expect(result.description.name.endsWith('Tool')).toBe(true);
+			expect(result.description.displayName.endsWith('Tool')).toBe(true);
+		});
+
+		it('should handle nodes with special characters in name and displayName', () => {
+			fullNodeWrapper.description.name = 'special@#$%Node';
+			fullNodeWrapper.description.displayName = 'Special @#$% Node';
+			const result = instance.convertNodeToAiTool(fullNodeWrapper);
+			expect(result.description.name).toBe('special@#$%NodeTool');
+			expect(result.description.displayName).toBe('Special @#$% Node Tool');
+		});
+	});
 });
diff --git a/packages/cli/src/__tests__/workflow-helpers.test.ts b/packages/cli/src/__tests__/manual-execution.service.test.ts
similarity index 69%
rename from packages/cli/src/__tests__/workflow-helpers.test.ts
rename to packages/cli/src/__tests__/manual-execution.service.test.ts
index e24cfa1f68284..383a8dc87cc0c 100644
--- a/packages/cli/src/__tests__/workflow-helpers.test.ts
+++ b/packages/cli/src/__tests__/manual-execution.service.test.ts
@@ -1,8 +1,11 @@
+import { mock } from 'jest-mock-extended';
 import type { Workflow, IWorkflowExecutionDataProcess } from 'n8n-workflow';
 
-import { getExecutionStartNode } from '@/workflow-helpers';
+import { ManualExecutionService } from '@/manual-execution.service';
+
+describe('ManualExecutionService', () => {
+	const manualExecutionService = new ManualExecutionService(mock());
 
-describe('WorkflowHelpers', () => {
 	describe('getExecutionStartNode', () => {
 		it('Should return undefined', () => {
 			const data = {
@@ -16,9 +19,10 @@ describe('WorkflowHelpers', () => {
 					};
 				},
 			} as unknown as Workflow;
-			const executionStartNode = getExecutionStartNode(data, workflow);
+			const executionStartNode = manualExecutionService.getExecutionStartNode(data, workflow);
 			expect(executionStartNode).toBeUndefined();
 		});
+
 		it('Should return startNode', () => {
 			const data = {
 				pinData: {
@@ -37,7 +41,7 @@ describe('WorkflowHelpers', () => {
 					return undefined;
 				},
 			} as unknown as Workflow;
-			const executionStartNode = getExecutionStartNode(data, workflow);
+			const executionStartNode = manualExecutionService.getExecutionStartNode(data, workflow);
 			expect(executionStartNode).toEqual({
 				name: 'node2',
 			});
diff --git a/packages/cli/src/__tests__/node-types.test.ts b/packages/cli/src/__tests__/node-types.test.ts
index 11e2c5ba2b5f8..78d0c5e18a31c 100644
--- a/packages/cli/src/__tests__/node-types.test.ts
+++ b/packages/cli/src/__tests__/node-types.test.ts
@@ -1,95 +1,114 @@
 import { mock } from 'jest-mock-extended';
-import type { INodeType, IVersionedNodeType } from 'n8n-workflow';
+import { UnrecognizedNodeTypeError } from 'n8n-core';
+import type {
+	LoadedClass,
+	INodeType,
+	IVersionedNodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
 
-import type { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
-
-import { NodeTypes } from '../node-types';
+import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
+import { NodeTypes } from '@/node-types';
 
 describe('NodeTypes', () => {
-	let nodeTypes: NodeTypes;
 	const loadNodesAndCredentials = mock<LoadNodesAndCredentials>();
 
+	const nodeTypes: NodeTypes = new NodeTypes(loadNodesAndCredentials);
+
+	const nonVersionedNode: LoadedClass<INodeType> = {
+		sourcePath: '',
+		type: {
+			description: mock<INodeTypeDescription>({
+				name: 'n8n-nodes-base.nonVersioned',
+				usableAsTool: undefined,
+			}),
+		},
+	};
+	const v1Node = mock<INodeType>();
+	const v2Node = mock<INodeType>();
+	const versionedNode: LoadedClass<IVersionedNodeType> = {
+		sourcePath: '',
+		type: {
+			description: mock<INodeTypeDescription>({
+				name: 'n8n-nodes-base.versioned',
+			}),
+			currentVersion: 2,
+			nodeVersions: {
+				1: v1Node,
+				2: v2Node,
+			},
+			getNodeType(version) {
+				if (version === 1) return v1Node;
+				return v2Node;
+			},
+		},
+	};
+	const toolSupportingNode: LoadedClass<INodeType> = {
+		sourcePath: '',
+		type: {
+			description: mock<INodeTypeDescription>({
+				name: 'n8n-nodes-base.testNode',
+				displayName: 'TestNode',
+				usableAsTool: true,
+				properties: [],
+			}),
+		},
+	};
+
+	loadNodesAndCredentials.getNode.mockImplementation((fullNodeType) => {
+		const [packageName, nodeType] = fullNodeType.split('.');
+		if (nodeType === 'nonVersioned') return nonVersionedNode;
+		if (nodeType === 'versioned') return versionedNode;
+		if (nodeType === 'testNode') return toolSupportingNode;
+		throw new UnrecognizedNodeTypeError(packageName, nodeType);
+	});
+
 	beforeEach(() => {
 		jest.clearAllMocks();
-		nodeTypes = new NodeTypes(loadNodesAndCredentials);
+	});
+
+	describe('getByName', () => {
+		it('should return node type when it exists', () => {
+			const result = nodeTypes.getByName('n8n-nodes-base.nonVersioned');
+			expect(result).toBe(nonVersionedNode.type);
+		});
 	});
 
 	describe('getByNameAndVersion', () => {
-		const nodeTypeName = 'n8n-nodes-base.testNode';
+		it('should throw an error if the package does not exist', () => {
+			expect(() => nodeTypes.getByNameAndVersion('invalid-package.unknownNode')).toThrow(
+				'Unrecognized node type: invalid-package.unknownNode',
+			);
+		});
 
 		it('should throw an error if the node-type does not exist', () => {
-			const nodeTypeName = 'unknownNode';
-
-			// @ts-expect-error overwriting a readonly property
-			loadNodesAndCredentials.loadedNodes = {};
-			// @ts-expect-error overwriting a readonly property
-			loadNodesAndCredentials.knownNodes = {};
-
-			expect(() => nodeTypes.getByNameAndVersion(nodeTypeName)).toThrow(
-				'Unrecognized node type: unknownNode',
+			expect(() => nodeTypes.getByNameAndVersion('n8n-nodes-base.unknownNode')).toThrow(
+				'Unrecognized node type: n8n-nodes-base.unknownNode',
 			);
 		});
 
 		it('should return a regular node-type without version', () => {
-			const nodeType = mock<INodeType>();
-
-			// @ts-expect-error overwriting a readonly property
-			loadNodesAndCredentials.loadedNodes = {
-				[nodeTypeName]: { type: nodeType },
-			};
-
-			const result = nodeTypes.getByNameAndVersion(nodeTypeName);
-
-			expect(result).toEqual(nodeType);
+			const result = nodeTypes.getByNameAndVersion('n8n-nodes-base.nonVersioned');
+			expect(result).toBe(nonVersionedNode.type);
 		});
 
 		it('should return a regular node-type with version', () => {
-			const nodeTypeV1 = mock<INodeType>();
-			const nodeType = mock<IVersionedNodeType>({
-				nodeVersions: { 1: nodeTypeV1 },
-				getNodeType: () => nodeTypeV1,
-			});
-
-			// @ts-expect-error overwriting a readonly property
-			loadNodesAndCredentials.loadedNodes = {
-				[nodeTypeName]: { type: nodeType },
-			};
-
-			const result = nodeTypes.getByNameAndVersion(nodeTypeName);
-
-			expect(result).toEqual(nodeTypeV1);
+			const result = nodeTypes.getByNameAndVersion('n8n-nodes-base.versioned');
+			expect(result).toBe(v2Node);
 		});
 
 		it('should throw when a node-type is requested as tool, but does not support being used as one', () => {
-			const nodeType = mock<INodeType>();
-
-			// @ts-expect-error overwriting a readonly property
-			loadNodesAndCredentials.loadedNodes = {
-				[nodeTypeName]: { type: nodeType },
-			};
-
-			expect(() => nodeTypes.getByNameAndVersion(`${nodeTypeName}Tool`)).toThrow(
+			expect(() => nodeTypes.getByNameAndVersion('n8n-nodes-base.nonVersionedTool')).toThrow(
 				'Node cannot be used as a tool',
 			);
 		});
 
 		it('should return the tool node-type when requested as tool', () => {
-			const nodeType = mock<INodeType>();
-			// @ts-expect-error can't use a mock here
-			nodeType.description = {
-				name: nodeTypeName,
-				displayName: 'TestNode',
-				usableAsTool: true,
-				properties: [],
-			};
-
-			// @ts-expect-error overwriting a readonly property
-			loadNodesAndCredentials.loadedNodes = {
-				[nodeTypeName]: { type: nodeType },
-			};
-
-			const result = nodeTypes.getByNameAndVersion(`${nodeTypeName}Tool`);
-			expect(result).not.toEqual(nodeType);
+			// @ts-expect-error don't mock convertNodeToAiTool for now
+			loadNodesAndCredentials.convertNodeToAiTool =
+				LoadNodesAndCredentials.prototype.convertNodeToAiTool;
+			const result = nodeTypes.getByNameAndVersion('n8n-nodes-base.testNodeTool');
+			expect(result).not.toEqual(toolSupportingNode);
 			expect(result.description.name).toEqual('n8n-nodes-base.testNodeTool');
 			expect(result.description.displayName).toEqual('TestNode Tool');
 			expect(result.description.codex?.categories).toContain('AI');
@@ -97,4 +116,47 @@ describe('NodeTypes', () => {
 			expect(result.description.outputs).toEqual(['ai_tool']);
 		});
 	});
+
+	describe('getWithSourcePath', () => {
+		it('should return description and source path for existing node', () => {
+			const result = nodeTypes.getWithSourcePath('n8n-nodes-base.nonVersioned', 1);
+			expect(result).toHaveProperty('description');
+			expect(result).toHaveProperty('sourcePath');
+			expect(result.sourcePath).toBe(nonVersionedNode.sourcePath);
+		});
+
+		it('should throw error for non-existent node', () => {
+			expect(() => nodeTypes.getWithSourcePath('n8n-nodes-base.nonExistent', 1)).toThrow(
+				'Unrecognized node type: n8n-nodes-base.nonExistent',
+			);
+		});
+	});
+
+	describe('getKnownTypes', () => {
+		it('should return known node types', () => {
+			// @ts-expect-error readonly property
+			loadNodesAndCredentials.knownNodes = ['n8n-nodes-base.nonVersioned'];
+			const result = nodeTypes.getKnownTypes();
+			expect(result).toEqual(['n8n-nodes-base.nonVersioned']);
+		});
+	});
+
+	describe('getNodeTypeDescriptions', () => {
+		it('should return descriptions for valid node types', () => {
+			const nodeTypes = new NodeTypes(loadNodesAndCredentials);
+			const result = nodeTypes.getNodeTypeDescriptions([
+				{ name: 'n8n-nodes-base.nonVersioned', version: 1 },
+			]);
+
+			expect(result).toHaveLength(1);
+			expect(result[0].name).toBe('n8n-nodes-base.nonVersioned');
+		});
+
+		it('should throw error for invalid node type', () => {
+			const nodeTypes = new NodeTypes(loadNodesAndCredentials);
+			expect(() =>
+				nodeTypes.getNodeTypeDescriptions([{ name: 'n8n-nodes-base.nonExistent', version: 1 }]),
+			).toThrow('Unrecognized node type: n8n-nodes-base.nonExistent');
+		});
+	});
 });
diff --git a/packages/cli/src/__tests__/wait-tracker.test.ts b/packages/cli/src/__tests__/wait-tracker.test.ts
index ef420e7d7848c..6721c31bae09f 100644
--- a/packages/cli/src/__tests__/wait-tracker.test.ts
+++ b/packages/cli/src/__tests__/wait-tracker.test.ts
@@ -23,7 +23,7 @@ describe('WaitTracker', () => {
 	const executionRepository = mock<ExecutionRepository>();
 	const multiMainSetup = mock<MultiMainSetup>();
 	const orchestrationService = new OrchestrationService(mock(), multiMainSetup, mock());
-	const instanceSettings = mock<InstanceSettings>({ isLeader: true });
+	const instanceSettings = mock<InstanceSettings>({ isLeader: true, isMultiMain: false });
 
 	const project = mock<Project>({ id: 'projectId' });
 	const execution = mock<IExecutionResponse>({
@@ -221,8 +221,6 @@ describe('WaitTracker', () => {
 
 	describe('multi-main setup', () => {
 		it('should start tracking if leader', () => {
-			jest.spyOn(orchestrationService, 'isSingleMainSetup', 'get').mockReturnValue(false);
-
 			executionRepository.getWaitingExecutions.mockResolvedValue([]);
 
 			waitTracker.init();
@@ -238,9 +236,8 @@ describe('WaitTracker', () => {
 				activeExecutions,
 				workflowRunner,
 				orchestrationService,
-				mock<InstanceSettings>({ isLeader: false }),
+				mock<InstanceSettings>({ isLeader: false, isMultiMain: false }),
 			);
-			jest.spyOn(orchestrationService, 'isSingleMainSetup', 'get').mockReturnValue(false);
 
 			executionRepository.getWaitingExecutions.mockResolvedValue([]);
 
diff --git a/packages/cli/src/abstract-server.ts b/packages/cli/src/abstract-server.ts
index f440b2879acc5..f4a8a5b2ccd8d 100644
--- a/packages/cli/src/abstract-server.ts
+++ b/packages/cli/src/abstract-server.ts
@@ -94,11 +94,8 @@ export abstract class AbstractServer {
 		const { app } = this;
 
 		// Augment errors sent to Sentry
-		const {
-			Handlers: { requestHandler, errorHandler },
-		} = await import('@sentry/node');
-		app.use(requestHandler());
-		app.use(errorHandler());
+		const { setupExpressErrorHandler } = await import('@sentry/node');
+		setupExpressErrorHandler(app);
 	}
 
 	private setupCommonMiddlewares() {
diff --git a/packages/cli/src/active-workflow-manager.ts b/packages/cli/src/active-workflow-manager.ts
index 22cc0f5700974..6ef3753af74be 100644
--- a/packages/cli/src/active-workflow-manager.ts
+++ b/packages/cli/src/active-workflow-manager.ts
@@ -1,9 +1,8 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-
 import {
 	ActiveWorkflows,
+	ErrorReporter,
 	InstanceSettings,
-	NodeExecuteFunctions,
 	PollContext,
 	TriggerContext,
 } from 'n8n-core';
@@ -25,7 +24,6 @@ import type {
 import {
 	Workflow,
 	WorkflowActivationError,
-	ErrorReporterProxy as ErrorReporter,
 	WebhookPathTakenError,
 	ApplicationError,
 } from 'n8n-workflow';
@@ -41,10 +39,12 @@ import {
 import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { OnShutdown } from '@/decorators/on-shutdown';
+import { ExecutionService } from '@/executions/execution.service';
 import { ExternalHooks } from '@/external-hooks';
 import type { IWorkflowDb } from '@/interfaces';
 import { Logger } from '@/logging/logger.service';
 import { NodeTypes } from '@/node-types';
+import { Publisher } from '@/scaling/pubsub/publisher.service';
 import { ActiveWorkflowsService } from '@/services/active-workflows.service';
 import { OrchestrationService } from '@/services/orchestration.service';
 import * as WebhookHelpers from '@/webhooks/webhook-helpers';
@@ -53,9 +53,6 @@ import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-da
 import { WorkflowExecutionService } from '@/workflows/workflow-execution.service';
 import { WorkflowStaticDataService } from '@/workflows/workflow-static-data.service';
 
-import { ExecutionService } from './executions/execution.service';
-import { Publisher } from './scaling/pubsub/publisher.service';
-
 interface QueuedActivation {
 	activationMode: WorkflowActivateMode;
 	lastTimeout: number;
@@ -69,6 +66,7 @@ export class ActiveWorkflowManager {
 
 	constructor(
 		private readonly logger: Logger,
+		private readonly errorReporter: ErrorReporter,
 		private readonly activeWorkflows: ActiveWorkflows,
 		private readonly activeExecutions: ActiveExecutions,
 		private readonly externalHooks: ExternalHooks,
@@ -186,12 +184,7 @@ export class ActiveWorkflowManager {
 			try {
 				// TODO: this should happen in a transaction, that way we don't need to manually remove this in `catch`
 				await this.webhookService.storeWebhook(webhook);
-				await workflow.createWebhookIfNotExists(
-					webhookData,
-					NodeExecuteFunctions,
-					mode,
-					activation,
-				);
+				await this.webhookService.createWebhookIfNotExists(workflow, webhookData, mode, activation);
 			} catch (error) {
 				if (activation === 'init' && error.name === 'QueryFailedError') {
 					// n8n does not remove the registered webhooks on exit.
@@ -205,7 +198,7 @@ export class ActiveWorkflowManager {
 				try {
 					await this.clearWebhooks(workflow.id);
 				} catch (error1) {
-					ErrorReporter.error(error1);
+					this.errorReporter.error(error1);
 					this.logger.error(
 						`Could not remove webhooks of workflow "${workflow.id}" because of error: "${error1.message}"`,
 					);
@@ -261,7 +254,7 @@ export class ActiveWorkflowManager {
 		const webhooks = WebhookHelpers.getWorkflowWebhooks(workflow, additionalData, undefined, true);
 
 		for (const webhookData of webhooks) {
-			await workflow.deleteWebhook(webhookData, NodeExecuteFunctions, mode, 'update');
+			await this.webhookService.deleteWebhook(workflow, webhookData, mode, 'update');
 		}
 
 		await this.workflowStaticDataService.saveStaticData(workflow);
@@ -439,7 +432,7 @@ export class ActiveWorkflowManager {
 					this.logger.info('     => Started');
 				}
 			} catch (error) {
-				ErrorReporter.error(error);
+				this.errorReporter.error(error);
 				this.logger.info(
 					'     => ERROR: Workflow could not be activated on first try, keep on trying if not an auth issue',
 				);
@@ -511,7 +504,7 @@ export class ActiveWorkflowManager {
 		existingWorkflow?: WorkflowEntity,
 		{ shouldPublish } = { shouldPublish: true },
 	) {
-		if (this.orchestrationService.isMultiMainSetupEnabled && shouldPublish) {
+		if (this.instanceSettings.isMultiMain && shouldPublish) {
 			void this.publisher.publishCommand({
 				command: 'add-webhooks-triggers-and-pollers',
 				payload: { workflowId },
@@ -557,7 +550,7 @@ export class ActiveWorkflowManager {
 				settings: dbWorkflow.settings,
 			});
 
-			const canBeActivated = workflow.checkIfWorkflowCanBeActivated(STARTING_NODES);
+			const canBeActivated = this.checkIfWorkflowCanBeActivated(workflow, STARTING_NODES);
 
 			if (!canBeActivated) {
 				throw new WorkflowActivationError(
@@ -601,6 +594,48 @@ export class ActiveWorkflowManager {
 		return shouldDisplayActivationMessage;
 	}
 
+	/**
+	 * A workflow can only be activated if it has a node which has either triggers
+	 * or webhooks defined.
+	 *
+	 * @param {string[]} [ignoreNodeTypes] Node-types to ignore in the check
+	 */
+	checkIfWorkflowCanBeActivated(workflow: Workflow, ignoreNodeTypes?: string[]): boolean {
+		let node: INode;
+		let nodeType: INodeType | undefined;
+
+		for (const nodeName of Object.keys(workflow.nodes)) {
+			node = workflow.nodes[nodeName];
+
+			if (node.disabled === true) {
+				// Deactivated nodes can not trigger a run so ignore
+				continue;
+			}
+
+			if (ignoreNodeTypes !== undefined && ignoreNodeTypes.includes(node.type)) {
+				continue;
+			}
+
+			nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+
+			if (nodeType === undefined) {
+				// Type is not known so check is not possible
+				continue;
+			}
+
+			if (
+				nodeType.poll !== undefined ||
+				nodeType.trigger !== undefined ||
+				nodeType.webhook !== undefined
+			) {
+				// Is a trigger node. So workflow can be activated.
+				return true;
+			}
+		}
+
+		return false;
+	}
+
 	/**
 	 * Count all triggers in the workflow, excluding Manual Trigger.
 	 */
@@ -635,7 +670,7 @@ export class ActiveWorkflowManager {
 			try {
 				await this.add(workflowId, activationMode, workflowData);
 			} catch (error) {
-				ErrorReporter.error(error);
+				this.errorReporter.error(error);
 				let lastTimeout = this.queuedActivations[workflowId].lastTimeout;
 				if (lastTimeout < WORKFLOW_REACTIVATE_MAX_TIMEOUT) {
 					lastTimeout = Math.min(lastTimeout * 2, WORKFLOW_REACTIVATE_MAX_TIMEOUT);
@@ -703,11 +738,11 @@ export class ActiveWorkflowManager {
 	// TODO: this should happen in a transaction
 	// maybe, see: https://github.com/n8n-io/n8n/pull/8904#discussion_r1530150510
 	async remove(workflowId: string) {
-		if (this.orchestrationService.isMultiMainSetupEnabled) {
+		if (this.instanceSettings.isMultiMain) {
 			try {
 				await this.clearWebhooks(workflowId);
 			} catch (error) {
-				ErrorReporter.error(error);
+				this.errorReporter.error(error);
 				this.logger.error(
 					`Could not remove webhooks of workflow "${workflowId}" because of error: "${error.message}"`,
 				);
@@ -724,7 +759,7 @@ export class ActiveWorkflowManager {
 		try {
 			await this.clearWebhooks(workflowId);
 		} catch (error) {
-			ErrorReporter.error(error);
+			this.errorReporter.error(error);
 			this.logger.error(
 				`Could not remove webhooks of workflow "${workflowId}" because of error: "${error.message}"`,
 			);
diff --git a/packages/cli/src/collaboration/collaboration.service.ts b/packages/cli/src/collaboration/collaboration.service.ts
index cb2ca0d77a905..a6e957f510be2 100644
--- a/packages/cli/src/collaboration/collaboration.service.ts
+++ b/packages/cli/src/collaboration/collaboration.service.ts
@@ -1,6 +1,7 @@
 import type { PushPayload } from '@n8n/api-types';
+import { ErrorReporter } from 'n8n-core';
 import type { Workflow } from 'n8n-workflow';
-import { ApplicationError, ErrorReporterProxy } from 'n8n-workflow';
+import { ApplicationError } from 'n8n-workflow';
 import { Service } from 'typedi';
 
 import { CollaborationState } from '@/collaboration/collaboration.state';
@@ -20,6 +21,7 @@ import { parseWorkflowMessage } from './collaboration.message';
 @Service()
 export class CollaborationService {
 	constructor(
+		private readonly errorReporter: ErrorReporter,
 		private readonly push: Push,
 		private readonly state: CollaborationState,
 		private readonly userRepository: UserRepository,
@@ -31,7 +33,7 @@ export class CollaborationService {
 			try {
 				await this.handleUserMessage(event.userId, event.msg);
 			} catch (error) {
-				ErrorReporterProxy.error(
+				this.errorReporter.error(
 					new ApplicationError('Error handling CollaborationService push message', {
 						extra: {
 							msg: event.msg,
@@ -97,6 +99,6 @@ export class CollaborationService {
 			collaborators: activeCollaborators,
 		};
 
-		this.push.sendToUsers('collaboratorsChanged', msgData, userIds);
+		this.push.sendToUsers({ type: 'collaboratorsChanged', data: msgData }, userIds);
 	}
 }
diff --git a/packages/cli/src/collaboration/collaboration.state.ts b/packages/cli/src/collaboration/collaboration.state.ts
index f8f606a2adc43..556dee2ace4e7 100644
--- a/packages/cli/src/collaboration/collaboration.state.ts
+++ b/packages/cli/src/collaboration/collaboration.state.ts
@@ -27,7 +27,7 @@ export class CollaborationState {
 	 * After how many minutes of inactivity a user should be removed
 	 * as being an active user of a workflow.
 	 */
-	public readonly inactivityCleanUpTime = 15 * Time.minutes.toMilliseconds;
+	readonly inactivityCleanUpTime = 15 * Time.minutes.toMilliseconds;
 
 	constructor(private readonly cache: CacheService) {}
 
diff --git a/packages/cli/src/commands/base-command.ts b/packages/cli/src/commands/base-command.ts
index b8f15d9f33776..286fec1de6bec 100644
--- a/packages/cli/src/commands/base-command.ts
+++ b/packages/cli/src/commands/base-command.ts
@@ -6,13 +6,9 @@ import {
 	InstanceSettings,
 	ObjectStoreService,
 	DataDeduplicationService,
+	ErrorReporter,
 } from 'n8n-core';
-import {
-	ApplicationError,
-	ensureError,
-	ErrorReporterProxy as ErrorReporter,
-	sleep,
-} from 'n8n-workflow';
+import { ApplicationError, ensureError, sleep } from 'n8n-workflow';
 import { Container } from 'typedi';
 
 import type { AbstractServer } from '@/abstract-server';
@@ -22,7 +18,6 @@ import * as CrashJournal from '@/crash-journal';
 import * as Db from '@/db';
 import { getDataDeduplicationService } from '@/deduplication';
 import { DeprecationService } from '@/deprecation/deprecation.service';
-import { initErrorHandling } from '@/error-reporting';
 import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
 import { TelemetryEventRelay } from '@/events/relays/telemetry.event-relay';
 import { initExpressionEvaluator } from '@/expression-evaluator';
@@ -39,6 +34,8 @@ import { WorkflowHistoryManager } from '@/workflows/workflow-history/workflow-hi
 export abstract class BaseCommand extends Command {
 	protected logger = Container.get(Logger);
 
+	protected errorReporter: ErrorReporter;
+
 	protected externalHooks?: ExternalHooks;
 
 	protected nodeTypes: NodeTypes;
@@ -63,7 +60,11 @@ export abstract class BaseCommand extends Command {
 	protected needsCommunityPackages = false;
 
 	async init(): Promise<void> {
-		await initErrorHandling();
+		this.errorReporter = Container.get(ErrorReporter);
+		await this.errorReporter.init(
+			this.instanceSettings.instanceType,
+			this.globalConfig.sentry.backendDsn,
+		);
 		initExpressionEvaluator();
 
 		process.once('SIGTERM', this.onTerminationSignal('SIGTERM'));
@@ -130,7 +131,7 @@ export abstract class BaseCommand extends Command {
 	}
 
 	protected async exitWithCrash(message: string, error: unknown) {
-		ErrorReporter.error(new Error(message, { cause: error }), { level: 'fatal' });
+		this.errorReporter.error(new Error(message, { cause: error }), { level: 'fatal' });
 		await sleep(2000);
 		process.exit(1);
 	}
diff --git a/packages/cli/src/commands/execute-batch.ts b/packages/cli/src/commands/execute-batch.ts
index a70717c40b3df..0b19e256525e5 100644
--- a/packages/cli/src/commands/execute-batch.ts
+++ b/packages/cli/src/commands/execute-batch.ts
@@ -4,7 +4,7 @@ import fs from 'fs';
 import { diff } from 'json-diff';
 import pick from 'lodash/pick';
 import type { IRun, ITaskData, IWorkflowExecutionDataProcess } from 'n8n-workflow';
-import { ApplicationError, jsonParse, ErrorReporterProxy } from 'n8n-workflow';
+import { ApplicationError, jsonParse } from 'n8n-workflow';
 import os from 'os';
 import { sep } from 'path';
 import { Container } from 'typedi';
@@ -822,7 +822,7 @@ export class ExecuteBatch extends BaseCommand {
 					}
 				}
 			} catch (e) {
-				ErrorReporterProxy.error(e, {
+				this.errorReporter.error(e, {
 					extra: {
 						workflowId: workflowData.id,
 					},
diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts
index 42b5df13e6a3c..63ec3d9240dfa 100644
--- a/packages/cli/src/commands/start.ts
+++ b/packages/cli/src/commands/start.ts
@@ -100,7 +100,7 @@ export class Start extends BaseCommand {
 
 			await this.activeWorkflowManager.removeAllTriggerAndPollerBasedWorkflows();
 
-			if (Container.get(OrchestrationService).isMultiMainSetupEnabled) {
+			if (this.instanceSettings.isMultiMain) {
 				await Container.get(OrchestrationService).shutdown();
 			}
 
@@ -192,6 +192,9 @@ export class Start extends BaseCommand {
 		await super.init();
 		this.activeWorkflowManager = Container.get(ActiveWorkflowManager);
 
+		this.instanceSettings.setMultiMainEnabled(
+			config.getEnv('executions.mode') === 'queue' && this.globalConfig.multiMainSetup.enabled,
+		);
 		await this.initLicense();
 
 		await this.initOrchestration();
@@ -253,7 +256,7 @@ export class Start extends BaseCommand {
 
 		this.logger.scoped(['scaling', 'pubsub']).debug('Pubsub setup completed');
 
-		if (!orchestrationService.isMultiMainSetupEnabled) return;
+		if (this.instanceSettings.isSingleMain) return;
 
 		orchestrationService.multiMainSetup
 			.on('leader-stepdown', async () => {
diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index 1891d8193d7f0..54fa07e7f5dcb 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -405,11 +405,4 @@ export const schema = {
 			doc: 'Set this to 1 to enable the new partial execution logic by default.',
 		},
 	},
-
-	virtualSchemaView: {
-		doc: 'Whether to display the virtualized schema view',
-		format: Boolean,
-		default: false,
-		env: 'N8N_VIRTUAL_SCHEMA_VIEW',
-	},
 };
diff --git a/packages/cli/src/controllers/community-packages.controller.ts b/packages/cli/src/controllers/community-packages.controller.ts
index 918f1cdf74598..ab2134b7e010c 100644
--- a/packages/cli/src/controllers/community-packages.controller.ts
+++ b/packages/cli/src/controllers/community-packages.controller.ts
@@ -115,9 +115,12 @@ export class CommunityPackagesController {
 
 		// broadcast to connected frontends that node list has been updated
 		installedPackage.installedNodes.forEach((node) => {
-			this.push.broadcast('reloadNodeType', {
-				name: node.type,
-				version: node.latestVersion,
+			this.push.broadcast({
+				type: 'reloadNodeType',
+				data: {
+					name: node.type,
+					version: node.latestVersion,
+				},
 			});
 		});
 
@@ -206,9 +209,12 @@ export class CommunityPackagesController {
 
 		// broadcast to connected frontends that node list has been updated
 		installedPackage.installedNodes.forEach((node) => {
-			this.push.broadcast('removeNodeType', {
-				name: node.type,
-				version: node.latestVersion,
+			this.push.broadcast({
+				type: 'removeNodeType',
+				data: {
+					name: node.type,
+					version: node.latestVersion,
+				},
 			});
 		});
 
@@ -246,16 +252,22 @@ export class CommunityPackagesController {
 
 			// broadcast to connected frontends that node list has been updated
 			previouslyInstalledPackage.installedNodes.forEach((node) => {
-				this.push.broadcast('removeNodeType', {
-					name: node.type,
-					version: node.latestVersion,
+				this.push.broadcast({
+					type: 'removeNodeType',
+					data: {
+						name: node.type,
+						version: node.latestVersion,
+					},
 				});
 			});
 
 			newInstalledPackage.installedNodes.forEach((node) => {
-				this.push.broadcast('reloadNodeType', {
-					name: node.name,
-					version: node.latestVersion,
+				this.push.broadcast({
+					type: 'reloadNodeType',
+					data: {
+						name: node.name,
+						version: node.latestVersion,
+					},
 				});
 			});
 
@@ -272,9 +284,12 @@ export class CommunityPackagesController {
 			return newInstalledPackage;
 		} catch (error) {
 			previouslyInstalledPackage.installedNodes.forEach((node) => {
-				this.push.broadcast('removeNodeType', {
-					name: node.type,
-					version: node.latestVersion,
+				this.push.broadcast({
+					type: 'removeNodeType',
+					data: {
+						name: node.type,
+						version: node.latestVersion,
+					},
 				});
 			});
 
diff --git a/packages/cli/src/controllers/dynamic-node-parameters.controller.ts b/packages/cli/src/controllers/dynamic-node-parameters.controller.ts
index f3df53d95b0e1..2858fd99cae9d 100644
--- a/packages/cli/src/controllers/dynamic-node-parameters.controller.ts
+++ b/packages/cli/src/controllers/dynamic-node-parameters.controller.ts
@@ -93,6 +93,22 @@ export class DynamicNodeParametersController {
 		);
 	}
 
+	@Post('/local-resource-mapper-fields')
+	async getLocalResourceMappingFields(req: DynamicNodeParametersRequest.ResourceMapperFields) {
+		const { path, methodName, currentNodeParameters, nodeTypeAndVersion } = req.body;
+
+		if (!methodName) throw new BadRequestError('Missing `methodName` in request body');
+
+		const additionalData = await getBase(req.user.id, currentNodeParameters);
+
+		return await this.service.getLocalResourceMappingFields(
+			methodName,
+			path,
+			additionalData,
+			nodeTypeAndVersion,
+		);
+	}
+
 	@Post('/action-result')
 	async getActionResult(
 		req: DynamicNodeParametersRequest.ActionResult,
diff --git a/packages/cli/src/controllers/e2e.controller.ts b/packages/cli/src/controllers/e2e.controller.ts
index 9c5a1ff36d386..a61342320dd04 100644
--- a/packages/cli/src/controllers/e2e.controller.ts
+++ b/packages/cli/src/controllers/e2e.controller.ts
@@ -1,4 +1,4 @@
-import type { PushPayload, PushType } from '@n8n/api-types';
+import type { PushMessage } from '@n8n/api-types';
 import { Request } from 'express';
 import Container from 'typedi';
 import { v4 as uuid } from 'uuid';
@@ -58,14 +58,12 @@ type ResetRequest = Request<
 	}
 >;
 
-type PushRequest<T extends PushType> = Request<
+type PushRequest = Request<
 	{},
 	{},
 	{
-		type: T;
 		pushRef: string;
-		data: PushPayload<T>;
-	}
+	} & PushMessage
 >;
 
 @RestController('/e2e')
@@ -144,8 +142,9 @@ export class E2EController {
 	}
 
 	@Post('/push', { skipAuth: true })
-	async pushSend(req: PushRequest<any>) {
-		this.push.broadcast(req.body.type, req.body.data);
+	async pushSend(req: PushRequest) {
+		const { pushRef: _, ...pushMsg } = req.body;
+		this.push.broadcast(pushMsg);
 	}
 
 	@Patch('/feature', { skipAuth: true })
diff --git a/packages/cli/src/credential-types.ts b/packages/cli/src/credential-types.ts
index 24e2d9f2bac4f..a6d3f29eb0035 100644
--- a/packages/cli/src/credential-types.ts
+++ b/packages/cli/src/credential-types.ts
@@ -1,13 +1,6 @@
-import { loadClassInIsolation } from 'n8n-core';
-import {
-	ApplicationError,
-	type ICredentialType,
-	type ICredentialTypes,
-	type LoadedClass,
-} from 'n8n-workflow';
+import type { ICredentialType, ICredentialTypes } from 'n8n-workflow';
 import { Service } from 'typedi';
 
-import { RESPONSE_ERROR_MESSAGES } from '@/constants';
 import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
 
 @Service()
@@ -20,7 +13,7 @@ export class CredentialTypes implements ICredentialTypes {
 	}
 
 	getByName(credentialType: string): ICredentialType {
-		return this.getCredential(credentialType).type;
+		return this.loadNodesAndCredentials.getCredential(credentialType).type;
 	}
 
 	getSupportedNodes(type: string): string[] {
@@ -39,21 +32,4 @@ export class CredentialTypes implements ICredentialTypes {
 		}
 		return extendsArr;
 	}
-
-	private getCredential(type: string): LoadedClass<ICredentialType> {
-		const { loadedCredentials, knownCredentials } = this.loadNodesAndCredentials;
-		if (type in loadedCredentials) {
-			return loadedCredentials[type];
-		}
-
-		if (type in knownCredentials) {
-			const { className, sourcePath } = knownCredentials[type];
-			const loaded: ICredentialType = loadClassInIsolation(sourcePath, className);
-			loadedCredentials[type] = { sourcePath, type: loaded };
-			return loadedCredentials[type];
-		}
-		throw new ApplicationError(RESPONSE_ERROR_MESSAGES.NO_CREDENTIAL, {
-			tags: { credentialType: type },
-		});
-	}
 }
diff --git a/packages/cli/src/databases/entities/credentials-entity.ts b/packages/cli/src/databases/entities/credentials-entity.ts
index bbfc137f85f36..b4f1a10c3872b 100644
--- a/packages/cli/src/databases/entities/credentials-entity.ts
+++ b/packages/cli/src/databases/entities/credentials-entity.ts
@@ -29,6 +29,14 @@ export class CredentialsEntity extends WithTimestampsAndStringId implements ICre
 	@OneToMany('SharedCredentials', 'credentials')
 	shared: SharedCredentials[];
 
+	/**
+	 * Whether the credential is managed by n8n. We currently use this flag
+	 * to provide OpenAI free credits on cloud. Managed credentials cannot be
+	 * edited by the user.
+	 */
+	@Column({ default: false })
+	isManaged: boolean;
+
 	toJSON() {
 		const { shared, ...rest } = this;
 		return rest;
diff --git a/packages/cli/src/databases/entities/workflow-entity.ts b/packages/cli/src/databases/entities/workflow-entity.ts
index b03cf2c28d9cb..67d0f0e345cc3 100644
--- a/packages/cli/src/databases/entities/workflow-entity.ts
+++ b/packages/cli/src/databases/entities/workflow-entity.ts
@@ -80,7 +80,7 @@ export class WorkflowEntity extends WithTimestampsAndStringId implements IWorkfl
 		nullable: true,
 		transformer: sqlite.jsonColumn,
 	})
-	pinData: ISimplifiedPinData;
+	pinData?: ISimplifiedPinData;
 
 	@Column({ length: 36 })
 	versionId: string;
diff --git a/packages/cli/src/databases/migrations/common/1659888469333-AddJsonKeyPinData.ts b/packages/cli/src/databases/migrations/common/1659888469333-AddJsonKeyPinData.ts
index 84d3040a10d7b..75ce65ad6bffe 100644
--- a/packages/cli/src/databases/migrations/common/1659888469333-AddJsonKeyPinData.ts
+++ b/packages/cli/src/databases/migrations/common/1659888469333-AddJsonKeyPinData.ts
@@ -1,7 +1,7 @@
+import { isObjectLiteral } from 'n8n-core';
 import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import type { MigrationContext, IrreversibleMigration } from '@/databases/types';
-import { isObjectLiteral } from '@/utils';
 
 type OldPinnedData = { [nodeName: string]: IDataObject[] };
 type NewPinnedData = { [nodeName: string]: INodeExecutionData[] };
diff --git a/packages/cli/src/databases/migrations/common/1733133775640-AddMockedNodesColumnToTestDefinition.ts b/packages/cli/src/databases/migrations/common/1733133775640-AddMockedNodesColumnToTestDefinition.ts
index 09ce45722c028..53f650ebcf9ca 100644
--- a/packages/cli/src/databases/migrations/common/1733133775640-AddMockedNodesColumnToTestDefinition.ts
+++ b/packages/cli/src/databases/migrations/common/1733133775640-AddMockedNodesColumnToTestDefinition.ts
@@ -9,7 +9,7 @@ export class AddMockedNodesColumnToTestDefinition1733133775640 implements Revers
 		const mockedNodesColumnName = escape.columnName('mockedNodes');
 
 		await runQuery(
-			`ALTER TABLE ${tableName} ADD COLUMN ${mockedNodesColumnName} JSON DEFAULT '[]' NOT NULL`,
+			`ALTER TABLE ${tableName} ADD COLUMN ${mockedNodesColumnName} JSON DEFAULT ('[]') NOT NULL`,
 		);
 	}
 
diff --git a/packages/cli/src/databases/migrations/common/1734479635324-AddManagedColumnToCredentialsTable.ts b/packages/cli/src/databases/migrations/common/1734479635324-AddManagedColumnToCredentialsTable.ts
new file mode 100644
index 0000000000000..00fc2d16e7e47
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1734479635324-AddManagedColumnToCredentialsTable.ts
@@ -0,0 +1,21 @@
+import type { MigrationContext, ReversibleMigration } from '@/databases/types';
+
+export class AddManagedColumnToCredentialsTable1734479635324 implements ReversibleMigration {
+	async up({ escape, runQuery, isSqlite }: MigrationContext) {
+		const tableName = escape.tableName('credentials_entity');
+		const columnName = escape.columnName('isManaged');
+
+		const defaultValue = isSqlite ? 0 : 'FALSE';
+
+		await runQuery(
+			`ALTER TABLE ${tableName} ADD COLUMN ${columnName} BOOLEAN NOT NULL DEFAULT ${defaultValue}`,
+		);
+	}
+
+	async down({ escape, runQuery }: MigrationContext) {
+		const tableName = escape.tableName('credentials_entity');
+		const columnName = escape.columnName('isManaged');
+
+		await runQuery(`ALTER TABLE ${tableName} DROP COLUMN ${columnName}`);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/mysqldb/index.ts b/packages/cli/src/databases/migrations/mysqldb/index.ts
index b977f6b013faa..2fc39079d42c0 100644
--- a/packages/cli/src/databases/migrations/mysqldb/index.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/index.ts
@@ -74,6 +74,7 @@ import { AddDescriptionToTestDefinition1731404028106 } from '../common/173140402
 import { CreateTestMetricTable1732271325258 } from '../common/1732271325258-CreateTestMetricTable';
 import { CreateTestRun1732549866705 } from '../common/1732549866705-CreateTestRunTable';
 import { AddMockedNodesColumnToTestDefinition1733133775640 } from '../common/1733133775640-AddMockedNodesColumnToTestDefinition';
+import { AddManagedColumnToCredentialsTable1734479635324 } from '../common/1734479635324-AddManagedColumnToCredentialsTable';
 
 export const mysqlMigrations: Migration[] = [
 	InitialMigration1588157391238,
@@ -150,4 +151,5 @@ export const mysqlMigrations: Migration[] = [
 	CreateTestMetricTable1732271325258,
 	CreateTestRun1732549866705,
 	AddMockedNodesColumnToTestDefinition1733133775640,
+	AddManagedColumnToCredentialsTable1734479635324,
 ];
diff --git a/packages/cli/src/databases/migrations/postgresdb/index.ts b/packages/cli/src/databases/migrations/postgresdb/index.ts
index 985e6964e10f1..605c156003b51 100644
--- a/packages/cli/src/databases/migrations/postgresdb/index.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/index.ts
@@ -74,6 +74,7 @@ import { AddDescriptionToTestDefinition1731404028106 } from '../common/173140402
 import { CreateTestMetricTable1732271325258 } from '../common/1732271325258-CreateTestMetricTable';
 import { CreateTestRun1732549866705 } from '../common/1732549866705-CreateTestRunTable';
 import { AddMockedNodesColumnToTestDefinition1733133775640 } from '../common/1733133775640-AddMockedNodesColumnToTestDefinition';
+import { AddManagedColumnToCredentialsTable1734479635324 } from '../common/1734479635324-AddManagedColumnToCredentialsTable';
 
 export const postgresMigrations: Migration[] = [
 	InitialMigration1587669153312,
@@ -150,4 +151,5 @@ export const postgresMigrations: Migration[] = [
 	CreateTestMetricTable1732271325258,
 	CreateTestRun1732549866705,
 	AddMockedNodesColumnToTestDefinition1733133775640,
+	AddManagedColumnToCredentialsTable1734479635324,
 ];
diff --git a/packages/cli/src/databases/migrations/sqlite/index.ts b/packages/cli/src/databases/migrations/sqlite/index.ts
index 34d548b6841fa..0981ece99b343 100644
--- a/packages/cli/src/databases/migrations/sqlite/index.ts
+++ b/packages/cli/src/databases/migrations/sqlite/index.ts
@@ -71,6 +71,7 @@ import { CreateTestDefinitionTable1730386903556 } from '../common/1730386903556-
 import { CreateTestMetricTable1732271325258 } from '../common/1732271325258-CreateTestMetricTable';
 import { CreateTestRun1732549866705 } from '../common/1732549866705-CreateTestRunTable';
 import { AddMockedNodesColumnToTestDefinition1733133775640 } from '../common/1733133775640-AddMockedNodesColumnToTestDefinition';
+import { AddManagedColumnToCredentialsTable1734479635324 } from '../common/1734479635324-AddManagedColumnToCredentialsTable';
 
 const sqliteMigrations: Migration[] = [
 	InitialMigration1588102412422,
@@ -144,6 +145,7 @@ const sqliteMigrations: Migration[] = [
 	CreateTestMetricTable1732271325258,
 	CreateTestRun1732549866705,
 	AddMockedNodesColumnToTestDefinition1733133775640,
+	AddManagedColumnToCredentialsTable1734479635324,
 ];
 
 export { sqliteMigrations };
diff --git a/packages/cli/src/databases/repositories/execution.repository.ts b/packages/cli/src/databases/repositories/execution.repository.ts
index 5bef675a7995b..fbcb7de445463 100644
--- a/packages/cli/src/databases/repositories/execution.repository.ts
+++ b/packages/cli/src/databases/repositories/execution.repository.ts
@@ -21,12 +21,8 @@ import {
 import { DateUtils } from '@n8n/typeorm/util/DateUtils';
 import { parse, stringify } from 'flatted';
 import pick from 'lodash/pick';
-import { BinaryDataService } from 'n8n-core';
-import {
-	ExecutionCancelledError,
-	ErrorReporterProxy as ErrorReporter,
-	ApplicationError,
-} from 'n8n-workflow';
+import { BinaryDataService, ErrorReporter } from 'n8n-core';
+import { ExecutionCancelledError, ApplicationError } from 'n8n-workflow';
 import type {
 	AnnotationVote,
 	ExecutionStatus,
@@ -125,6 +121,7 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 		dataSource: DataSource,
 		private readonly globalConfig: GlobalConfig,
 		private readonly logger: Logger,
+		private readonly errorReporter: ErrorReporter,
 		private readonly executionDataRepository: ExecutionDataRepository,
 		private readonly binaryDataService: BinaryDataService,
 	) {
@@ -209,7 +206,7 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 	reportInvalidExecutions(executions: ExecutionEntity[]) {
 		if (executions.length === 0) return;
 
-		ErrorReporter.error(
+		this.errorReporter.error(
 			new ApplicationError('Found executions without executionData', {
 				extra: { executionIds: executions.map(({ id }) => id) },
 			}),
diff --git a/packages/cli/src/databases/repositories/installed-packages.repository.ts b/packages/cli/src/databases/repositories/installed-packages.repository.ts
index 50f9e7ad4fa2c..77faf9681747b 100644
--- a/packages/cli/src/databases/repositories/installed-packages.repository.ts
+++ b/packages/cli/src/databases/repositories/installed-packages.repository.ts
@@ -35,7 +35,7 @@ export class InstalledPackagesRepository extends Repository<InstalledPackages> {
 			for (const loadedNode of loadedNodes) {
 				const installedNode = this.installedNodesRepository.create({
 					name: nodeTypes[loadedNode.name].type.description.displayName,
-					type: loadedNode.name,
+					type: `${packageName}.${loadedNode.name}`,
 					latestVersion: loadedNode.version,
 					package: { packageName },
 				});
diff --git a/packages/cli/src/databases/repositories/settings.repository.ts b/packages/cli/src/databases/repositories/settings.repository.ts
index 8d87fcffffb7b..aa4410d6d48fe 100644
--- a/packages/cli/src/databases/repositories/settings.repository.ts
+++ b/packages/cli/src/databases/repositories/settings.repository.ts
@@ -1,5 +1,5 @@
 import { DataSource, Repository } from '@n8n/typeorm';
-import { ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
+import { ErrorReporter } from 'n8n-core';
 import { Service } from 'typedi';
 
 import config from '@/config';
@@ -9,7 +9,10 @@ import { Settings } from '../entities/settings';
 
 @Service()
 export class SettingsRepository extends Repository<Settings> {
-	constructor(dataSource: DataSource) {
+	constructor(
+		dataSource: DataSource,
+		private readonly errorReporter: ErrorReporter,
+	) {
 		super(Settings, dataSource.manager);
 	}
 
@@ -49,7 +52,7 @@ export class SettingsRepository extends Repository<Settings> {
 			config.set(key, value);
 			return { success: true };
 		} catch (error) {
-			ErrorReporter.error(error);
+			this.errorReporter.error(error);
 		}
 		return { success: false };
 	}
diff --git a/packages/cli/src/databases/repositories/test-run.repository.ee.ts b/packages/cli/src/databases/repositories/test-run.repository.ee.ts
index 3be1eb379067c..1e889aadc758f 100644
--- a/packages/cli/src/databases/repositories/test-run.repository.ee.ts
+++ b/packages/cli/src/databases/repositories/test-run.repository.ee.ts
@@ -12,7 +12,7 @@ export class TestRunRepository extends Repository<TestRun> {
 		super(TestRun, dataSource.manager);
 	}
 
-	public async createTestRun(testDefinitionId: string) {
+	async createTestRun(testDefinitionId: string) {
 		const testRun = this.create({
 			status: 'new',
 			testDefinition: { id: testDefinitionId },
@@ -21,15 +21,15 @@ export class TestRunRepository extends Repository<TestRun> {
 		return await this.save(testRun);
 	}
 
-	public async markAsRunning(id: string) {
+	async markAsRunning(id: string) {
 		return await this.update(id, { status: 'running', runAt: new Date() });
 	}
 
-	public async markAsCompleted(id: string, metrics: AggregatedTestRunMetrics) {
+	async markAsCompleted(id: string, metrics: AggregatedTestRunMetrics) {
 		return await this.update(id, { status: 'completed', completedAt: new Date(), metrics });
 	}
 
-	public async getMany(testDefinitionId: string, options: ListQuery.Options) {
+	async getMany(testDefinitionId: string, options: ListQuery.Options) {
 		const findManyOptions: FindManyOptions<TestRun> = {
 			where: { testDefinition: { id: testDefinitionId } },
 			order: { createdAt: 'DESC' },
diff --git a/packages/cli/src/databases/subscribers/user-subscriber.ts b/packages/cli/src/databases/subscribers/user-subscriber.ts
index 2f9e698890eea..1c55572b14e01 100644
--- a/packages/cli/src/databases/subscribers/user-subscriber.ts
+++ b/packages/cli/src/databases/subscribers/user-subscriber.ts
@@ -1,6 +1,7 @@
 import type { EntitySubscriberInterface, UpdateEvent } from '@n8n/typeorm';
 import { EventSubscriber } from '@n8n/typeorm';
-import { ApplicationError, ErrorReporterProxy } from 'n8n-workflow';
+import { ErrorReporter } from 'n8n-core';
+import { ApplicationError } from 'n8n-workflow';
 import { Container } from 'typedi';
 
 import { Logger } from '@/logging/logger.service';
@@ -11,6 +12,8 @@ import { UserRepository } from '../repositories/user.repository';
 
 @EventSubscriber()
 export class UserSubscriber implements EntitySubscriberInterface<User> {
+	private readonly eventReporter = Container.get(ErrorReporter);
+
 	listenTo() {
 		return User;
 	}
@@ -47,7 +50,7 @@ export class UserSubscriber implements EntitySubscriberInterface<User> {
 						const message = "Could not update the personal project's name";
 						Container.get(Logger).warn(message, event.entity);
 						const exception = new ApplicationError(message);
-						ErrorReporterProxy.warn(exception, event.entity);
+						this.eventReporter.warn(exception, event.entity);
 						return;
 					}
 
@@ -69,7 +72,7 @@ export class UserSubscriber implements EntitySubscriberInterface<User> {
 					const message = "Could not update the personal project's name";
 					Container.get(Logger).warn(message, event.entity);
 					const exception = new ApplicationError(message);
-					ErrorReporterProxy.warn(exception, event.entity);
+					this.eventReporter.warn(exception, event.entity);
 				}
 			}
 		}
diff --git a/packages/cli/src/db.ts b/packages/cli/src/db.ts
index 13147b4106ac1..e1c2b0e402ccd 100644
--- a/packages/cli/src/db.ts
+++ b/packages/cli/src/db.ts
@@ -2,11 +2,8 @@
 import type { EntityManager } from '@n8n/typeorm';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { DataSource as Connection } from '@n8n/typeorm';
-import {
-	DbConnectionTimeoutError,
-	ensureError,
-	ErrorReporterProxy as ErrorReporter,
-} from 'n8n-workflow';
+import { ErrorReporter } from 'n8n-core';
+import { DbConnectionTimeoutError, ensureError } from 'n8n-workflow';
 import { Container } from 'typedi';
 
 import { inTest } from '@/constants';
@@ -38,7 +35,7 @@ if (!inTest) {
 				connectionState.connected = true;
 				return;
 			} catch (error) {
-				ErrorReporter.error(error);
+				Container.get(ErrorReporter).error(error);
 			} finally {
 				pingTimer = setTimeout(pingDBFn, 2000);
 			}
diff --git a/packages/cli/src/decorators/__tests__/on-shutdown.test.ts b/packages/cli/src/decorators/__tests__/on-shutdown.test.ts
index 28e70dac47328..774ae2ef4889b 100644
--- a/packages/cli/src/decorators/__tests__/on-shutdown.test.ts
+++ b/packages/cli/src/decorators/__tests__/on-shutdown.test.ts
@@ -8,7 +8,7 @@ describe('OnShutdown', () => {
 	let shutdownService: ShutdownService;
 
 	beforeEach(() => {
-		shutdownService = new ShutdownService(mock());
+		shutdownService = new ShutdownService(mock(), mock());
 		Container.set(ShutdownService, shutdownService);
 		jest.spyOn(shutdownService, 'register');
 	});
diff --git a/packages/cli/src/environments/source-control/source-control-export.service.ee.ts b/packages/cli/src/environments/source-control/source-control-export.service.ee.ts
index 9c495bbb8d21b..03352410f435f 100644
--- a/packages/cli/src/environments/source-control/source-control-export.service.ee.ts
+++ b/packages/cli/src/environments/source-control/source-control-export.service.ee.ts
@@ -71,7 +71,7 @@ export class SourceControlExportService {
 		}
 	}
 
-	public rmFilesFromExportFolder(filesToBeDeleted: Set<string>): Set<string> {
+	rmFilesFromExportFolder(filesToBeDeleted: Set<string>): Set<string> {
 		try {
 			filesToBeDeleted.forEach((e) => rmSync(e));
 		} catch (error) {
diff --git a/packages/cli/src/environments/source-control/source-control-import.service.ee.ts b/packages/cli/src/environments/source-control/source-control-import.service.ee.ts
index b5012d2762ff6..2e7da80c13312 100644
--- a/packages/cli/src/environments/source-control/source-control-import.service.ee.ts
+++ b/packages/cli/src/environments/source-control/source-control-import.service.ee.ts
@@ -1,13 +1,8 @@
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In } from '@n8n/typeorm';
 import glob from 'fast-glob';
-import { Credentials, InstanceSettings } from 'n8n-core';
-import {
-	ApplicationError,
-	jsonParse,
-	ErrorReporterProxy as ErrorReporter,
-	ensureError,
-} from 'n8n-workflow';
+import { Credentials, ErrorReporter, InstanceSettings } from 'n8n-core';
+import { ApplicationError, jsonParse, ensureError } from 'n8n-workflow';
 import { readFile as fsReadFile } from 'node:fs/promises';
 import path from 'path';
 import { Container, Service } from 'typedi';
@@ -56,6 +51,7 @@ export class SourceControlImportService {
 
 	constructor(
 		private readonly logger: Logger,
+		private readonly errorReporter: ErrorReporter,
 		private readonly variablesService: VariablesService,
 		private readonly activeWorkflowManager: ActiveWorkflowManager,
 		private readonly tagRepository: TagRepository,
@@ -69,7 +65,7 @@ export class SourceControlImportService {
 		);
 	}
 
-	public async getRemoteVersionIdsFromFiles(): Promise<SourceControlWorkflowVersionId[]> {
+	async getRemoteVersionIdsFromFiles(): Promise<SourceControlWorkflowVersionId[]> {
 		const remoteWorkflowFiles = await glob('*.json', {
 			cwd: this.workflowExportFolder,
 			absolute: true,
@@ -95,7 +91,7 @@ export class SourceControlImportService {
 		);
 	}
 
-	public async getLocalVersionIdsFromDb(): Promise<SourceControlWorkflowVersionId[]> {
+	async getLocalVersionIdsFromDb(): Promise<SourceControlWorkflowVersionId[]> {
 		const localWorkflows = await Container.get(WorkflowRepository).find({
 			select: ['id', 'name', 'versionId', 'updatedAt'],
 		});
@@ -104,7 +100,7 @@ export class SourceControlImportService {
 			if (local.updatedAt instanceof Date) {
 				updatedAt = local.updatedAt;
 			} else {
-				ErrorReporter.warn('updatedAt is not a Date', {
+				this.errorReporter.warn('updatedAt is not a Date', {
 					extra: {
 						type: typeof local.updatedAt,
 						value: local.updatedAt,
@@ -123,7 +119,7 @@ export class SourceControlImportService {
 		}) as SourceControlWorkflowVersionId[];
 	}
 
-	public async getRemoteCredentialsFromFiles(): Promise<
+	async getRemoteCredentialsFromFiles(): Promise<
 		Array<ExportableCredential & { filename: string }>
 	> {
 		const remoteCredentialFiles = await glob('*.json', {
@@ -150,9 +146,7 @@ export class SourceControlImportService {
 		>;
 	}
 
-	public async getLocalCredentialsFromDb(): Promise<
-		Array<ExportableCredential & { filename: string }>
-	> {
+	async getLocalCredentialsFromDb(): Promise<Array<ExportableCredential & { filename: string }>> {
 		const localCredentials = await Container.get(CredentialsRepository).find({
 			select: ['id', 'name', 'type'],
 		});
@@ -164,7 +158,7 @@ export class SourceControlImportService {
 		})) as Array<ExportableCredential & { filename: string }>;
 	}
 
-	public async getRemoteVariablesFromFile(): Promise<Variables[]> {
+	async getRemoteVariablesFromFile(): Promise<Variables[]> {
 		const variablesFile = await glob(SOURCE_CONTROL_VARIABLES_EXPORT_FILE, {
 			cwd: this.gitFolder,
 			absolute: true,
@@ -178,11 +172,11 @@ export class SourceControlImportService {
 		return [];
 	}
 
-	public async getLocalVariablesFromDb(): Promise<Variables[]> {
+	async getLocalVariablesFromDb(): Promise<Variables[]> {
 		return await this.variablesService.getAllCached();
 	}
 
-	public async getRemoteTagsAndMappingsFromFile(): Promise<{
+	async getRemoteTagsAndMappingsFromFile(): Promise<{
 		tags: TagEntity[];
 		mappings: WorkflowTagMapping[];
 	}> {
@@ -201,7 +195,7 @@ export class SourceControlImportService {
 		return { tags: [], mappings: [] };
 	}
 
-	public async getLocalTagsAndMappingsFromDb(): Promise<{
+	async getLocalTagsAndMappingsFromDb(): Promise<{
 		tags: TagEntity[];
 		mappings: WorkflowTagMapping[];
 	}> {
@@ -214,7 +208,7 @@ export class SourceControlImportService {
 		return { tags: localTags, mappings: localMappings };
 	}
 
-	public async importWorkflowFromWorkFolder(candidates: SourceControlledFile[], userId: string) {
+	async importWorkflowFromWorkFolder(candidates: SourceControlledFile[], userId: string) {
 		const personalProject =
 			await Container.get(ProjectRepository).getPersonalProjectForUserOrFail(userId);
 		const workflowManager = this.activeWorkflowManager;
@@ -301,7 +295,7 @@ export class SourceControlImportService {
 		}>;
 	}
 
-	public async importCredentialsFromWorkFolder(candidates: SourceControlledFile[], userId: string) {
+	async importCredentialsFromWorkFolder(candidates: SourceControlledFile[], userId: string) {
 		const personalProject =
 			await Container.get(ProjectRepository).getPersonalProjectForUserOrFail(userId);
 		const candidateIds = candidates.map((c) => c.id);
@@ -375,7 +369,7 @@ export class SourceControlImportService {
 		return importCredentialsResult.filter((e) => e !== undefined);
 	}
 
-	public async importTagsFromWorkFolder(candidate: SourceControlledFile) {
+	async importTagsFromWorkFolder(candidate: SourceControlledFile) {
 		let mappedTags;
 		try {
 			this.logger.debug(`Importing tags from file ${candidate.file}`);
@@ -437,7 +431,7 @@ export class SourceControlImportService {
 		return mappedTags;
 	}
 
-	public async importVariablesFromWorkFolder(
+	async importVariablesFromWorkFolder(
 		candidate: SourceControlledFile,
 		valueOverrides?: {
 			[key: string]: string;
diff --git a/packages/cli/src/environments/source-control/source-control-preferences.service.ee.ts b/packages/cli/src/environments/source-control/source-control-preferences.service.ee.ts
index d3a34d784f28b..7c061b6c3c5be 100644
--- a/packages/cli/src/environments/source-control/source-control-preferences.service.ee.ts
+++ b/packages/cli/src/environments/source-control/source-control-preferences.service.ee.ts
@@ -41,7 +41,7 @@ export class SourceControlPreferencesService {
 		this.sshKeyName = path.join(this.sshFolder, SOURCE_CONTROL_SSH_KEY_NAME);
 	}
 
-	public get sourceControlPreferences(): SourceControlPreferences {
+	get sourceControlPreferences(): SourceControlPreferences {
 		return {
 			...this._sourceControlPreferences,
 			connected: this._sourceControlPreferences.connected ?? false,
@@ -49,14 +49,14 @@ export class SourceControlPreferencesService {
 	}
 
 	// merge the new preferences with the existing preferences when setting
-	public set sourceControlPreferences(preferences: Partial<SourceControlPreferences>) {
+	set sourceControlPreferences(preferences: Partial<SourceControlPreferences>) {
 		this._sourceControlPreferences = SourceControlPreferences.merge(
 			preferences,
 			this._sourceControlPreferences,
 		);
 	}
 
-	public isSourceControlSetup() {
+	isSourceControlSetup() {
 		return (
 			this.isSourceControlLicensedAndEnabled() &&
 			this.getPreferences().repositoryUrl &&
diff --git a/packages/cli/src/environments/source-control/source-control.service.ee.ts b/packages/cli/src/environments/source-control/source-control.service.ee.ts
index 58c213f03c1b7..e010210262f62 100644
--- a/packages/cli/src/environments/source-control/source-control.service.ee.ts
+++ b/packages/cli/src/environments/source-control/source-control.service.ee.ts
@@ -81,7 +81,7 @@ export class SourceControlService {
 		});
 	}
 
-	public async sanityCheck(): Promise<void> {
+	async sanityCheck(): Promise<void> {
 		try {
 			const foldersExisted = sourceControlFoldersExistCheck(
 				[this.gitFolder, this.sshFolder],
diff --git a/packages/cli/src/environments/variables/variables.controller.ee.ts b/packages/cli/src/environments/variables/variables.controller.ee.ts
index 5da4221a3d56d..a38906b800c26 100644
--- a/packages/cli/src/environments/variables/variables.controller.ee.ts
+++ b/packages/cli/src/environments/variables/variables.controller.ee.ts
@@ -1,4 +1,7 @@
+import { VariableListRequestDto } from '@n8n/api-types';
+
 import { Delete, Get, GlobalScope, Licensed, Patch, Post, RestController } from '@/decorators';
+import { Query } from '@/decorators/args';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { VariableCountLimitReachedError } from '@/errors/variable-count-limit-reached.error';
@@ -13,8 +16,8 @@ export class VariablesController {
 
 	@Get('/')
 	@GlobalScope('variable:list')
-	async getVariables() {
-		return await this.variablesService.getAllCached();
+	async getVariables(_req: unknown, _res: unknown, @Query query: VariableListRequestDto) {
+		return await this.variablesService.getAllCached(query.state);
 	}
 
 	@Post('/')
diff --git a/packages/cli/src/environments/variables/variables.service.ee.ts b/packages/cli/src/environments/variables/variables.service.ee.ts
index 31cf725099b90..38ad5703ea91e 100644
--- a/packages/cli/src/environments/variables/variables.service.ee.ts
+++ b/packages/cli/src/environments/variables/variables.service.ee.ts
@@ -18,13 +18,22 @@ export class VariablesService {
 		private readonly eventService: EventService,
 	) {}
 
-	async getAllCached(): Promise<Variables[]> {
-		const variables = await this.cacheService.get('variables', {
+	async getAllCached(state?: 'empty'): Promise<Variables[]> {
+		let variables = await this.cacheService.get('variables', {
 			async refreshFn() {
 				return await Container.get(VariablesService).findAll();
 			},
 		});
-		return (variables as Array<Partial<Variables>>).map((v) => this.variablesRepository.create(v));
+
+		if (variables === undefined) {
+			return [];
+		}
+
+		if (state === 'empty') {
+			variables = variables.filter((v) => v.value === '');
+		}
+
+		return variables.map((v) => this.variablesRepository.create(v));
 	}
 
 	async getCount(): Promise<number> {
diff --git a/packages/cli/src/error-reporting.ts b/packages/cli/src/error-reporting.ts
deleted file mode 100644
index fd2ce078cd583..0000000000000
--- a/packages/cli/src/error-reporting.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-import { GlobalConfig } from '@n8n/config';
-// eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
-import { QueryFailedError } from '@n8n/typeorm';
-import { AxiosError } from 'axios';
-import { createHash } from 'crypto';
-import { InstanceSettings } from 'n8n-core';
-import { ErrorReporterProxy, ApplicationError } from 'n8n-workflow';
-import Container from 'typedi';
-
-let initialized = false;
-
-export const initErrorHandling = async () => {
-	if (initialized) return;
-
-	process.on('uncaughtException', (error) => {
-		ErrorReporterProxy.error(error);
-	});
-
-	const dsn = Container.get(GlobalConfig).sentry.backendDsn;
-	if (!dsn) {
-		initialized = true;
-		return;
-	}
-
-	// Collect longer stacktraces
-	Error.stackTraceLimit = 50;
-
-	const {
-		N8N_VERSION: release,
-		ENVIRONMENT: environment,
-		DEPLOYMENT_NAME: serverName,
-	} = process.env;
-
-	const { init, captureException, setTag } = await import('@sentry/node');
-
-	const { RewriteFrames } = await import('@sentry/integrations');
-	const { Integrations } = await import('@sentry/node');
-
-	const enabledIntegrations = [
-		'InboundFilters',
-		'FunctionToString',
-		'LinkedErrors',
-		'OnUnhandledRejection',
-		'ContextLines',
-	];
-	const seenErrors = new Set<string>();
-
-	init({
-		dsn,
-		release,
-		environment,
-		enableTracing: false,
-		serverName,
-		beforeBreadcrumb: () => null,
-		integrations: (integrations) => [
-			...integrations.filter(({ name }) => enabledIntegrations.includes(name)),
-			new RewriteFrames({ root: process.cwd() }),
-			new Integrations.RequestData({
-				include: {
-					cookies: false,
-					data: false,
-					headers: false,
-					query_string: false,
-					url: true,
-					user: false,
-				},
-			}),
-		],
-		async beforeSend(event, { originalException }) {
-			if (!originalException) return null;
-
-			if (originalException instanceof Promise) {
-				originalException = await originalException.catch((error) => error as Error);
-			}
-
-			if (originalException instanceof AxiosError) return null;
-
-			if (
-				originalException instanceof QueryFailedError &&
-				['SQLITE_FULL', 'SQLITE_IOERR'].some((errMsg) => originalException.message.includes(errMsg))
-			) {
-				return null;
-			}
-
-			if (originalException instanceof ApplicationError) {
-				const { level, extra, tags } = originalException;
-				if (level === 'warning') return null;
-				event.level = level;
-				if (extra) event.extra = { ...event.extra, ...extra };
-				if (tags) event.tags = { ...event.tags, ...tags };
-			}
-
-			if (
-				originalException instanceof Error &&
-				'cause' in originalException &&
-				originalException.cause instanceof Error &&
-				'level' in originalException.cause &&
-				originalException.cause.level === 'warning'
-			) {
-				// handle underlying errors propagating from dependencies like ai-assistant-sdk
-				return null;
-			}
-
-			if (originalException instanceof Error && originalException.stack) {
-				const eventHash = createHash('sha1').update(originalException.stack).digest('base64');
-				if (seenErrors.has(eventHash)) return null;
-				seenErrors.add(eventHash);
-			}
-
-			return event;
-		},
-	});
-
-	setTag('server_type', Container.get(InstanceSettings).instanceType);
-
-	ErrorReporterProxy.init({
-		report: (error, options) => captureException(error, options),
-	});
-
-	initialized = true;
-};
diff --git a/packages/cli/src/evaluation/test-runner/__tests__/create-pin-data.ee.test.ts b/packages/cli/src/evaluation/test-runner/__tests__/create-pin-data.ee.test.ts
index 6da88f9c202d9..685c15552badc 100644
--- a/packages/cli/src/evaluation/test-runner/__tests__/create-pin-data.ee.test.ts
+++ b/packages/cli/src/evaluation/test-runner/__tests__/create-pin-data.ee.test.ts
@@ -13,7 +13,9 @@ const executionDataJson = JSON.parse(
 
 describe('createPinData', () => {
 	test('should create pin data from past execution data', () => {
-		const pinData = createPinData(wfUnderTestJson, executionDataJson);
+		const mockedNodes = ['When clicking ‘Test workflow’'].map((name) => ({ name }));
+
+		const pinData = createPinData(wfUnderTestJson, mockedNodes, executionDataJson);
 
 		expect(pinData).toEqual(
 			expect.objectContaining({
@@ -21,4 +23,34 @@ describe('createPinData', () => {
 			}),
 		);
 	});
+
+	test('should not create pin data for non-existing mocked nodes', () => {
+		const mockedNodes = ['Non-existing node'].map((name) => ({ name }));
+
+		const pinData = createPinData(wfUnderTestJson, mockedNodes, executionDataJson);
+
+		expect(pinData).toEqual({});
+	});
+
+	test('should create pin data for all mocked nodes', () => {
+		const mockedNodes = ['When clicking ‘Test workflow’', 'Edit Fields', 'Code'].map((name) => ({
+			name,
+		}));
+
+		const pinData = createPinData(wfUnderTestJson, mockedNodes, executionDataJson);
+
+		expect(pinData).toEqual(
+			expect.objectContaining({
+				'When clicking ‘Test workflow’': expect.anything(),
+				'Edit Fields': expect.anything(),
+				Code: expect.anything(),
+			}),
+		);
+	});
+
+	test('should return empty object if no mocked nodes are provided', () => {
+		const pinData = createPinData(wfUnderTestJson, [], executionDataJson);
+
+		expect(pinData).toEqual({});
+	});
 });
diff --git a/packages/cli/src/evaluation/test-runner/__tests__/test-runner.service.ee.test.ts b/packages/cli/src/evaluation/test-runner/__tests__/test-runner.service.ee.test.ts
index cdb8e848d96c8..f923cb4b73863 100644
--- a/packages/cli/src/evaluation/test-runner/__tests__/test-runner.service.ee.test.ts
+++ b/packages/cli/src/evaluation/test-runner/__tests__/test-runner.service.ee.test.ts
@@ -15,7 +15,11 @@ import type { ExecutionRepository } from '@/databases/repositories/execution.rep
 import type { TestMetricRepository } from '@/databases/repositories/test-metric.repository.ee';
 import type { TestRunRepository } from '@/databases/repositories/test-run.repository.ee';
 import type { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
+import { NodeTypes } from '@/node-types';
 import type { WorkflowRunner } from '@/workflow-runner';
+import { mockInstance } from '@test/mocking';
+import { mockNodeTypesData } from '@test-integration/utils/node-types-data';
 
 import { TestRunnerService } from '../test-runner.service.ee';
 
@@ -27,10 +31,28 @@ const wfEvaluationJson = JSON.parse(
 	readFileSync(path.join(__dirname, './mock-data/workflow.evaluation.json'), { encoding: 'utf-8' }),
 );
 
+const wfMultipleTriggersJson = JSON.parse(
+	readFileSync(path.join(__dirname, './mock-data/workflow.multiple-triggers.json'), {
+		encoding: 'utf-8',
+	}),
+);
+
 const executionDataJson = JSON.parse(
 	readFileSync(path.join(__dirname, './mock-data/execution-data.json'), { encoding: 'utf-8' }),
 );
 
+const executionDataMultipleTriggersJson = JSON.parse(
+	readFileSync(path.join(__dirname, './mock-data/execution-data.multiple-triggers.json'), {
+		encoding: 'utf-8',
+	}),
+);
+
+const executionDataMultipleTriggersJson2 = JSON.parse(
+	readFileSync(path.join(__dirname, './mock-data/execution-data.multiple-triggers-2.json'), {
+		encoding: 'utf-8',
+	}),
+);
+
 const executionMocks = [
 	mock<ExecutionEntity>({
 		id: 'some-execution-id',
@@ -93,6 +115,11 @@ describe('TestRunnerService', () => {
 	const testRunRepository = mock<TestRunRepository>();
 	const testMetricRepository = mock<TestMetricRepository>();
 
+	const mockNodeTypes = mockInstance(NodeTypes);
+	mockInstance(LoadNodesAndCredentials, {
+		loadedNodes: mockNodeTypesData(['manualTrigger', 'set', 'if', 'code']),
+	});
+
 	beforeEach(() => {
 		const executionsQbMock = mockDeep<SelectQueryBuilder<ExecutionEntity>>({
 			fallbackMockImplementation: jest.fn().mockReturnThis(),
@@ -131,6 +158,7 @@ describe('TestRunnerService', () => {
 			activeExecutions,
 			testRunRepository,
 			testMetricRepository,
+			mockNodeTypes,
 		);
 
 		expect(testRunnerService).toBeInstanceOf(TestRunnerService);
@@ -144,6 +172,7 @@ describe('TestRunnerService', () => {
 			activeExecutions,
 			testRunRepository,
 			testMetricRepository,
+			mockNodeTypes,
 		);
 
 		workflowRepository.findById.calledWith('workflow-under-test-id').mockResolvedValueOnce({
@@ -163,6 +192,7 @@ describe('TestRunnerService', () => {
 			mock<TestDefinition>({
 				workflowId: 'workflow-under-test-id',
 				evaluationWorkflowId: 'evaluation-workflow-id',
+				mockedNodes: [],
 			}),
 		);
 
@@ -179,6 +209,7 @@ describe('TestRunnerService', () => {
 			activeExecutions,
 			testRunRepository,
 			testMetricRepository,
+			mockNodeTypes,
 		);
 
 		workflowRepository.findById.calledWith('workflow-under-test-id').mockResolvedValueOnce({
@@ -219,6 +250,7 @@ describe('TestRunnerService', () => {
 			mock<TestDefinition>({
 				workflowId: 'workflow-under-test-id',
 				evaluationWorkflowId: 'evaluation-workflow-id',
+				mockedNodes: [{ name: 'When clicking ‘Test workflow’' }],
 			}),
 		);
 
@@ -265,4 +297,125 @@ describe('TestRunnerService', () => {
 			metric2: 0,
 		});
 	});
+
+	test('should specify correct start nodes when running workflow under test', async () => {
+		const testRunnerService = new TestRunnerService(
+			workflowRepository,
+			workflowRunner,
+			executionRepository,
+			activeExecutions,
+			testRunRepository,
+			testMetricRepository,
+			mockNodeTypes,
+		);
+
+		workflowRepository.findById.calledWith('workflow-under-test-id').mockResolvedValueOnce({
+			id: 'workflow-under-test-id',
+			...wfUnderTestJson,
+		});
+
+		workflowRepository.findById.calledWith('evaluation-workflow-id').mockResolvedValueOnce({
+			id: 'evaluation-workflow-id',
+			...wfEvaluationJson,
+		});
+
+		workflowRunner.run.mockResolvedValueOnce('some-execution-id');
+		workflowRunner.run.mockResolvedValueOnce('some-execution-id-2');
+		workflowRunner.run.mockResolvedValueOnce('some-execution-id-3');
+		workflowRunner.run.mockResolvedValueOnce('some-execution-id-4');
+
+		// Mock executions of workflow under test
+		activeExecutions.getPostExecutePromise
+			.calledWith('some-execution-id')
+			.mockResolvedValue(mockExecutionData());
+
+		activeExecutions.getPostExecutePromise
+			.calledWith('some-execution-id-3')
+			.mockResolvedValue(mockExecutionData());
+
+		// Mock executions of evaluation workflow
+		activeExecutions.getPostExecutePromise
+			.calledWith('some-execution-id-2')
+			.mockResolvedValue(mockEvaluationExecutionData({ metric1: 1, metric2: 0 }));
+
+		activeExecutions.getPostExecutePromise
+			.calledWith('some-execution-id-4')
+			.mockResolvedValue(mockEvaluationExecutionData({ metric1: 0.5 }));
+
+		await testRunnerService.runTest(
+			mock<User>(),
+			mock<TestDefinition>({
+				workflowId: 'workflow-under-test-id',
+				evaluationWorkflowId: 'evaluation-workflow-id',
+				mockedNodes: [{ name: 'When clicking ‘Test workflow’' }],
+			}),
+		);
+
+		expect(workflowRunner.run).toHaveBeenCalledTimes(4);
+
+		// Check workflow under test was executed
+		expect(workflowRunner.run).toHaveBeenCalledWith(
+			expect.objectContaining({
+				executionMode: 'evaluation',
+				pinData: {
+					'When clicking ‘Test workflow’':
+						executionDataJson.resultData.runData['When clicking ‘Test workflow’'][0].data.main[0],
+				},
+				workflowData: expect.objectContaining({
+					id: 'workflow-under-test-id',
+				}),
+				triggerToStartFrom: expect.objectContaining({
+					name: 'When clicking ‘Test workflow’',
+				}),
+			}),
+		);
+	});
+
+	test('should properly choose trigger and start nodes', async () => {
+		const testRunnerService = new TestRunnerService(
+			workflowRepository,
+			workflowRunner,
+			executionRepository,
+			activeExecutions,
+			testRunRepository,
+			testMetricRepository,
+			mockNodeTypes,
+		);
+
+		const startNodesData = (testRunnerService as any).getStartNodesData(
+			wfMultipleTriggersJson,
+			executionDataMultipleTriggersJson,
+		);
+
+		expect(startNodesData).toEqual({
+			startNodes: expect.arrayContaining([expect.objectContaining({ name: 'NoOp' })]),
+			triggerToStartFrom: expect.objectContaining({
+				name: 'When clicking ‘Test workflow’',
+			}),
+		});
+	});
+
+	test('should properly choose trigger and start nodes 2', async () => {
+		const testRunnerService = new TestRunnerService(
+			workflowRepository,
+			workflowRunner,
+			executionRepository,
+			activeExecutions,
+			testRunRepository,
+			testMetricRepository,
+			mockNodeTypes,
+		);
+
+		const startNodesData = (testRunnerService as any).getStartNodesData(
+			wfMultipleTriggersJson,
+			executionDataMultipleTriggersJson2,
+		);
+
+		expect(startNodesData).toEqual({
+			startNodes: expect.arrayContaining([expect.objectContaining({ name: 'NoOp' })]),
+			triggerToStartFrom: expect.objectContaining({
+				name: 'When chat message received',
+			}),
+		});
+	});
 });
diff --git a/packages/cli/src/evaluation/test-runner/test-runner.service.ee.ts b/packages/cli/src/evaluation/test-runner/test-runner.service.ee.ts
index 92f5e4394e275..9fcbe1de7c5bc 100644
--- a/packages/cli/src/evaluation/test-runner/test-runner.service.ee.ts
+++ b/packages/cli/src/evaluation/test-runner/test-runner.service.ee.ts
@@ -6,18 +6,20 @@ import type {
 	IRunExecutionData,
 	IWorkflowExecutionDataProcess,
 } from 'n8n-workflow';
+import { NodeConnectionType, Workflow } from 'n8n-workflow';
 import assert from 'node:assert';
 import { Service } from 'typedi';
 
 import { ActiveExecutions } from '@/active-executions';
 import type { ExecutionEntity } from '@/databases/entities/execution-entity';
-import type { TestDefinition } from '@/databases/entities/test-definition.ee';
+import type { MockedNodeItem, TestDefinition } from '@/databases/entities/test-definition.ee';
 import type { User } from '@/databases/entities/user';
 import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { TestMetricRepository } from '@/databases/repositories/test-metric.repository.ee';
 import { TestRunRepository } from '@/databases/repositories/test-run.repository.ee';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+import { NodeTypes } from '@/node-types';
 import { getRunData } from '@/workflow-execute-additional-data';
 import { WorkflowRunner } from '@/workflow-runner';
 
@@ -30,9 +32,7 @@ import { createPinData, getPastExecutionTriggerNode } from './utils.ee';
  * past executions, creates pin data from them,
  * and runs the workflow-under-test with the pin data.
  * After the workflow-under-test finishes, it runs the evaluation workflow
- * with the original and new run data.
- * TODO: Node pinning
- * TODO: Collect metrics
+ * with the original and new run data, and collects the metrics.
  */
 @Service()
 export class TestRunnerService {
@@ -43,8 +43,50 @@ export class TestRunnerService {
 		private readonly activeExecutions: ActiveExecutions,
 		private readonly testRunRepository: TestRunRepository,
 		private readonly testMetricRepository: TestMetricRepository,
+		private readonly nodeTypes: NodeTypes,
 	) {}
 
+	/**
+	 * Prepares the start nodes and trigger node data props for the `workflowRunner.run` method input.
+	 */
+	private getStartNodesData(
+		workflow: WorkflowEntity,
+		pastExecutionData: IRunExecutionData,
+	): Pick<IWorkflowExecutionDataProcess, 'startNodes' | 'triggerToStartFrom'> {
+		// Create a new workflow instance to use the helper functions (getChildNodes)
+		const workflowInstance = new Workflow({
+			nodes: workflow.nodes,
+			connections: workflow.connections,
+			active: false,
+			nodeTypes: this.nodeTypes,
+		});
+
+		// Determine the trigger node of the past execution
+		const pastExecutionTriggerNode = getPastExecutionTriggerNode(pastExecutionData);
+		assert(pastExecutionTriggerNode, 'Could not find the trigger node of the past execution');
+
+		const triggerNodeData = pastExecutionData.resultData.runData[pastExecutionTriggerNode][0];
+		assert(triggerNodeData, 'Trigger node data not found');
+
+		const triggerToStartFrom = {
+			name: pastExecutionTriggerNode,
+			data: triggerNodeData,
+		};
+
+		// Start nodes are the nodes that are connected to the trigger node
+		const startNodes = workflowInstance
+			.getChildNodes(pastExecutionTriggerNode, NodeConnectionType.Main, 1)
+			.map((nodeName) => ({
+				name: nodeName,
+				sourceData: { previousNode: pastExecutionTriggerNode },
+			}));
+
+		return {
+			startNodes,
+			triggerToStartFrom,
+		};
+	}
+
 	/**
 	 * Runs a test case with the given pin data.
 	 * Waits for the workflow under test to finish execution.
@@ -52,25 +94,19 @@ export class TestRunnerService {
 	private async runTestCase(
 		workflow: WorkflowEntity,
 		pastExecutionData: IRunExecutionData,
+		mockedNodes: MockedNodeItem[],
 		userId: string,
 	): Promise<IRun | undefined> {
 		// Create pin data from the past execution data
-		const pinData = createPinData(workflow, pastExecutionData);
-
-		// Determine the start node of the past execution
-		const pastExecutionStartNode = getPastExecutionTriggerNode(pastExecutionData);
+		const pinData = createPinData(workflow, mockedNodes, pastExecutionData);
 
 		// Prepare the data to run the workflow
 		const data: IWorkflowExecutionDataProcess = {
-			destinationNode: pastExecutionData.startData?.destinationNode,
-			startNodes: pastExecutionStartNode
-				? [{ name: pastExecutionStartNode, sourceData: null }]
-				: undefined,
+			...this.getStartNodesData(workflow, pastExecutionData),
 			executionMode: 'evaluation',
 			runData: {},
 			pinData,
 			workflowData: workflow,
-			partialExecutionVersion: '-1',
 			userId,
 		};
 
@@ -150,7 +186,7 @@ export class TestRunnerService {
 	/**
 	 * Creates a new test run for the given test definition.
 	 */
-	public async runTest(user: User, test: TestDefinition): Promise<void> {
+	async runTest(user: User, test: TestDefinition): Promise<void> {
 		const workflow = await this.workflowRepository.findById(test.workflowId);
 		assert(workflow, 'Workflow not found');
 
@@ -196,7 +232,12 @@ export class TestRunnerService {
 			const executionData = parse(pastExecution.executionData.data) as IRunExecutionData;
 
 			// Run the test case and wait for it to finish
-			const testCaseExecution = await this.runTestCase(workflow, executionData, user.id);
+			const testCaseExecution = await this.runTestCase(
+				workflow,
+				executionData,
+				test.mockedNodes,
+				user.id,
+			);
 
 			// In case of a permission check issue, the test case execution will be undefined.
 			// Skip them and continue with the next test case
diff --git a/packages/cli/src/evaluation/test-runner/utils.ee.ts b/packages/cli/src/evaluation/test-runner/utils.ee.ts
index c2ef68a5dce2f..9cb516b4309ac 100644
--- a/packages/cli/src/evaluation/test-runner/utils.ee.ts
+++ b/packages/cli/src/evaluation/test-runner/utils.ee.ts
@@ -1,21 +1,29 @@
 import type { IRunExecutionData, IPinData } from 'n8n-workflow';
 
+import type { MockedNodeItem } from '@/databases/entities/test-definition.ee';
 import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
 
 /**
  * Extracts the execution data from the past execution
  * and creates a pin data object from it for the given workflow.
- * For now, it only pins trigger nodes.
+ * It uses a list of mocked nodes defined in a test definition
+ * to decide which nodes to pin.
  */
-export function createPinData(workflow: WorkflowEntity, executionData: IRunExecutionData) {
-	const triggerNodes = workflow.nodes.filter((node) => /trigger$/i.test(node.type));
-
+export function createPinData(
+	workflow: WorkflowEntity,
+	mockedNodes: MockedNodeItem[],
+	executionData: IRunExecutionData,
+) {
 	const pinData = {} as IPinData;
 
-	for (const triggerNode of triggerNodes) {
-		const triggerData = executionData.resultData.runData[triggerNode.name];
-		if (triggerData?.[0]?.data?.main?.[0]) {
-			pinData[triggerNode.name] = triggerData[0]?.data?.main?.[0];
+	const workflowNodeNames = new Set(workflow.nodes.map((node) => node.name));
+
+	for (const mockedNode of mockedNodes) {
+		if (workflowNodeNames.has(mockedNode.name)) {
+			const nodeData = executionData.resultData.runData[mockedNode.name];
+			if (nodeData?.[0]?.data?.main?.[0]) {
+				pinData[mockedNode.name] = nodeData[0]?.data?.main?.[0];
+			}
 		}
 	}
 
@@ -23,8 +31,8 @@ export function createPinData(workflow: WorkflowEntity, executionData: IRunExecu
 }
 
 /**
- * Returns the start node of the past execution.
- * The start node is the node that has no source and has run data.
+ * Returns the trigger node of the past execution.
+ * The trigger node is the node that has no source and has run data.
  */
 export function getPastExecutionTriggerNode(executionData: IRunExecutionData) {
 	return Object.keys(executionData.resultData.runData).find((nodeName) => {
diff --git a/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-sentry.ee.ts b/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-sentry.ee.ts
index 5678cbb59c4f4..35aef63cb1aee 100644
--- a/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-sentry.ee.ts
+++ b/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-sentry.ee.ts
@@ -48,7 +48,7 @@ export class MessageEventBusDestinationSentry
 			environment,
 			release: N8N_VERSION,
 			transport: Sentry.makeNodeTransport,
-			integrations: Sentry.defaultIntegrations,
+			integrations: Sentry.getDefaultIntegrations({}),
 			stackParser: Sentry.defaultStackParser,
 		});
 	}
diff --git a/packages/cli/src/eventbus/message-event-bus-writer/message-event-bus-log-writer.ts b/packages/cli/src/eventbus/message-event-bus-writer/message-event-bus-log-writer.ts
index 6c6a928a676b2..3f3cb50b185dd 100644
--- a/packages/cli/src/eventbus/message-event-bus-writer/message-event-bus-log-writer.ts
+++ b/packages/cli/src/eventbus/message-event-bus-writer/message-event-bus-log-writer.ts
@@ -70,7 +70,7 @@ export class MessageEventBusLogWriter {
 		this.globalConfig = Container.get(GlobalConfig);
 	}
 
-	public get worker(): Worker | undefined {
+	get worker(): Worker | undefined {
 		return this._worker;
 	}
 
diff --git a/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts b/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts
index 58d694e5560ec..4448dbc41ee55 100644
--- a/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts
+++ b/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts
@@ -1,5 +1,6 @@
 import type { GlobalConfig } from '@n8n/config';
 import { mock } from 'jest-mock-extended';
+import { InstanceSettings } from 'n8n-core';
 import type { IWorkflowBase } from 'n8n-workflow';
 
 import { N8N_VERSION } from '@/constants';
@@ -14,6 +15,7 @@ import type { IWorkflowDb } from '@/interfaces';
 import type { License } from '@/license';
 import type { NodeTypes } from '@/node-types';
 import type { Telemetry } from '@/telemetry';
+import { mockInstance } from '@test/mocking';
 
 const flushPromises = async () => await new Promise((resolve) => setImmediate(resolve));
 
@@ -41,6 +43,7 @@ describe('TelemetryEventRelay', () => {
 			outputs: ['console'],
 		},
 	});
+	const instanceSettings = mockInstance(InstanceSettings, { isDocker: false, n8nFolder: '/test' });
 	const workflowRepository = mock<WorkflowRepository>();
 	const nodeTypes = mock<NodeTypes>();
 	const sharedWorkflowRepository = mock<SharedWorkflowRepository>();
@@ -55,6 +58,7 @@ describe('TelemetryEventRelay', () => {
 			telemetry,
 			license,
 			globalConfig,
+			instanceSettings,
 			workflowRepository,
 			nodeTypes,
 			sharedWorkflowRepository,
@@ -65,11 +69,8 @@ describe('TelemetryEventRelay', () => {
 	});
 
 	beforeEach(() => {
-		globalConfig.diagnostics.enabled = true;
-	});
-
-	afterEach(() => {
 		jest.clearAllMocks();
+		globalConfig.diagnostics.enabled = true;
 	});
 
 	describe('init', () => {
@@ -80,6 +81,7 @@ describe('TelemetryEventRelay', () => {
 				telemetry,
 				license,
 				globalConfig,
+				instanceSettings,
 				workflowRepository,
 				nodeTypes,
 				sharedWorkflowRepository,
@@ -101,6 +103,7 @@ describe('TelemetryEventRelay', () => {
 				telemetry,
 				license,
 				globalConfig,
+				instanceSettings,
 				workflowRepository,
 				nodeTypes,
 				sharedWorkflowRepository,
@@ -942,7 +945,36 @@ describe('TelemetryEventRelay', () => {
 
 			await flushPromises();
 
-			// expect(telemetry.identify).toHaveBeenCalled();
+			expect(telemetry.identify).toHaveBeenCalledWith(
+				expect.objectContaining({
+					version_cli: N8N_VERSION,
+					metrics: {
+						metrics_category_cache: false,
+						metrics_category_default: true,
+						metrics_category_logs: false,
+						metrics_category_queue: false,
+						metrics_category_routes: false,
+						metrics_enabled: true,
+					},
+					n8n_binary_data_mode: 'default',
+					n8n_deployment_type: 'default',
+					saml_enabled: false,
+					smtp_set_up: true,
+					system_info: {
+						is_docker: false,
+						cpus: expect.objectContaining({
+							count: expect.any(Number),
+							model: expect.any(String),
+							speed: expect.any(Number),
+						}),
+						memory: expect.any(Number),
+						os: expect.objectContaining({
+							type: expect.any(String),
+							version: expect.any(String),
+						}),
+					},
+				}),
+			);
 			expect(telemetry.track).toHaveBeenCalledWith(
 				'Instance started',
 				expect.objectContaining({
diff --git a/packages/cli/src/events/maps/pub-sub.event-map.ts b/packages/cli/src/events/maps/pub-sub.event-map.ts
index ff27741b9b772..0d71fcff91510 100644
--- a/packages/cli/src/events/maps/pub-sub.event-map.ts
+++ b/packages/cli/src/events/maps/pub-sub.event-map.ts
@@ -1,4 +1,4 @@
-import type { PushType, WorkerStatus } from '@n8n/api-types';
+import type { PushMessage, WorkerStatus } from '@n8n/api-types';
 
 import type { IWorkflowDb } from '@/interfaces';
 
@@ -64,9 +64,7 @@ export type PubSubCommandMap = {
 		errorMessage: string;
 	};
 
-	'relay-execution-lifecycle-event': {
-		type: PushType;
-		args: Record<string, unknown>;
+	'relay-execution-lifecycle-event': PushMessage & {
 		pushRef: string;
 	};
 
diff --git a/packages/cli/src/events/relays/telemetry.event-relay.ts b/packages/cli/src/events/relays/telemetry.event-relay.ts
index 0a352087e5e41..a34646f100f5f 100644
--- a/packages/cli/src/events/relays/telemetry.event-relay.ts
+++ b/packages/cli/src/events/relays/telemetry.event-relay.ts
@@ -1,5 +1,6 @@
 import { GlobalConfig } from '@n8n/config';
 import { snakeCase } from 'change-case';
+import { InstanceSettings } from 'n8n-core';
 import type { ExecutionStatus, INodesGraphResult, ITelemetryTrackProperties } from 'n8n-workflow';
 import { TelemetryHelpers } from 'n8n-workflow';
 import os from 'node:os';
@@ -28,6 +29,7 @@ export class TelemetryEventRelay extends EventRelay {
 		private readonly telemetry: Telemetry,
 		private readonly license: License,
 		private readonly globalConfig: GlobalConfig,
+		private readonly instanceSettings: InstanceSettings,
 		private readonly workflowRepository: WorkflowRepository,
 		private readonly nodeTypes: NodeTypes,
 		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
@@ -760,6 +762,7 @@ export class TelemetryEventRelay extends EventRelay {
 					model: cpus[0].model,
 					speed: cpus[0].speed,
 				},
+				is_docker: this.instanceSettings.isDocker,
 			},
 			execution_variables: {
 				executions_mode: config.getEnv('executions.mode'),
diff --git a/packages/cli/src/execution-lifecycle-hooks/__tests__/save-execution-progress.test.ts b/packages/cli/src/execution-lifecycle-hooks/__tests__/save-execution-progress.test.ts
index d89f2fb734d2f..eedbf27c9e6eb 100644
--- a/packages/cli/src/execution-lifecycle-hooks/__tests__/save-execution-progress.test.ts
+++ b/packages/cli/src/execution-lifecycle-hooks/__tests__/save-execution-progress.test.ts
@@ -1,9 +1,5 @@
-import {
-	ErrorReporterProxy,
-	type IRunExecutionData,
-	type ITaskData,
-	type IWorkflowBase,
-} from 'n8n-workflow';
+import { ErrorReporter } from 'n8n-core';
+import type { IRunExecutionData, ITaskData, IWorkflowBase } from 'n8n-workflow';
 
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { saveExecutionProgress } from '@/execution-lifecycle-hooks/save-execution-progress';
@@ -13,7 +9,7 @@ import { Logger } from '@/logging/logger.service';
 import { mockInstance } from '@test/mocking';
 
 mockInstance(Logger);
-
+const errorReporter = mockInstance(ErrorReporter);
 const executionRepository = mockInstance(ExecutionRepository);
 
 afterEach(() => {
@@ -63,8 +59,6 @@ test('should update execution when saving progress is enabled', async () => {
 		progress: true,
 	});
 
-	const reporterSpy = jest.spyOn(ErrorReporterProxy, 'error');
-
 	executionRepository.findSingleExecution.mockResolvedValue({} as IExecutionResponse);
 
 	await saveExecutionProgress(...commonArgs);
@@ -83,7 +77,7 @@ test('should update execution when saving progress is enabled', async () => {
 		status: 'running',
 	});
 
-	expect(reporterSpy).not.toHaveBeenCalled();
+	expect(errorReporter.error).not.toHaveBeenCalled();
 });
 
 test('should report error on failure', async () => {
@@ -92,8 +86,6 @@ test('should report error on failure', async () => {
 		progress: true,
 	});
 
-	const reporterSpy = jest.spyOn(ErrorReporterProxy, 'error');
-
 	const error = new Error('Something went wrong');
 
 	executionRepository.findSingleExecution.mockImplementation(() => {
@@ -103,5 +95,5 @@ test('should report error on failure', async () => {
 	await saveExecutionProgress(...commonArgs);
 
 	expect(executionRepository.updateExistingExecution).not.toHaveBeenCalled();
-	expect(reporterSpy).toHaveBeenCalledWith(error);
+	expect(errorReporter.error).toHaveBeenCalledWith(error);
 });
diff --git a/packages/cli/src/execution-lifecycle-hooks/save-execution-progress.ts b/packages/cli/src/execution-lifecycle-hooks/save-execution-progress.ts
index ca9899e1ec1a2..c1de2646c0269 100644
--- a/packages/cli/src/execution-lifecycle-hooks/save-execution-progress.ts
+++ b/packages/cli/src/execution-lifecycle-hooks/save-execution-progress.ts
@@ -1,5 +1,5 @@
+import { ErrorReporter } from 'n8n-core';
 import type { IRunExecutionData, ITaskData, IWorkflowBase } from 'n8n-workflow';
-import { ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
 import { Container } from 'typedi';
 
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
@@ -85,7 +85,7 @@ export async function saveExecutionProgress(
 	} catch (e) {
 		const error = e instanceof Error ? e : new Error(`${e}`);
 
-		ErrorReporter.error(error);
+		Container.get(ErrorReporter).error(error);
 		// TODO: Improve in the future!
 		// Errors here might happen because of database access
 		// For busy machines, we may get "Database is locked" errors.
diff --git a/packages/cli/src/executions/execution-recovery.service.ts b/packages/cli/src/executions/execution-recovery.service.ts
index 33576d1368d0a..a10fc995a472d 100644
--- a/packages/cli/src/executions/execution-recovery.service.ts
+++ b/packages/cli/src/executions/execution-recovery.service.ts
@@ -49,7 +49,7 @@ export class ExecutionRecoveryService {
 
 		this.push.once('editorUiConnected', async () => {
 			await sleep(1000);
-			this.push.broadcast('executionRecovered', { executionId });
+			this.push.broadcast({ type: 'executionRecovered', data: { executionId } });
 		});
 
 		return amendedExecution;
diff --git a/packages/cli/src/executions/execution.service.ts b/packages/cli/src/executions/execution.service.ts
index 67eb145b19204..433955254f698 100644
--- a/packages/cli/src/executions/execution.service.ts
+++ b/packages/cli/src/executions/execution.service.ts
@@ -504,7 +504,7 @@ export class ExecutionService {
 		}
 	}
 
-	public async annotate(
+	async annotate(
 		executionId: string,
 		updateData: ExecutionRequest.ExecutionUpdatePayload,
 		sharedWorkflowIds: string[],
diff --git a/packages/cli/src/expression-evaluator.ts b/packages/cli/src/expression-evaluator.ts
index 9a91b4864f52d..434c78e114bbf 100644
--- a/packages/cli/src/expression-evaluator.ts
+++ b/packages/cli/src/expression-evaluator.ts
@@ -1,4 +1,6 @@
-import { ErrorReporterProxy, ExpressionEvaluatorProxy } from 'n8n-workflow';
+import { ErrorReporter } from 'n8n-core';
+import { ExpressionEvaluatorProxy } from 'n8n-workflow';
+import Container from 'typedi';
 
 import config from '@/config';
 
@@ -6,7 +8,7 @@ export const initExpressionEvaluator = () => {
 	ExpressionEvaluatorProxy.setEvaluator(config.getEnv('expression.evaluator'));
 	ExpressionEvaluatorProxy.setDifferEnabled(config.getEnv('expression.reportDifference'));
 	ExpressionEvaluatorProxy.setDiffReporter((expr) => {
-		ErrorReporterProxy.warn('Expression difference', {
+		Container.get(ErrorReporter).warn('Expression difference', {
 			extra: {
 				expression: expr,
 			},
diff --git a/packages/cli/src/license.ts b/packages/cli/src/license.ts
index 8f1bd26e64b53..2a3ae6fd6dee6 100644
--- a/packages/cli/src/license.ts
+++ b/packages/cli/src/license.ts
@@ -9,7 +9,6 @@ import { SettingsRepository } from '@/databases/repositories/settings.repository
 import { OnShutdown } from '@/decorators/on-shutdown';
 import { Logger } from '@/logging/logger.service';
 import { LicenseMetricsService } from '@/metrics/license-metrics.service';
-import { OrchestrationService } from '@/services/orchestration.service';
 
 import {
 	LICENSE_FEATURES,
@@ -35,7 +34,6 @@ export class License {
 	constructor(
 		private readonly logger: Logger,
 		private readonly instanceSettings: InstanceSettings,
-		private readonly orchestrationService: OrchestrationService,
 		private readonly settingsRepository: SettingsRepository,
 		private readonly licenseMetricsService: LicenseMetricsService,
 		private readonly globalConfig: GlobalConfig,
@@ -138,23 +136,24 @@ export class License {
 		this.logger.debug('License feature change detected', _features);
 
 		if (config.getEnv('executions.mode') === 'queue' && this.globalConfig.multiMainSetup.enabled) {
-			const isMultiMainLicensed = _features[LICENSE_FEATURES.MULTIPLE_MAIN_INSTANCES] as
-				| boolean
-				| undefined;
+			const isMultiMainLicensed =
+				(_features[LICENSE_FEATURES.MULTIPLE_MAIN_INSTANCES] as boolean | undefined) ?? false;
 
-			this.orchestrationService.setMultiMainSetupLicensed(isMultiMainLicensed ?? false);
+			this.instanceSettings.setMultiMainLicensed(isMultiMainLicensed);
 
-			if (this.orchestrationService.isMultiMainSetupEnabled && this.instanceSettings.isFollower) {
-				this.logger.debug(
-					'[Multi-main setup] Instance is follower, skipping sending of "reload-license" command...',
-				);
+			if (this.instanceSettings.isMultiMain && !this.instanceSettings.isLeader) {
+				this.logger
+					.scoped(['scaling', 'multi-main-setup', 'license'])
+					.debug('Instance is not leader, skipping sending of "reload-license" command...');
 				return;
 			}
 
-			if (this.orchestrationService.isMultiMainSetupEnabled && !isMultiMainLicensed) {
-				this.logger.debug(
-					'[Multi-main setup] License changed with no support for multi-main setup - no new followers will be allowed to init. To restore multi-main setup, please upgrade to a license that supports this feature.',
-				);
+			if (this.globalConfig.multiMainSetup.enabled && !isMultiMainLicensed) {
+				this.logger
+					.scoped(['scaling', 'multi-main-setup', 'license'])
+					.debug(
+						'License changed with no support for multi-main setup - no new followers will be allowed to init. To restore multi-main setup, please upgrade to a license that supports this feature.',
+					);
 			}
 		}
 
diff --git a/packages/cli/src/load-nodes-and-credentials.ts b/packages/cli/src/load-nodes-and-credentials.ts
index 22273fb89462d..db62e8415ea71 100644
--- a/packages/cli/src/load-nodes-and-credentials.ts
+++ b/packages/cli/src/load-nodes-and-credentials.ts
@@ -4,10 +4,13 @@ import fsPromises from 'fs/promises';
 import type { Class, DirectoryLoader, Types } from 'n8n-core';
 import {
 	CUSTOM_EXTENSION_ENV,
+	ErrorReporter,
 	InstanceSettings,
 	CustomDirectoryLoader,
 	PackageDirectoryLoader,
 	LazyPackageDirectoryLoader,
+	UnrecognizedCredentialTypeError,
+	UnrecognizedNodeTypeError,
 } from 'n8n-core';
 import type {
 	KnownNodesAndCredentials,
@@ -15,8 +18,13 @@ import type {
 	INodeTypeDescription,
 	INodeTypeData,
 	ICredentialTypeData,
+	LoadedClass,
+	ICredentialType,
+	INodeType,
+	IVersionedNodeType,
+	INodeProperties,
 } from 'n8n-workflow';
-import { NodeHelpers, ApplicationError, ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
+import { ApplicationError, NodeConnectionType } from 'n8n-workflow';
 import path from 'path';
 import picocolors from 'picocolors';
 import { Container, Service } from 'typedi';
@@ -57,6 +65,7 @@ export class LoadNodesAndCredentials {
 
 	constructor(
 		private readonly logger: Logger,
+		private readonly errorReporter: ErrorReporter,
 		private readonly instanceSettings: InstanceSettings,
 		private readonly globalConfig: GlobalConfig,
 	) {}
@@ -149,7 +158,7 @@ export class LoadNodesAndCredentials {
 				);
 			} catch (error) {
 				this.logger.error((error as Error).message);
-				ErrorReporter.error(error);
+				this.errorReporter.error(error);
 			}
 		}
 	}
@@ -285,7 +294,7 @@ export class LoadNodesAndCredentials {
 		for (const usableNode of usableNodes) {
 			const description: INodeTypeBaseDescription | INodeTypeDescription =
 				structuredClone(usableNode);
-			const wrapped = NodeHelpers.convertNodeToAiTool({ description }).description;
+			const wrapped = this.convertNodeToAiTool({ description }).description;
 
 			this.types.nodes.push(wrapped);
 			this.known.nodes[wrapped.name] = structuredClone(this.known.nodes[usableNode.name]);
@@ -307,13 +316,18 @@ export class LoadNodesAndCredentials {
 
 		for (const loader of Object.values(this.loaders)) {
 			// list of node & credential types that will be sent to the frontend
-			const { known, types, directory } = loader;
-			this.types.nodes = this.types.nodes.concat(types.nodes);
+			const { known, types, directory, packageName } = loader;
+			this.types.nodes = this.types.nodes.concat(
+				types.nodes.map(({ name, ...rest }) => ({
+					...rest,
+					name: `${packageName}.${name}`,
+				})),
+			);
 			this.types.credentials = this.types.credentials.concat(types.credentials);
 
 			// Nodes and credentials that have been loaded immediately
 			for (const nodeTypeName in loader.nodeTypes) {
-				this.loaded.nodes[nodeTypeName] = loader.nodeTypes[nodeTypeName];
+				this.loaded.nodes[`${packageName}.${nodeTypeName}`] = loader.nodeTypes[nodeTypeName];
 			}
 
 			for (const credentialTypeName in loader.credentialTypes) {
@@ -322,7 +336,7 @@ export class LoadNodesAndCredentials {
 
 			for (const type in known.nodes) {
 				const { className, sourcePath } = known.nodes[type];
-				this.known.nodes[type] = {
+				this.known.nodes[`${packageName}.${type}`] = {
 					className,
 					sourcePath: path.join(directory, sourcePath),
 				};
@@ -356,6 +370,128 @@ export class LoadNodesAndCredentials {
 		}
 	}
 
+	getNode(fullNodeType: string): LoadedClass<INodeType | IVersionedNodeType> {
+		const [packageName, nodeType] = fullNodeType.split('.');
+		const { loaders } = this;
+		const loader = loaders[packageName];
+		if (!loader) {
+			throw new UnrecognizedNodeTypeError(packageName, nodeType);
+		}
+		return loader.getNode(nodeType);
+	}
+
+	getCredential(credentialType: string): LoadedClass<ICredentialType> {
+		const { loadedCredentials } = this;
+
+		for (const loader of Object.values(this.loaders)) {
+			if (credentialType in loader.known.credentials) {
+				const loaded = loader.getCredential(credentialType);
+				loadedCredentials[credentialType] = loaded;
+			}
+		}
+
+		if (credentialType in loadedCredentials) {
+			return loadedCredentials[credentialType];
+		}
+
+		throw new UnrecognizedCredentialTypeError(credentialType);
+	}
+
+	/**
+	 * Modifies the description of the passed in object, such that it can be used
+	 * as an AI Agent Tool.
+	 * Returns the modified item (not copied)
+	 */
+	convertNodeToAiTool<
+		T extends object & { description: INodeTypeDescription | INodeTypeBaseDescription },
+	>(item: T): T {
+		// quick helper function for type-guard down below
+		function isFullDescription(obj: unknown): obj is INodeTypeDescription {
+			return typeof obj === 'object' && obj !== null && 'properties' in obj;
+		}
+
+		if (isFullDescription(item.description)) {
+			item.description.name += 'Tool';
+			item.description.inputs = [];
+			item.description.outputs = [NodeConnectionType.AiTool];
+			item.description.displayName += ' Tool';
+			delete item.description.usableAsTool;
+
+			const hasResource = item.description.properties.some((prop) => prop.name === 'resource');
+			const hasOperation = item.description.properties.some((prop) => prop.name === 'operation');
+
+			if (!item.description.properties.map((prop) => prop.name).includes('toolDescription')) {
+				const descriptionType: INodeProperties = {
+					displayName: 'Tool Description',
+					name: 'descriptionType',
+					type: 'options',
+					noDataExpression: true,
+					options: [
+						{
+							name: 'Set Automatically',
+							value: 'auto',
+							description: 'Automatically set based on resource and operation',
+						},
+						{
+							name: 'Set Manually',
+							value: 'manual',
+							description: 'Manually set the description',
+						},
+					],
+					default: 'auto',
+				};
+
+				const descProp: INodeProperties = {
+					displayName: 'Description',
+					name: 'toolDescription',
+					type: 'string',
+					default: item.description.description,
+					required: true,
+					typeOptions: { rows: 2 },
+					description:
+						'Explain to the LLM what this tool does, a good, specific description would allow LLMs to produce expected results much more often',
+					placeholder: `e.g. ${item.description.description}`,
+				};
+
+				const noticeProp: INodeProperties = {
+					displayName:
+						"Use the expression {{ $fromAI('placeholder_name') }} for any data to be filled by the model",
+					name: 'notice',
+					type: 'notice',
+					default: '',
+				};
+
+				item.description.properties.unshift(descProp);
+
+				// If node has resource or operation we can determine pre-populate tool description based on it
+				// so we add the descriptionType property as the first property
+				if (hasResource || hasOperation) {
+					item.description.properties.unshift(descriptionType);
+
+					descProp.displayOptions = {
+						show: {
+							descriptionType: ['manual'],
+						},
+					};
+				}
+
+				item.description.properties.unshift(noticeProp);
+			}
+		}
+
+		const resources = item.description.codex?.resources ?? {};
+
+		item.description.codex = {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Tools'],
+				Tools: ['Other Tools'],
+			},
+			resources,
+		};
+		return item;
+	}
+
 	async setupHotReload() {
 		const { default: debounce } = await import('lodash/debounce');
 		// eslint-disable-next-line import/no-extraneous-dependencies
@@ -384,7 +520,7 @@ export class LoadNodesAndCredentials {
 				loader.reset();
 				await loader.loadAll();
 				await this.postProcessLoaders();
-				push.broadcast('nodeDescriptionUpdated', {});
+				push.broadcast({ type: 'nodeDescriptionUpdated', data: {} });
 			}, 100);
 
 			const toWatch = loader.isLazyLoaded
diff --git a/packages/cli/src/logging/logger.service.ts b/packages/cli/src/logging/logger.service.ts
index 46471c06112f5..46441e5a339ca 100644
--- a/packages/cli/src/logging/logger.service.ts
+++ b/packages/cli/src/logging/logger.service.ts
@@ -2,7 +2,7 @@ import type { LogScope } from '@n8n/config';
 import { GlobalConfig } from '@n8n/config';
 import callsites from 'callsites';
 import type { TransformableInfo } from 'logform';
-import { InstanceSettings } from 'n8n-core';
+import { InstanceSettings, isObjectLiteral } from 'n8n-core';
 import { LoggerProxy, LOG_LEVELS } from 'n8n-workflow';
 import path, { basename } from 'node:path';
 import pc from 'picocolors';
@@ -10,7 +10,6 @@ import { Service } from 'typedi';
 import winston from 'winston';
 
 import { inDevelopment, inProduction } from '@/constants';
-import { isObjectLiteral } from '@/utils';
 
 import { noOp } from './constants';
 import type { LogLocationMetadata, LogLevel, LogMetadata } from './types';
diff --git a/packages/cli/src/manual-execution.service.ts b/packages/cli/src/manual-execution.service.ts
new file mode 100644
index 0000000000000..65174d20b50f8
--- /dev/null
+++ b/packages/cli/src/manual-execution.service.ts
@@ -0,0 +1,124 @@
+import * as a from 'assert/strict';
+import {
+	DirectedGraph,
+	filterDisabledNodes,
+	recreateNodeExecutionStack,
+	WorkflowExecute,
+} from 'n8n-core';
+import type {
+	IPinData,
+	IRun,
+	IRunExecutionData,
+	IWorkflowExecuteAdditionalData,
+	IWorkflowExecutionDataProcess,
+	Workflow,
+} from 'n8n-workflow';
+import type PCancelable from 'p-cancelable';
+import { Service } from 'typedi';
+
+import { Logger } from '@/logging/logger.service';
+
+@Service()
+export class ManualExecutionService {
+	constructor(private readonly logger: Logger) {}
+
+	getExecutionStartNode(data: IWorkflowExecutionDataProcess, workflow: Workflow) {
+		let startNode;
+		if (
+			data.startNodes?.length === 1 &&
+			Object.keys(data.pinData ?? {}).includes(data.startNodes[0].name)
+		) {
+			startNode = workflow.getNode(data.startNodes[0].name) ?? undefined;
+		}
+
+		return startNode;
+	}
+
+	// eslint-disable-next-line @typescript-eslint/promise-function-async
+	runManually(
+		data: IWorkflowExecutionDataProcess,
+		workflow: Workflow,
+		additionalData: IWorkflowExecuteAdditionalData,
+		executionId: string,
+		pinData?: IPinData,
+	): PCancelable<IRun> {
+		if (data.triggerToStartFrom?.data && data.startNodes && !data.destinationNode) {
+			this.logger.debug(
+				`Execution ID ${executionId} had triggerToStartFrom. Starting from that trigger.`,
+				{ executionId },
+			);
+			const startNodes = data.startNodes.map((startNode) => {
+				const node = workflow.getNode(startNode.name);
+				a.ok(node, `Could not find a node named "${startNode.name}" in the workflow.`);
+				return node;
+			});
+			const runData = { [data.triggerToStartFrom.name]: [data.triggerToStartFrom.data] };
+
+			const { nodeExecutionStack, waitingExecution, waitingExecutionSource } =
+				recreateNodeExecutionStack(
+					filterDisabledNodes(DirectedGraph.fromWorkflow(workflow)),
+					new Set(startNodes),
+					runData,
+					data.pinData ?? {},
+				);
+			const executionData: IRunExecutionData = {
+				resultData: { runData, pinData },
+				executionData: {
+					contextData: {},
+					metadata: {},
+					nodeExecutionStack,
+					waitingExecution,
+					waitingExecutionSource,
+				},
+			};
+
+			const workflowExecute = new WorkflowExecute(additionalData, 'manual', executionData);
+			return workflowExecute.processRunExecutionData(workflow);
+		} else if (
+			data.runData === undefined ||
+			data.startNodes === undefined ||
+			data.startNodes.length === 0
+		) {
+			// Full Execution
+			// TODO: When the old partial execution logic is removed this block can
+			// be removed and the previous one can be merged into
+			// `workflowExecute.runPartialWorkflow2`.
+			// Partial executions then require either a destination node from which
+			// everything else can be derived, or a triggerToStartFrom with
+			// triggerData.
+			this.logger.debug(`Execution ID ${executionId} will run executing all nodes.`, {
+				executionId,
+			});
+			// Execute all nodes
+
+			const startNode = this.getExecutionStartNode(data, workflow);
+
+			// Can execute without webhook so go on
+			const workflowExecute = new WorkflowExecute(additionalData, data.executionMode);
+			return workflowExecute.run(workflow, startNode, data.destinationNode, data.pinData);
+		} else {
+			// Partial Execution
+			this.logger.debug(`Execution ID ${executionId} is a partial execution.`, { executionId });
+			// Execute only the nodes between start and destination nodes
+			const workflowExecute = new WorkflowExecute(additionalData, data.executionMode);
+
+			if (data.partialExecutionVersion === '1') {
+				return workflowExecute.runPartialWorkflow2(
+					workflow,
+					data.runData,
+					data.pinData,
+					data.dirtyNodeNames,
+					data.destinationNode,
+				);
+			} else {
+				return workflowExecute.runPartialWorkflow(
+					workflow,
+					data.runData,
+					data.startNodes,
+					data.destinationNode,
+					data.pinData,
+				);
+			}
+		}
+	}
+}
diff --git a/packages/cli/src/middlewares/list-query/dtos/base.filter.dto.ts b/packages/cli/src/middlewares/list-query/dtos/base.filter.dto.ts
index 678cb86981ccb..9fa5c216774b3 100644
--- a/packages/cli/src/middlewares/list-query/dtos/base.filter.dto.ts
+++ b/packages/cli/src/middlewares/list-query/dtos/base.filter.dto.ts
@@ -1,9 +1,8 @@
 import { plainToInstance, instanceToPlain } from 'class-transformer';
 import { validate } from 'class-validator';
+import { isObjectLiteral } from 'n8n-core';
 import { ApplicationError, jsonParse } from 'n8n-workflow';
 
-import { isObjectLiteral } from '@/utils';
-
 export class BaseFilter {
 	protected static async toFilter(rawFilter: string, Filter: typeof BaseFilter) {
 		const dto = jsonParse(rawFilter, { errorMessage: 'Failed to parse filter JSON' });
diff --git a/packages/cli/src/node-types.ts b/packages/cli/src/node-types.ts
index 553aedd620e2e..1837cd7bcc4cb 100644
--- a/packages/cli/src/node-types.ts
+++ b/packages/cli/src/node-types.ts
@@ -1,26 +1,16 @@
 import type { NeededNodeType } from '@n8n/task-runner';
 import type { Dirent } from 'fs';
 import { readdir } from 'fs/promises';
-import { loadClassInIsolation } from 'n8n-core';
-import type {
-	INodeType,
-	INodeTypeDescription,
-	INodeTypes,
-	IVersionedNodeType,
-	LoadedClass,
-} from 'n8n-workflow';
+import type { INodeType, INodeTypeDescription, INodeTypes, IVersionedNodeType } from 'n8n-workflow';
 import { ApplicationError, NodeHelpers } from 'n8n-workflow';
 import { join, dirname } from 'path';
 import { Service } from 'typedi';
 
-import { UnrecognizedNodeTypeError } from './errors/unrecognized-node-type.error';
 import { LoadNodesAndCredentials } from './load-nodes-and-credentials';
 
 @Service()
 export class NodeTypes implements INodeTypes {
-	constructor(private loadNodesAndCredentials: LoadNodesAndCredentials) {
-		loadNodesAndCredentials.addPostProcessor(async () => this.applySpecialNodeParameters());
-	}
+	constructor(private loadNodesAndCredentials: LoadNodesAndCredentials) {}
 
 	/**
 	 * Variant of `getByNameAndVersion` that includes the node's source path, used to locate a node's translations.
@@ -29,19 +19,14 @@ export class NodeTypes implements INodeTypes {
 		nodeTypeName: string,
 		version: number,
 	): { description: INodeTypeDescription } & { sourcePath: string } {
-		const nodeType = this.getNode(nodeTypeName);
-
-		if (!nodeType) {
-			throw new ApplicationError('Unknown node type', { tags: { nodeTypeName } });
-		}
-
+		const nodeType = this.loadNodesAndCredentials.getNode(nodeTypeName);
 		const { description } = NodeHelpers.getVersionedNodeType(nodeType.type, version);
 
 		return { description: { ...description }, sourcePath: nodeType.sourcePath };
 	}
 
 	getByName(nodeType: string): INodeType | IVersionedNodeType {
-		return this.getNode(nodeType).type;
+		return this.loadNodesAndCredentials.getNode(nodeType).type;
 	}
 
 	getByNameAndVersion(nodeType: string, version?: number): INodeType {
@@ -52,7 +37,7 @@ export class NodeTypes implements INodeTypes {
 			nodeType = nodeType.replace(/Tool$/, '');
 		}
 
-		const node = this.getNode(nodeType);
+		const node = this.loadNodesAndCredentials.getNode(nodeType);
 		const versionedNodeType = NodeHelpers.getVersionedNodeType(node.type, version);
 		if (!toolRequested) return versionedNodeType;
 
@@ -74,41 +59,15 @@ export class NodeTypes implements INodeTypes {
 		const clonedNode = Object.create(versionedNodeType, {
 			description: { value: clonedDescription },
 		}) as INodeType;
-		const tool = NodeHelpers.convertNodeToAiTool(clonedNode);
+		const tool = this.loadNodesAndCredentials.convertNodeToAiTool(clonedNode);
 		loadedNodes[nodeType + 'Tool'] = { sourcePath: '', type: tool };
 		return tool;
 	}
 
-	/* Some nodeTypes need to get special parameters applied like the polling nodes the polling times */
-	applySpecialNodeParameters() {
-		for (const nodeTypeData of Object.values(this.loadNodesAndCredentials.loadedNodes)) {
-			const nodeType = NodeHelpers.getVersionedNodeType(nodeTypeData.type);
-			NodeHelpers.applySpecialNodeParameters(nodeType);
-		}
-	}
-
 	getKnownTypes() {
 		return this.loadNodesAndCredentials.knownNodes;
 	}
 
-	private getNode(type: string): LoadedClass<INodeType | IVersionedNodeType> {
-		const { loadedNodes, knownNodes } = this.loadNodesAndCredentials;
-		if (type in loadedNodes) {
-			return loadedNodes[type];
-		}
-
-		if (type in knownNodes) {
-			const { className, sourcePath } = knownNodes[type];
-			const loaded: INodeType = loadClassInIsolation(sourcePath, className);
-			NodeHelpers.applySpecialNodeParameters(loaded);
-
-			loadedNodes[type] = { sourcePath, type: loaded };
-			return loadedNodes[type];
-		}
-
-		throw new UnrecognizedNodeTypeError(type);
-	}
-
 	async getNodeTranslationPath({
 		nodeSourcePath,
 		longNodeType,
@@ -153,14 +112,12 @@ export class NodeTypes implements INodeTypes {
 
 	getNodeTypeDescriptions(nodeTypes: NeededNodeType[]): INodeTypeDescription[] {
 		return nodeTypes.map(({ name: nodeTypeName, version: nodeTypeVersion }) => {
-			const nodeType = this.getNode(nodeTypeName);
-
-			if (!nodeType) throw new ApplicationError(`Unknown node type: ${nodeTypeName}`);
-
+			const nodeType = this.loadNodesAndCredentials.getNode(nodeTypeName);
 			const { description } = NodeHelpers.getVersionedNodeType(nodeType.type, nodeTypeVersion);
 
 			const descriptionCopy = { ...description };
 
+			// TODO: do we still need this?
 			descriptionCopy.name = descriptionCopy.name.startsWith('n8n-nodes')
 				? descriptionCopy.name
 				: `n8n-nodes-base.${descriptionCopy.name}`; // nodes-base nodes are unprefixed
diff --git a/packages/cli/src/public-api/types.ts b/packages/cli/src/public-api/types.ts
index 327d3630739b1..b10d2f81bda8b 100644
--- a/packages/cli/src/public-api/types.ts
+++ b/packages/cli/src/public-api/types.ts
@@ -74,11 +74,12 @@ export declare namespace WorkflowRequest {
 			active: boolean;
 			name?: string;
 			projectId?: string;
+			excludePinnedData?: boolean;
 		}
 	>;
 
 	type Create = AuthenticatedRequest<{}, {}, WorkflowEntity, {}>;
-	type Get = AuthenticatedRequest<{ id: string }, {}, {}, {}>;
+	type Get = AuthenticatedRequest<{ id: string }, {}, {}, { excludePinnedData?: boolean }>;
 	type Delete = Get;
 	type Update = AuthenticatedRequest<{ id: string }, {}, WorkflowEntity, {}>;
 	type Activate = Get;
diff --git a/packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.id.yml b/packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.id.yml
index 37cad74c86e4d..c8b2bf51cdc29 100644
--- a/packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.id.yml
+++ b/packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.id.yml
@@ -6,6 +6,13 @@ get:
   summary: Retrieves a workflow
   description: Retrieves a workflow.
   parameters:
+    - name: excludePinnedData
+      in: query
+      required: false
+      description: Set this to avoid retrieving pinned data
+      schema:
+        type: boolean
+        example: true
     - $ref: '../schemas/parameters/workflowId.yml'
   responses:
     '200':
diff --git a/packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.yml b/packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.yml
index 1024e36cb5948..4b3bc5e069efd 100644
--- a/packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.yml
+++ b/packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.yml
@@ -60,6 +60,13 @@ get:
       schema:
         type: string
         example: VmwOO9HeTEj20kxM
+    - name: excludePinnedData
+      in: query
+      required: false
+      description: Set this to avoid retrieving pinned data
+      schema:
+        type: boolean
+        example: true
     - $ref: '../../../../shared/spec/parameters/limit.yml'
     - $ref: '../../../../shared/spec/parameters/cursor.yml'
   responses:
diff --git a/packages/cli/src/public-api/v1/handlers/workflows/workflows.handler.ts b/packages/cli/src/public-api/v1/handlers/workflows/workflows.handler.ts
index b0956a15c1bd4..7a9003dc284c6 100644
--- a/packages/cli/src/public-api/v1/handlers/workflows/workflows.handler.ts
+++ b/packages/cli/src/public-api/v1/handlers/workflows/workflows.handler.ts
@@ -105,6 +105,7 @@ export = {
 		projectScope('workflow:read', 'workflow'),
 		async (req: WorkflowRequest.Get, res: express.Response): Promise<express.Response> => {
 			const { id } = req.params;
+			const { excludePinnedData = false } = req.query;
 
 			const workflow = await Container.get(SharedWorkflowRepository).findWorkflowForUser(
 				id,
@@ -120,6 +121,10 @@ export = {
 				return res.status(404).json({ message: 'Not Found' });
 			}
 
+			if (excludePinnedData) {
+				delete workflow.pinData;
+			}
+
 			Container.get(EventService).emit('user-retrieved-workflow', {
 				userId: req.user.id,
 				publicApi: true,
@@ -131,7 +136,15 @@ export = {
 	getWorkflows: [
 		validCursor,
 		async (req: WorkflowRequest.GetAll, res: express.Response): Promise<express.Response> => {
-			const { offset = 0, limit = 100, active, tags, name, projectId } = req.query;
+			const {
+				offset = 0,
+				limit = 100,
+				excludePinnedData = false,
+				active,
+				tags,
+				name,
+				projectId,
+			} = req.query;
 
 			const where: FindOptionsWhere<WorkflowEntity> = {
 				...(active !== undefined && { active }),
@@ -199,6 +212,12 @@ export = {
 				...(!config.getEnv('workflowTagsDisabled') && { relations: ['tags'] }),
 			});
 
+			if (excludePinnedData) {
+				workflows.forEach((workflow) => {
+					delete workflow.pinData;
+				});
+			}
+
 			Container.get(EventService).emit('user-retrieved-all-workflows', {
 				userId: req.user.id,
 				publicApi: true,
diff --git a/packages/cli/src/push/__tests__/websocket.push.test.ts b/packages/cli/src/push/__tests__/websocket.push.test.ts
index 209f91b17e4ed..fd1e2f27a0b52 100644
--- a/packages/cli/src/push/__tests__/websocket.push.test.ts
+++ b/packages/cli/src/push/__tests__/websocket.push.test.ts
@@ -11,15 +11,15 @@ import { mockInstance } from '@test/mocking';
 jest.useFakeTimers();
 
 class MockWebSocket extends EventEmitter {
-	public isAlive = true;
+	isAlive = true;
 
-	public ping = jest.fn();
+	ping = jest.fn();
 
-	public send = jest.fn();
+	send = jest.fn();
 
-	public terminate = jest.fn();
+	terminate = jest.fn();
 
-	public close = jest.fn();
+	close = jest.fn();
 }
 
 const createMockWebSocket = () => new MockWebSocket() as unknown as jest.Mocked<WebSocket>;
@@ -73,7 +73,7 @@ describe('WebSocketPush', () => {
 	it('sends data to one connection', () => {
 		webSocketPush.add(pushRef1, userId, mockWebSocket1);
 		webSocketPush.add(pushRef2, userId, mockWebSocket2);
-		webSocketPush.sendToOne(pushMessage.type, pushMessage.data, pushRef1);
+		webSocketPush.sendToOne(pushMessage, pushRef1);
 
 		expect(mockWebSocket1.send).toHaveBeenCalledWith(expectedMsg);
 		expect(mockWebSocket2.send).not.toHaveBeenCalled();
@@ -82,7 +82,7 @@ describe('WebSocketPush', () => {
 	it('sends data to all connections', () => {
 		webSocketPush.add(pushRef1, userId, mockWebSocket1);
 		webSocketPush.add(pushRef2, userId, mockWebSocket2);
-		webSocketPush.sendToAll(pushMessage.type, pushMessage.data);
+		webSocketPush.sendToAll(pushMessage);
 
 		expect(mockWebSocket1.send).toHaveBeenCalledWith(expectedMsg);
 		expect(mockWebSocket2.send).toHaveBeenCalledWith(expectedMsg);
@@ -101,7 +101,7 @@ describe('WebSocketPush', () => {
 	it('sends data to all users connections', () => {
 		webSocketPush.add(pushRef1, userId, mockWebSocket1);
 		webSocketPush.add(pushRef2, userId, mockWebSocket2);
-		webSocketPush.sendToUsers(pushMessage.type, pushMessage.data, [userId]);
+		webSocketPush.sendToUsers(pushMessage, [userId]);
 
 		expect(mockWebSocket1.send).toHaveBeenCalledWith(expectedMsg);
 		expect(mockWebSocket2.send).toHaveBeenCalledWith(expectedMsg);
diff --git a/packages/cli/src/push/abstract.push.ts b/packages/cli/src/push/abstract.push.ts
index 24cafa81219d3..574f8a0def056 100644
--- a/packages/cli/src/push/abstract.push.ts
+++ b/packages/cli/src/push/abstract.push.ts
@@ -1,4 +1,5 @@
-import type { PushPayload, PushType } from '@n8n/api-types';
+import type { PushMessage } from '@n8n/api-types';
+import { ErrorReporter } from 'n8n-core';
 import { assert, jsonStringify } from 'n8n-workflow';
 import { Service } from 'typedi';
 
@@ -27,7 +28,10 @@ export abstract class AbstractPush<Connection> extends TypedEmitter<AbstractPush
 	protected abstract sendToOneConnection(connection: Connection, data: string): void;
 	protected abstract ping(connection: Connection): void;
 
-	constructor(protected readonly logger: Logger) {
+	constructor(
+		protected readonly logger: Logger,
+		protected readonly errorReporter: ErrorReporter,
+	) {
 		super();
 		// Ping all connected clients every 60 seconds
 		setInterval(() => this.pingAll(), 60 * 1000);
@@ -65,8 +69,8 @@ export abstract class AbstractPush<Connection> extends TypedEmitter<AbstractPush
 		delete this.userIdByPushRef[pushRef];
 	}
 
-	private sendTo<Type extends PushType>(type: Type, data: PushPayload<Type>, pushRefs: string[]) {
-		this.logger.debug(`Send data of type "${type}" to editor-UI`, {
+	private sendTo({ type, data }: PushMessage, pushRefs: string[]) {
+		this.logger.debug(`Pushed to frontend: ${type}`, {
 			dataType: type,
 			pushRefs: pushRefs.join(', '),
 		});
@@ -86,30 +90,26 @@ export abstract class AbstractPush<Connection> extends TypedEmitter<AbstractPush
 		}
 	}
 
-	sendToAll<Type extends PushType>(type: Type, data: PushPayload<Type>) {
-		this.sendTo(type, data, Object.keys(this.connections));
+	sendToAll(pushMsg: PushMessage) {
+		this.sendTo(pushMsg, Object.keys(this.connections));
 	}
 
-	sendToOne<Type extends PushType>(type: Type, data: PushPayload<Type>, pushRef: string) {
+	sendToOne(pushMsg: PushMessage, pushRef: string) {
 		if (this.connections[pushRef] === undefined) {
 			this.logger.error(`The session "${pushRef}" is not registered.`, { pushRef });
 			return;
 		}
 
-		this.sendTo(type, data, [pushRef]);
+		this.sendTo(pushMsg, [pushRef]);
 	}
 
-	sendToUsers<Type extends PushType>(
-		type: Type,
-		data: PushPayload<Type>,
-		userIds: Array<User['id']>,
-	) {
+	sendToUsers(pushMsg: PushMessage, userIds: Array<User['id']>) {
 		const { connections } = this;
 		const userPushRefs = Object.keys(connections).filter((pushRef) =>
 			userIds.includes(this.userIdByPushRef[pushRef]),
 		);
 
-		this.sendTo(type, data, userPushRefs);
+		this.sendTo(pushMsg, userPushRefs);
 	}
 
 	closeAllConnections() {
diff --git a/packages/cli/src/push/index.ts b/packages/cli/src/push/index.ts
index bfbfb43a51d22..7325981d0bba5 100644
--- a/packages/cli/src/push/index.ts
+++ b/packages/cli/src/push/index.ts
@@ -1,7 +1,8 @@
-import type { PushPayload, PushType } from '@n8n/api-types';
+import type { PushMessage } from '@n8n/api-types';
 import type { Application } from 'express';
 import { ServerResponse } from 'http';
 import type { Server } from 'http';
+import { InstanceSettings } from 'n8n-core';
 import type { Socket } from 'net';
 import { Container, Service } from 'typedi';
 import { parse as parseUrl } from 'url';
@@ -13,7 +14,6 @@ import type { User } from '@/databases/entities/user';
 import { OnShutdown } from '@/decorators/on-shutdown';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { Publisher } from '@/scaling/pubsub/publisher.service';
-import { OrchestrationService } from '@/services/orchestration.service';
 import { TypedEmitter } from '@/typed-emitter';
 
 import { SSEPush } from './sse.push';
@@ -36,12 +36,12 @@ const useWebSockets = config.getEnv('push.backend') === 'websocket';
  */
 @Service()
 export class Push extends TypedEmitter<PushEvents> {
-	public isBidirectional = useWebSockets;
+	isBidirectional = useWebSockets;
 
 	private backend = useWebSockets ? Container.get(WebSocketPush) : Container.get(SSEPush);
 
 	constructor(
-		private readonly orchestrationService: OrchestrationService,
+		private readonly instanceSettings: InstanceSettings,
 		private readonly publisher: Publisher,
 	) {
 		super();
@@ -81,34 +81,30 @@ export class Push extends TypedEmitter<PushEvents> {
 		this.emit('editorUiConnected', pushRef);
 	}
 
-	broadcast<Type extends PushType>(type: Type, data: PushPayload<Type>) {
-		this.backend.sendToAll(type, data);
+	broadcast(pushMsg: PushMessage) {
+		this.backend.sendToAll(pushMsg);
 	}
 
-	send<Type extends PushType>(type: Type, data: PushPayload<Type>, pushRef: string) {
+	send(pushMsg: PushMessage, pushRef: string) {
 		/**
 		 * Multi-main setup: In a manual webhook execution, the main process that
 		 * handles a webhook might not be the same as the main process that created
 		 * the webhook. If so, the handler process commands the creator process to
 		 * relay the former's execution lifecycle events to the creator's frontend.
 		 */
-		if (this.orchestrationService.isMultiMainSetupEnabled && !this.backend.hasPushRef(pushRef)) {
+		if (this.instanceSettings.isMultiMain && !this.backend.hasPushRef(pushRef)) {
 			void this.publisher.publishCommand({
 				command: 'relay-execution-lifecycle-event',
-				payload: { type, args: data, pushRef },
+				payload: { ...pushMsg, pushRef },
 			});
 			return;
 		}
 
-		this.backend.sendToOne(type, data, pushRef);
+		this.backend.sendToOne(pushMsg, pushRef);
 	}
 
-	sendToUsers<Type extends PushType>(
-		type: Type,
-		data: PushPayload<Type>,
-		userIds: Array<User['id']>,
-	) {
-		this.backend.sendToUsers(type, data, userIds);
+	sendToUsers(pushMsg: PushMessage, userIds: Array<User['id']>) {
+		this.backend.sendToUsers(pushMsg, userIds);
 	}
 
 	@OnShutdown()
diff --git a/packages/cli/src/push/websocket.push.ts b/packages/cli/src/push/websocket.push.ts
index a2ea39c5004b3..97e45028b2bb7 100644
--- a/packages/cli/src/push/websocket.push.ts
+++ b/packages/cli/src/push/websocket.push.ts
@@ -1,4 +1,4 @@
-import { ApplicationError, ErrorReporterProxy } from 'n8n-workflow';
+import { ApplicationError } from 'n8n-workflow';
 import { Service } from 'typedi';
 import type WebSocket from 'ws';
 
@@ -24,7 +24,7 @@ export class WebSocketPush extends AbstractPush<WebSocket> {
 
 				this.onMessageReceived(pushRef, JSON.parse(buffer.toString('utf8')));
 			} catch (error) {
-				ErrorReporterProxy.error(
+				this.errorReporter.error(
 					new ApplicationError('Error parsing push message', {
 						extra: {
 							userId,
diff --git a/packages/cli/src/response-helper.ts b/packages/cli/src/response-helper.ts
index 2b993c266c409..0e70aa312f72c 100644
--- a/packages/cli/src/response-helper.ts
+++ b/packages/cli/src/response-helper.ts
@@ -1,10 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import type { Request, Response } from 'express';
-import {
-	ErrorReporterProxy as ErrorReporter,
-	FORM_TRIGGER_PATH_IDENTIFIER,
-	NodeApiError,
-} from 'n8n-workflow';
+import { ErrorReporter } from 'n8n-core';
+import { FORM_TRIGGER_PATH_IDENTIFIER, NodeApiError } from 'n8n-workflow';
 import { Readable } from 'node:stream';
 import picocolors from 'picocolors';
 import Container from 'typedi';
@@ -141,7 +138,7 @@ export const isUniqueConstraintError = (error: Error) =>
 
 export function reportError(error: Error) {
 	if (!(error instanceof ResponseError) || error.httpStatusCode > 404) {
-		ErrorReporter.error(error);
+		Container.get(ErrorReporter).error(error);
 	}
 }
 
diff --git a/packages/cli/src/runners/__tests__/task-broker.test.ts b/packages/cli/src/runners/__tests__/task-broker.test.ts
index 8e86f189e8fea..1f5030ada8e93 100644
--- a/packages/cli/src/runners/__tests__/task-broker.test.ts
+++ b/packages/cli/src/runners/__tests__/task-broker.test.ts
@@ -6,6 +6,7 @@ import { ApplicationError, type INodeTypeBaseDescription } from 'n8n-workflow';
 import { Time } from '@/constants';
 
 import { TaskRejectError } from '../errors';
+import { TaskRunnerTimeoutError } from '../errors/task-runner-timeout.error';
 import type { RunnerLifecycleEvents } from '../runner-lifecycle-events';
 import { TaskBroker } from '../task-broker.service';
 import type { TaskOffer, TaskRequest, TaskRunner } from '../task-broker.service';
@@ -721,7 +722,7 @@ describe('TaskBroker', () => {
 
 		beforeAll(() => {
 			jest.useFakeTimers();
-			config = mock<TaskRunnersConfig>({ taskTimeout: 30 });
+			config = mock<TaskRunnersConfig>({ taskTimeout: 30, mode: 'internal' });
 			taskBroker = new TaskBroker(mock(), config, runnerLifecycleEvents);
 		});
 
@@ -800,7 +801,7 @@ describe('TaskBroker', () => {
 			expect(taskBroker.getTasks().get(taskId)).toBeUndefined();
 		});
 
-		it('on timeout, we should emit `runner:timed-out-during-task` event and send error to requester', async () => {
+		it('[internal mode] on timeout, we should emit `runner:timed-out-during-task` event and send error to requester', async () => {
 			jest.spyOn(global, 'clearTimeout');
 
 			const taskId = 'task1';
@@ -839,5 +840,50 @@ describe('TaskBroker', () => {
 
 			expect(taskBroker.getTasks().get(taskId)).toBeUndefined();
 		});
+
+		it('[external mode] on timeout, we should instruct the runner to cancel and send error to requester', async () => {
+			const config = mock<TaskRunnersConfig>({ taskTimeout: 30, mode: 'external' });
+			taskBroker = new TaskBroker(mock(), config, runnerLifecycleEvents);
+
+			jest.spyOn(global, 'clearTimeout');
+
+			const taskId = 'task1';
+			const runnerId = 'runner1';
+			const requesterId = 'requester1';
+			const runner = mock<TaskRunner>({ id: runnerId });
+			const runnerCallback = jest.fn();
+			const requesterCallback = jest.fn();
+
+			taskBroker.registerRunner(runner, runnerCallback);
+			taskBroker.registerRequester(requesterId, requesterCallback);
+
+			taskBroker.setTasks({
+				[taskId]: { id: taskId, runnerId, requesterId, taskType: 'test' },
+			});
+
+			await taskBroker.sendTaskSettings(taskId, {});
+			runnerCallback.mockClear();
+
+			jest.runAllTimers();
+
+			await Promise.resolve(); // for timeout callback
+			await Promise.resolve(); // for sending messages to runner and requester
+			await Promise.resolve(); // for task cleanup and removal
+
+			expect(runnerCallback).toHaveBeenLastCalledWith({
+				type: 'broker:taskcancel',
+				taskId,
+				reason: 'Task execution timed out',
+			});
+
+			expect(requesterCallback).toHaveBeenCalledWith({
+				type: 'broker:taskerror',
+				taskId,
+				error: expect.any(TaskRunnerTimeoutError),
+			});
+
+			expect(clearTimeout).toHaveBeenCalled();
+			expect(taskBroker.getTasks().get(taskId)).toBeUndefined();
+		});
 	});
 });
diff --git a/packages/cli/src/runners/__tests__/task-runner-ws-server.test.ts b/packages/cli/src/runners/__tests__/task-runner-ws-server.test.ts
index b092e08fedccc..24b12fa1906c1 100644
--- a/packages/cli/src/runners/__tests__/task-runner-ws-server.test.ts
+++ b/packages/cli/src/runners/__tests__/task-runner-ws-server.test.ts
@@ -58,4 +58,28 @@ describe('TaskRunnerWsServer', () => {
 			expect(clearIntervalSpy).toHaveBeenCalled();
 		});
 	});
+
+	describe('sendMessage', () => {
+		it('should work with a message containing circular references', () => {
+			const server = new TaskRunnerWsServer(mock(), mock(), mock(), mock(), mock());
+			const ws = mock<WebSocket>();
+			server.runnerConnections.set('test-runner', ws);
+
+			const messageData: Record<string, unknown> = {};
+			messageData.circular = messageData;
+
+			expect(() =>
+				server.sendMessage('test-runner', {
+					type: 'broker:taskdataresponse',
+					taskId: 'taskId',
+					requestId: 'requestId',
+					data: messageData,
+				}),
+			).not.toThrow();
+
+			expect(ws.send).toHaveBeenCalledWith(
+				'{"type":"broker:taskdataresponse","taskId":"taskId","requestId":"requestId","data":{"circular":"[Circular Reference]"}}',
+			);
+		});
+	});
 });
diff --git a/packages/cli/src/runners/errors/task-runner-disconnected-error.ts b/packages/cli/src/runners/errors/task-runner-disconnected-error.ts
index 3f4f468b1a658..e29958adfba79 100644
--- a/packages/cli/src/runners/errors/task-runner-disconnected-error.ts
+++ b/packages/cli/src/runners/errors/task-runner-disconnected-error.ts
@@ -2,10 +2,10 @@ import type { TaskRunner } from '@n8n/task-runner';
 import { ApplicationError } from 'n8n-workflow';
 
 export class TaskRunnerDisconnectedError extends ApplicationError {
-	public description: string;
+	description: string;
 
 	constructor(
-		public readonly runnerId: TaskRunner['id'],
+		readonly runnerId: TaskRunner['id'],
 		isCloudDeployment: boolean,
 	) {
 		super('Node execution failed');
diff --git a/packages/cli/src/runners/errors/task-runner-oom-error.ts b/packages/cli/src/runners/errors/task-runner-oom-error.ts
index f846d98768f8b..5c78bef816dbc 100644
--- a/packages/cli/src/runners/errors/task-runner-oom-error.ts
+++ b/packages/cli/src/runners/errors/task-runner-oom-error.ts
@@ -3,10 +3,10 @@ import { ApplicationError } from 'n8n-workflow';
 import type { TaskRunner } from '../task-broker.service';
 
 export class TaskRunnerOomError extends ApplicationError {
-	public description: string;
+	description: string;
 
 	constructor(
-		public readonly runnerId: TaskRunner['id'],
+		readonly runnerId: TaskRunner['id'],
 		isCloudDeployment: boolean,
 	) {
 		super('Node ran out of memory.', { level: 'error' });
diff --git a/packages/cli/src/runners/errors/task-runner-restart-loop-error.ts b/packages/cli/src/runners/errors/task-runner-restart-loop-error.ts
index b788d83808c80..fa02430adeb0b 100644
--- a/packages/cli/src/runners/errors/task-runner-restart-loop-error.ts
+++ b/packages/cli/src/runners/errors/task-runner-restart-loop-error.ts
@@ -2,8 +2,8 @@ import { ApplicationError } from 'n8n-workflow';
 
 export class TaskRunnerRestartLoopError extends ApplicationError {
 	constructor(
-		public readonly howManyTimes: number,
-		public readonly timePeriodMs: number,
+		readonly howManyTimes: number,
+		readonly timePeriodMs: number,
 	) {
 		const message = `Task runner has restarted ${howManyTimes} times within ${timePeriodMs / 1000} seconds. This is an abnormally high restart rate that suggests a bug or other issue is preventing your runner process from starting up. If this issues persists, please file a report at: https://github.com/n8n-io/n8n/issues`;
 
diff --git a/packages/cli/src/runners/errors/task-runner-timeout.error.ts b/packages/cli/src/runners/errors/task-runner-timeout.error.ts
index 88f3533028725..1d9d463e3a5c1 100644
--- a/packages/cli/src/runners/errors/task-runner-timeout.error.ts
+++ b/packages/cli/src/runners/errors/task-runner-timeout.error.ts
@@ -1,15 +1,23 @@
+import type { TaskRunnerMode } from '@n8n/config/src/configs/runners.config';
 import { ApplicationError } from 'n8n-workflow';
 
 export class TaskRunnerTimeoutError extends ApplicationError {
 	description: string;
 
-	constructor(taskTimeout: number, isSelfHosted: boolean) {
+	constructor({
+		taskTimeout,
+		isSelfHosted,
+		mode,
+	}: { taskTimeout: number; isSelfHosted: boolean; mode: TaskRunnerMode }) {
 		super(
 			`Task execution timed out after ${taskTimeout} ${taskTimeout === 1 ? 'second' : 'seconds'}`,
 		);
 
-		const subtitle =
-			'The task runner was taking too long on this task, so it was suspected of being unresponsive and restarted, and the task was aborted. You can try the following:';
+		const subtitles = {
+			internal:
+				'The task runner was taking too long on this task, so it was suspected of being unresponsive and restarted, and the task was aborted.',
+			external: 'The task runner was taking too long on this task, so the task was aborted.',
+		};
 
 		const fixes = {
 			optimizeScript:
@@ -27,7 +35,7 @@ export class TaskRunnerTimeoutError extends ApplicationError {
 			.map((suggestion, index) => `${index + 1}. ${suggestion}`)
 			.join('<br/>');
 
-		const description = `${subtitle}<br/><br/>${suggestionsText}`;
+		const description = `${mode === 'internal' ? subtitles.internal : subtitles.external} You can try the following:<br/><br/>${suggestionsText}`;
 
 		this.description = description;
 	}
diff --git a/packages/cli/src/runners/node-process-oom-detector.ts b/packages/cli/src/runners/node-process-oom-detector.ts
index e6debb8551c39..a97df32974146 100644
--- a/packages/cli/src/runners/node-process-oom-detector.ts
+++ b/packages/cli/src/runners/node-process-oom-detector.ts
@@ -6,7 +6,7 @@ import type { ChildProcess } from 'node:child_process';
  * memory (OOMs).
  */
 export class NodeProcessOomDetector {
-	public get didProcessOom() {
+	get didProcessOom() {
 		return this._didProcessOom;
 	}
 
diff --git a/packages/cli/src/runners/runner-ws-server.ts b/packages/cli/src/runners/runner-ws-server.ts
index 3a5fa53029697..8ea3a7edbe547 100644
--- a/packages/cli/src/runners/runner-ws-server.ts
+++ b/packages/cli/src/runners/runner-ws-server.ts
@@ -1,6 +1,6 @@
 import { TaskRunnersConfig } from '@n8n/config';
 import type { BrokerMessage, RunnerMessage } from '@n8n/task-runner';
-import { ApplicationError } from 'n8n-workflow';
+import { ApplicationError, jsonStringify } from 'n8n-workflow';
 import { Service } from 'typedi';
 import type WebSocket from 'ws';
 
@@ -83,7 +83,7 @@ export class TaskRunnerWsServer {
 	}
 
 	sendMessage(id: TaskRunner['id'], message: BrokerMessage.ToRunner.All) {
-		this.runnerConnections.get(id)?.send(JSON.stringify(message));
+		this.runnerConnections.get(id)?.send(jsonStringify(message, { replaceCircularRefs: true }));
 	}
 
 	add(id: TaskRunner['id'], connection: WebSocket) {
diff --git a/packages/cli/src/runners/sliding-window-signal.ts b/packages/cli/src/runners/sliding-window-signal.ts
index 5954f7bade2b1..3e88f0df95752 100644
--- a/packages/cli/src/runners/sliding-window-signal.ts
+++ b/packages/cli/src/runners/sliding-window-signal.ts
@@ -36,7 +36,7 @@ export class SlidingWindowSignal<TEvents, TEventName extends keyof TEvents & str
 	 * milliseconds for the event to be emitted. `null` is returned
 	 * if no event is emitted within the window.
 	 */
-	public async getSignal(): Promise<TEvents[TEventName] | null> {
+	async getSignal(): Promise<TEvents[TEventName] | null> {
 		const timeSinceLastEvent = Date.now() - this.lastSignalTime;
 		if (timeSinceLastEvent <= this.windowSizeInMs) return this.lastSignal;
 
diff --git a/packages/cli/src/runners/task-broker.service.ts b/packages/cli/src/runners/task-broker.service.ts
index 80e918b47a718..e52992d38eed8 100644
--- a/packages/cli/src/runners/task-broker.service.ts
+++ b/packages/cli/src/runners/task-broker.service.ts
@@ -459,14 +459,25 @@ export class TaskBroker {
 		const task = this.tasks.get(taskId);
 		if (!task) return;
 
-		this.runnerLifecycleEvents.emit('runner:timed-out-during-task');
+		if (this.taskRunnersConfig.mode === 'internal') {
+			this.runnerLifecycleEvents.emit('runner:timed-out-during-task');
+		} else if (this.taskRunnersConfig.mode === 'external') {
+			await this.messageRunner(task.runnerId, {
+				type: 'broker:taskcancel',
+				taskId,
+				reason: 'Task execution timed out',
+			});
+		}
+
+		const { taskTimeout, mode } = this.taskRunnersConfig;
 
 		await this.taskErrorHandler(
 			taskId,
-			new TaskRunnerTimeoutError(
-				this.taskRunnersConfig.taskTimeout,
-				config.getEnv('deployment.type') !== 'cloud',
-			),
+			new TaskRunnerTimeoutError({
+				taskTimeout,
+				isSelfHosted: config.getEnv('deployment.type') !== 'cloud',
+				mode,
+			}),
 		);
 	}
 
diff --git a/packages/cli/src/runners/task-managers/__tests__/task-manager.test.ts b/packages/cli/src/runners/task-managers/__tests__/task-manager.test.ts
new file mode 100644
index 0000000000000..84584e05df27b
--- /dev/null
+++ b/packages/cli/src/runners/task-managers/__tests__/task-manager.test.ts
@@ -0,0 +1,136 @@
+import { mock } from 'jest-mock-extended';
+import { get, set } from 'lodash';
+
+import type { NodeTypes } from '@/node-types';
+import type { Task } from '@/runners/task-managers/task-manager';
+import { TaskManager } from '@/runners/task-managers/task-manager';
+
+class TestTaskManager extends TaskManager {
+	sentMessages: unknown[] = [];
+
+	sendMessage(message: unknown) {
+		this.sentMessages.push(message);
+	}
+}
+
+describe('TaskManager', () => {
+	let instance: TestTaskManager;
+	const mockNodeTypes = mock<NodeTypes>();
+
+	beforeEach(() => {
+		instance = new TestTaskManager(mockNodeTypes);
+	});
+
+	describe('handleRpc', () => {
+		test.each([
+			['logNodeOutput', ['hello world']],
+			['helpers.assertBinaryData', [0, 'propertyName']],
+			['helpers.getBinaryDataBuffer', [0, 'propertyName']],
+			['helpers.prepareBinaryData', [Buffer.from('data').toJSON(), 'filename', 'mimetype']],
+			['helpers.setBinaryDataBuffer', [{ data: '123' }, Buffer.from('data').toJSON()]],
+			['helpers.binaryToString', [Buffer.from('data').toJSON(), 'utf8']],
+			['helpers.httpRequest', [{ url: 'http://localhost' }]],
+		])('should handle %s rpc call', async (methodName, args) => {
+			const executeFunctions = set({}, methodName.split('.'), jest.fn());
+
+			const mockTask = mock<Task>({
+				taskId: 'taskId',
+				data: {
+					executeFunctions,
+				},
+			});
+			instance.tasks.set('taskId', mockTask);
+
+			await instance.handleRpc('taskId', 'callId', methodName, args);
+
+			expect(instance.sentMessages).toEqual([
+				{
+					callId: 'callId',
+					data: undefined,
+					status: 'success',
+					taskId: 'taskId',
+					type: 'requester:rpcresponse',
+				},
+			]);
+			expect(get(executeFunctions, methodName.split('.'))).toHaveBeenCalledWith(...args);
+		});
+
+		it('converts any serialized buffer arguments into buffers', async () => {
+			const mockPrepareBinaryData = jest.fn().mockResolvedValue(undefined);
+			const mockTask = mock<Task>({
+				taskId: 'taskId',
+				data: {
+					executeFunctions: {
+						helpers: {
+							prepareBinaryData: mockPrepareBinaryData,
+						},
+					},
+				},
+			});
+			instance.tasks.set('taskId', mockTask);
+
+			await instance.handleRpc('taskId', 'callId', 'helpers.prepareBinaryData', [
+				Buffer.from('data').toJSON(),
+				'filename',
+				'mimetype',
+			]);
+
+			expect(mockPrepareBinaryData).toHaveBeenCalledWith(
+				Buffer.from('data'),
+				'filename',
+				'mimetype',
+			);
+		});
+
+		describe('errors', () => {
+			it('sends method not allowed error if method is not in the allow list', async () => {
+				const mockTask = mock<Task>({
+					taskId: 'taskId',
+					data: {
+						executeFunctions: {},
+					},
+				});
+				instance.tasks.set('taskId', mockTask);
+
+				await instance.handleRpc('taskId', 'callId', 'notAllowedMethod', []);
+
+				expect(instance.sentMessages).toEqual([
+					{
+						callId: 'callId',
+						data: 'Method not allowed',
+						status: 'error',
+						taskId: 'taskId',
+						type: 'requester:rpcresponse',
+					},
+				]);
+			});
+
+			it('sends error if method throws', async () => {
+				const error = new Error('Test error');
+				const mockTask = mock<Task>({
+					taskId: 'taskId',
+					data: {
+						executeFunctions: {
+							helpers: {
+								assertBinaryData: jest.fn().mockRejectedValue(error),
+							},
+						},
+					},
+				});
+				instance.tasks.set('taskId', mockTask);
+
+				await instance.handleRpc('taskId', 'callId', 'helpers.assertBinaryData', []);
+
+				expect(instance.sentMessages).toEqual([
+					{
+						callId: 'callId',
+						data: error,
+						status: 'error',
+						taskId: 'taskId',
+						type: 'requester:rpcresponse',
+					},
+				]);
+			});
+		});
+	});
+});
diff --git a/packages/cli/src/runners/task-managers/task-manager.ts b/packages/cli/src/runners/task-managers/task-manager.ts
index 66f07f7b0a817..44193f9377a17 100644
--- a/packages/cli/src/runners/task-managers/task-manager.ts
+++ b/packages/cli/src/runners/task-managers/task-manager.ts
@@ -1,5 +1,7 @@
 import type { TaskResultData, RequesterMessage, BrokerMessage, TaskData } from '@n8n/task-runner';
-import { RPC_ALLOW_LIST } from '@n8n/task-runner';
+import { AVAILABLE_RPC_METHODS } from '@n8n/task-runner';
+import { isSerializedBuffer, toBuffer } from 'n8n-core';
+import { createResultOk, createResultError } from 'n8n-workflow';
 import type {
 	EnvProviderState,
 	IExecuteFunctions,
@@ -15,7 +17,6 @@ import type {
 	IWorkflowExecuteAdditionalData,
 	Result,
 } from 'n8n-workflow';
-import { createResultOk, createResultError } from 'n8n-workflow';
 import { nanoid } from 'nanoid';
 import { Service } from 'typedi';
 
@@ -158,6 +159,11 @@ export abstract class TaskManager {
 				});
 			}
 
+			const { staticData: incomingStaticData } = resultData;
+
+			// if the runner sent back static data, then it changed, so update it
+			if (incomingStaticData) workflow.overrideStaticData(incomingStaticData);
+
 			return createResultOk(resultData.result as TData);
 		} catch (e: unknown) {
 			return createResultError(e as TError);
@@ -283,7 +289,7 @@ export abstract class TaskManager {
 		}
 
 		try {
-			if (!RPC_ALLOW_LIST.includes(name)) {
+			if (!AVAILABLE_RPC_METHODS.includes(name)) {
 				this.sendMessage({
 					type: 'requester:rpcresponse',
 					taskId,
@@ -317,6 +323,15 @@ export abstract class TaskManager {
 				});
 				return;
 			}
+
+			// Convert any serialized buffers back to buffers
+			for (let i = 0; i < params.length; i++) {
+				const paramValue = params[i];
+				if (isSerializedBuffer(paramValue)) {
+					params[i] = toBuffer(paramValue);
+				}
+			}
+
 			const data = (await func.call(funcs, ...params)) as unknown;
 
 			this.sendMessage({
diff --git a/packages/cli/src/runners/task-runner-module.ts b/packages/cli/src/runners/task-runner-module.ts
index 97631e07639b0..434daa066a35c 100644
--- a/packages/cli/src/runners/task-runner-module.ts
+++ b/packages/cli/src/runners/task-runner-module.ts
@@ -1,5 +1,6 @@
 import { TaskRunnersConfig } from '@n8n/config';
-import { ErrorReporterProxy, sleep } from 'n8n-workflow';
+import { ErrorReporter } from 'n8n-core';
+import { sleep } from 'n8n-workflow';
 import * as a from 'node:assert/strict';
 import Container, { Service } from 'typedi';
 
@@ -33,6 +34,7 @@ export class TaskRunnerModule {
 
 	constructor(
 		private readonly logger: Logger,
+		private readonly errorReporter: ErrorReporter,
 		private readonly runnerConfig: TaskRunnersConfig,
 	) {
 		this.logger = this.logger.scoped('task-runner');
@@ -114,7 +116,7 @@ export class TaskRunnerModule {
 
 	private onRunnerRestartLoopDetected = async (error: TaskRunnerRestartLoopError) => {
 		this.logger.error(error.message);
-		ErrorReporterProxy.error(error);
+		this.errorReporter.error(error);
 
 		// Allow some time for the error to be flushed
 		await sleep(1000);
diff --git a/packages/cli/src/runners/task-runner-process.ts b/packages/cli/src/runners/task-runner-process.ts
index d989107718b1f..2716383f17430 100644
--- a/packages/cli/src/runners/task-runner-process.ts
+++ b/packages/cli/src/runners/task-runner-process.ts
@@ -28,17 +28,17 @@ export type TaskRunnerProcessEventMap = {
  */
 @Service()
 export class TaskRunnerProcess extends TypedEmitter<TaskRunnerProcessEventMap> {
-	public get isRunning() {
+	get isRunning() {
 		return this.process !== null;
 	}
 
 	/** The process ID of the task runner process */
-	public get pid() {
+	get pid() {
 		return this.process?.pid;
 	}
 
 	/** Promise that resolves when the process has exited */
-	public get runPromise() {
+	get runPromise() {
 		return this._runPromise;
 	}
 
diff --git a/packages/cli/src/runners/task-runner-server.ts b/packages/cli/src/runners/task-runner-server.ts
index 18a48cf39dead..2b1f481b0e338 100644
--- a/packages/cli/src/runners/task-runner-server.ts
+++ b/packages/cli/src/runners/task-runner-server.ts
@@ -31,7 +31,7 @@ export class TaskRunnerServer {
 
 	readonly app: express.Application;
 
-	public get port() {
+	get port() {
 		return (this.server?.address() as AddressInfo)?.port;
 	}
 
@@ -133,11 +133,8 @@ export class TaskRunnerServer {
 
 		// Augment errors sent to Sentry
 		if (this.globalConfig.sentry.backendDsn) {
-			const {
-				Handlers: { requestHandler, errorHandler },
-			} = await import('@sentry/node');
-			app.use(requestHandler());
-			app.use(errorHandler());
+			const { setupExpressErrorHandler } = await import('@sentry/node');
+			setupExpressErrorHandler(app);
 		}
 	}
 
diff --git a/packages/cli/src/scaling/__tests__/job-processor.service.test.ts b/packages/cli/src/scaling/__tests__/job-processor.service.test.ts
index 6a3fa5caa4d1f..73264e638269e 100644
--- a/packages/cli/src/scaling/__tests__/job-processor.service.test.ts
+++ b/packages/cli/src/scaling/__tests__/job-processor.service.test.ts
@@ -12,7 +12,14 @@ describe('JobProcessor', () => {
 		executionRepository.findSingleExecution.mockResolvedValue(
 			mock<IExecutionResponse>({ status: 'crashed' }),
 		);
-		const jobProcessor = new JobProcessor(mock(), executionRepository, mock(), mock(), mock());
+		const jobProcessor = new JobProcessor(
+			mock(),
+			mock(),
+			executionRepository,
+			mock(),
+			mock(),
+			mock(),
+		);
 
 		const result = await jobProcessor.processJob(mock<Job>());
 
diff --git a/packages/cli/src/scaling/__tests__/pubsub-handler.test.ts b/packages/cli/src/scaling/__tests__/pubsub-handler.test.ts
index 314ded0b8b953..4f8c8af85956f 100644
--- a/packages/cli/src/scaling/__tests__/pubsub-handler.test.ts
+++ b/packages/cli/src/scaling/__tests__/pubsub-handler.test.ts
@@ -620,7 +620,10 @@ describe('PubSubHandler', () => {
 				expect(activeWorkflowManager.add).toHaveBeenCalledWith(workflowId, 'activate', undefined, {
 					shouldPublish: false,
 				});
-				expect(push.broadcast).toHaveBeenCalledWith('workflowActivated', { workflowId });
+				expect(push.broadcast).toHaveBeenCalledWith({
+					type: 'workflowActivated',
+					data: { workflowId },
+				});
 				expect(publisher.publishCommand).toHaveBeenCalledWith({
 					command: 'display-workflow-activation',
 					payload: { workflowId },
@@ -680,7 +683,10 @@ describe('PubSubHandler', () => {
 				expect(activeWorkflowManager.removeWorkflowTriggersAndPollers).toHaveBeenCalledWith(
 					workflowId,
 				);
-				expect(push.broadcast).toHaveBeenCalledWith('workflowDeactivated', { workflowId });
+				expect(push.broadcast).toHaveBeenCalledWith({
+					type: 'workflowDeactivated',
+					data: { workflowId },
+				});
 				expect(publisher.publishCommand).toHaveBeenCalledWith({
 					command: 'display-workflow-deactivation',
 					payload: { workflowId },
@@ -735,7 +741,10 @@ describe('PubSubHandler', () => {
 
 				eventService.emit('display-workflow-activation', { workflowId });
 
-				expect(push.broadcast).toHaveBeenCalledWith('workflowActivated', { workflowId });
+				expect(push.broadcast).toHaveBeenCalledWith({
+					type: 'workflowActivated',
+					data: { workflowId },
+				});
 			});
 
 			it('should handle `display-workflow-deactivation` event', () => {
@@ -758,7 +767,10 @@ describe('PubSubHandler', () => {
 
 				eventService.emit('display-workflow-deactivation', { workflowId });
 
-				expect(push.broadcast).toHaveBeenCalledWith('workflowDeactivated', { workflowId });
+				expect(push.broadcast).toHaveBeenCalledWith({
+					type: 'workflowDeactivated',
+					data: { workflowId },
+				});
 			});
 
 			it('should handle `display-workflow-activation-error` event', () => {
@@ -782,9 +794,12 @@ describe('PubSubHandler', () => {
 
 				eventService.emit('display-workflow-activation-error', { workflowId, errorMessage });
 
-				expect(push.broadcast).toHaveBeenCalledWith('workflowFailedToActivate', {
-					workflowId,
-					errorMessage,
+				expect(push.broadcast).toHaveBeenCalledWith({
+					type: 'workflowFailedToActivate',
+					data: {
+						workflowId,
+						errorMessage,
+					},
 				});
 			});
 
@@ -806,15 +821,21 @@ describe('PubSubHandler', () => {
 
 				const pushRef = 'test-push-ref';
 				const type = 'executionStarted';
-				const args = { testArg: 'value' };
+				const data = {
+					executionId: '123',
+					mode: 'webhook' as const,
+					startedAt: new Date(),
+					workflowId: '456',
+					flattedRunData: '[]',
+				};
 
 				push.getBackend.mockReturnValue(
 					mock<WebSocketPush>({ hasPushRef: jest.fn().mockReturnValue(true) }),
 				);
 
-				eventService.emit('relay-execution-lifecycle-event', { type, args, pushRef });
+				eventService.emit('relay-execution-lifecycle-event', { type, data, pushRef });
 
-				expect(push.send).toHaveBeenCalledWith(type, args, pushRef);
+				expect(push.send).toHaveBeenCalledWith({ type, data }, pushRef);
 			});
 
 			it('should handle `clear-test-webhooks` event', () => {
@@ -868,9 +889,12 @@ describe('PubSubHandler', () => {
 
 				eventService.emit('response-to-get-worker-status', workerStatus);
 
-				expect(push.broadcast).toHaveBeenCalledWith('sendWorkerStatusMessage', {
-					workerId: workerStatus.senderId,
-					status: workerStatus,
+				expect(push.broadcast).toHaveBeenCalledWith({
+					type: 'sendWorkerStatusMessage',
+					data: {
+						workerId: workerStatus.senderId,
+						status: workerStatus,
+					},
 				});
 			});
 		});
diff --git a/packages/cli/src/scaling/__tests__/scaling.service.test.ts b/packages/cli/src/scaling/__tests__/scaling.service.test.ts
index 0b5f80da483b3..b400bf6dfbbb7 100644
--- a/packages/cli/src/scaling/__tests__/scaling.service.test.ts
+++ b/packages/cli/src/scaling/__tests__/scaling.service.test.ts
@@ -5,7 +5,6 @@ import { InstanceSettings } from 'n8n-core';
 import { ApplicationError } from 'n8n-workflow';
 import Container from 'typedi';
 
-import type { OrchestrationService } from '@/services/orchestration.service';
 import { mockInstance, mockLogger } from '@test/mocking';
 
 import { JOB_TYPE_NAME, QUEUE_NAME } from '../constants';
@@ -47,7 +46,6 @@ describe('ScalingService', () => {
 	});
 
 	const instanceSettings = Container.get(InstanceSettings);
-	const orchestrationService = mock<OrchestrationService>({ isMultiMainSetupEnabled: false });
 	const jobProcessor = mock<JobProcessor>();
 
 	let scalingService: ScalingService;
@@ -77,11 +75,12 @@ describe('ScalingService', () => {
 		scalingService = new ScalingService(
 			mockLogger(),
 			mock(),
+			mock(),
 			jobProcessor,
 			globalConfig,
 			mock(),
 			instanceSettings,
-			orchestrationService,
+			mock(),
 			mock(),
 		);
 
diff --git a/packages/cli/src/scaling/job-processor.ts b/packages/cli/src/scaling/job-processor.ts
index 6bf2524304fa5..51b86c3922301 100644
--- a/packages/cli/src/scaling/job-processor.ts
+++ b/packages/cli/src/scaling/job-processor.ts
@@ -1,12 +1,7 @@
 import type { RunningJobSummary } from '@n8n/api-types';
-import { InstanceSettings, WorkflowExecute } from 'n8n-core';
+import { ErrorReporter, InstanceSettings, WorkflowExecute } from 'n8n-core';
 import type { ExecutionStatus, IExecuteResponsePromiseData, IRun } from 'n8n-workflow';
-import {
-	BINARY_ENCODING,
-	ApplicationError,
-	Workflow,
-	ErrorReporterProxy as ErrorReporter,
-} from 'n8n-workflow';
+import { BINARY_ENCODING, ApplicationError, Workflow } from 'n8n-workflow';
 import type PCancelable from 'p-cancelable';
 import { Service } from 'typedi';
 
@@ -35,6 +30,7 @@ export class JobProcessor {
 
 	constructor(
 		private readonly logger: Logger,
+		private readonly errorReporter: ErrorReporter,
 		private readonly executionRepository: ExecutionRepository,
 		private readonly workflowRepository: WorkflowRepository,
 		private readonly nodeTypes: NodeTypes,
@@ -155,7 +151,7 @@ export class JobProcessor {
 			workflowExecute = new WorkflowExecute(additionalData, execution.mode, execution.data);
 			workflowRun = workflowExecute.processRunExecutionData(workflow);
 		} else {
-			ErrorReporter.info(`Worker found execution ${executionId} without data`);
+			this.errorReporter.info(`Worker found execution ${executionId} without data`);
 			// Execute all nodes
 			// Can execute without webhook so go on
 			workflowExecute = new WorkflowExecute(additionalData, execution.mode);
diff --git a/packages/cli/src/scaling/pubsub/publisher.service.ts b/packages/cli/src/scaling/pubsub/publisher.service.ts
index 248a455e3ef55..4723b1d37dea7 100644
--- a/packages/cli/src/scaling/pubsub/publisher.service.ts
+++ b/packages/cli/src/scaling/pubsub/publisher.service.ts
@@ -4,6 +4,7 @@ import { Service } from 'typedi';
 
 import config from '@/config';
 import { Logger } from '@/logging/logger.service';
+import type { LogMetadata } from '@/logging/types';
 import { RedisClientService } from '@/services/redis-client.service';
 
 import type { PubSub } from './pubsub.types';
@@ -45,7 +46,7 @@ export class Publisher {
 	// #region Publishing
 
 	/** Publish a command into the `n8n.commands` channel. */
-	async publishCommand(msg: Omit<PubSub.Command, 'senderId'>) {
+	async publishCommand(msg: PubSub.Command) {
 		// @TODO: Once this class is only ever used in scaling mode, remove next line.
 		if (config.getEnv('executions.mode') !== 'queue') return;
 
@@ -59,7 +60,18 @@ export class Publisher {
 			}),
 		);
 
-		this.logger.debug(`Published ${msg.command} to command channel`);
+		let msgName = msg.command;
+
+		const metadata: LogMetadata = { msg: msg.command, channel: 'n8n.commands' };
+
+		if (msg.command === 'relay-execution-lifecycle-event') {
+			const { data, type } = msg.payload;
+			msgName += ` (${type})`;
+			metadata.type = type;
+			if ('executionId' in data) metadata.executionId = data.executionId;
+		}
+
+		this.logger.debug(`Published pubsub msg: ${msgName}`, metadata);
 	}
 
 	/** Publish a response to a command into the `n8n.worker-response` channel. */
diff --git a/packages/cli/src/scaling/pubsub/pubsub-handler.ts b/packages/cli/src/scaling/pubsub/pubsub-handler.ts
index deeed5b584dbb..70b5f67f72c37 100644
--- a/packages/cli/src/scaling/pubsub/pubsub-handler.ts
+++ b/packages/cli/src/scaling/pubsub/pubsub-handler.ts
@@ -59,9 +59,12 @@ export class PubSubHandler {
 					...this.commonHandlers,
 					...this.multiMainHandlers,
 					'response-to-get-worker-status': async (payload) =>
-						this.push.broadcast('sendWorkerStatusMessage', {
-							workerId: payload.senderId,
-							status: payload,
+						this.push.broadcast({
+							type: 'sendWorkerStatusMessage',
+							data: {
+								workerId: payload.senderId,
+								status: payload,
+							},
 						}),
 				});
 
@@ -113,7 +116,7 @@ export class PubSubHandler {
 					shouldPublish: false, // prevent leader from re-publishing message
 				});
 
-				this.push.broadcast('workflowActivated', { workflowId });
+				this.push.broadcast({ type: 'workflowActivated', data: { workflowId } });
 
 				await this.publisher.publishCommand({
 					command: 'display-workflow-activation',
@@ -125,7 +128,10 @@ export class PubSubHandler {
 
 				await this.workflowRepository.update(workflowId, { active: false });
 
-				this.push.broadcast('workflowFailedToActivate', { workflowId, errorMessage: message });
+				this.push.broadcast({
+					type: 'workflowFailedToActivate',
+					data: { workflowId, errorMessage: message },
+				});
 
 				await this.publisher.publishCommand({
 					command: 'display-workflow-activation-error',
@@ -139,7 +145,7 @@ export class PubSubHandler {
 			await this.activeWorkflowManager.removeActivationError(workflowId);
 			await this.activeWorkflowManager.removeWorkflowTriggersAndPollers(workflowId);
 
-			this.push.broadcast('workflowDeactivated', { workflowId });
+			this.push.broadcast({ type: 'workflowDeactivated', data: { workflowId } });
 
 			// instruct followers to show workflow deactivation in UI
 			await this.publisher.publishCommand({
@@ -148,15 +154,15 @@ export class PubSubHandler {
 			});
 		},
 		'display-workflow-activation': async ({ workflowId }) =>
-			this.push.broadcast('workflowActivated', { workflowId }),
+			this.push.broadcast({ type: 'workflowActivated', data: { workflowId } }),
 		'display-workflow-deactivation': async ({ workflowId }) =>
-			this.push.broadcast('workflowDeactivated', { workflowId }),
+			this.push.broadcast({ type: 'workflowDeactivated', data: { workflowId } }),
 		'display-workflow-activation-error': async ({ workflowId, errorMessage }) =>
-			this.push.broadcast('workflowFailedToActivate', { workflowId, errorMessage }),
-		'relay-execution-lifecycle-event': async ({ type, args, pushRef }) => {
+			this.push.broadcast({ type: 'workflowFailedToActivate', data: { workflowId, errorMessage } }),
+		'relay-execution-lifecycle-event': async ({ pushRef, ...pushMsg }) => {
 			if (!this.push.getBackend().hasPushRef(pushRef)) return;
 
-			this.push.send(type, args, pushRef);
+			this.push.send(pushMsg, pushRef);
 		},
 		'clear-test-webhooks': async ({ webhookKey, workflowEntity, pushRef }) => {
 			if (!this.push.getBackend().hasPushRef(pushRef)) return;
diff --git a/packages/cli/src/scaling/pubsub/pubsub.types.ts b/packages/cli/src/scaling/pubsub/pubsub.types.ts
index eec01102015b9..501185d07eaa1 100644
--- a/packages/cli/src/scaling/pubsub/pubsub.types.ts
+++ b/packages/cli/src/scaling/pubsub/pubsub.types.ts
@@ -23,10 +23,14 @@ export namespace PubSub {
 	// ----------------------------------
 
 	type _ToCommand<CommandKey extends keyof PubSubCommandMap> = {
-		senderId: string;
-		targets?: string[];
 		command: CommandKey;
 
+		/** Host ID of the sender, added during publishing. */
+		senderId?: string;
+
+		/** Host IDs of the receivers. */
+		targets?: string[];
+
 		/** Whether the command should be sent to the sender as well. */
 		selfSend?: boolean;
 
diff --git a/packages/cli/src/scaling/pubsub/subscriber.service.ts b/packages/cli/src/scaling/pubsub/subscriber.service.ts
index ed673fc4e4075..0ce343c139b0a 100644
--- a/packages/cli/src/scaling/pubsub/subscriber.service.ts
+++ b/packages/cli/src/scaling/pubsub/subscriber.service.ts
@@ -7,6 +7,7 @@ import { Service } from 'typedi';
 import config from '@/config';
 import { EventService } from '@/events/event.service';
 import { Logger } from '@/logging/logger.service';
+import type { LogMetadata } from '@/logging/types';
 import { RedisClientService } from '@/services/redis-client.service';
 
 import type { PubSub } from './pubsub.types';
@@ -72,7 +73,7 @@ export class Subscriber {
 		});
 
 		if (!msg) {
-			this.logger.error(`Received malformed message via channel ${channel}`, {
+			this.logger.error('Received malformed pubsub message', {
 				msg: str,
 				channel,
 			});
@@ -89,12 +90,18 @@ export class Subscriber {
 			return null;
 		}
 
-		const msgName = 'command' in msg ? msg.command : msg.response;
+		let msgName = 'command' in msg ? msg.command : msg.response;
 
-		this.logger.debug(`Received message ${msgName} via channel ${channel}`, {
-			msg,
-			channel,
-		});
+		const metadata: LogMetadata = { msg: msgName, channel };
+
+		if ('command' in msg && msg.command === 'relay-execution-lifecycle-event') {
+			const { data, type } = msg.payload;
+			msgName += ` (${type})`;
+			metadata.type = type;
+			if ('executionId' in data) metadata.executionId = data.executionId;
+		}
+
+		this.logger.debug(`Received pubsub msg: ${msgName}`, metadata);
 
 		return msg;
 	}
diff --git a/packages/cli/src/scaling/scaling.service.ts b/packages/cli/src/scaling/scaling.service.ts
index f7731e26c21e7..ebc8e4499ca90 100644
--- a/packages/cli/src/scaling/scaling.service.ts
+++ b/packages/cli/src/scaling/scaling.service.ts
@@ -1,13 +1,6 @@
 import { GlobalConfig } from '@n8n/config';
-import { InstanceSettings } from 'n8n-core';
-import {
-	ApplicationError,
-	BINARY_ENCODING,
-	sleep,
-	jsonStringify,
-	ErrorReporterProxy,
-	ensureError,
-} from 'n8n-workflow';
+import { ErrorReporter, InstanceSettings } from 'n8n-core';
+import { ApplicationError, BINARY_ENCODING, sleep, jsonStringify, ensureError } from 'n8n-workflow';
 import type { IExecuteResponsePromiseData } from 'n8n-workflow';
 import { strict } from 'node:assert';
 import Container, { Service } from 'typedi';
@@ -43,6 +36,7 @@ export class ScalingService {
 
 	constructor(
 		private readonly logger: Logger,
+		private readonly errorReporter: ErrorReporter,
 		private readonly activeExecutions: ActiveExecutions,
 		private readonly jobProcessor: JobProcessor,
 		private readonly globalConfig: GlobalConfig,
@@ -72,9 +66,11 @@ export class ScalingService {
 
 		this.registerListeners();
 
-		if (this.instanceSettings.isLeader) this.scheduleQueueRecovery();
+		const { isLeader, isMultiMain } = this.instanceSettings;
 
-		if (this.orchestrationService.isMultiMainSetupEnabled) {
+		if (isLeader) this.scheduleQueueRecovery();
+
+		if (isMultiMain) {
 			this.orchestrationService.multiMainSetup
 				.on('leader-takeover', () => this.scheduleQueueRecovery())
 				.on('leader-stepdown', () => this.stopQueueRecovery());
@@ -119,7 +115,7 @@ export class ScalingService {
 
 		await job.progress(msg);
 
-		ErrorReporterProxy.error(error, { executionId });
+		this.errorReporter.error(error, { executionId });
 
 		throw error;
 	}
@@ -133,7 +129,7 @@ export class ScalingService {
 	}
 
 	private async stopMain() {
-		if (this.orchestrationService.isSingleMainSetup) {
+		if (this.instanceSettings.isSingleMain) {
 			await this.queue.pause(true, true); // no more jobs will be picked up
 			this.logger.debug('Queue paused');
 		}
@@ -379,7 +375,7 @@ export class ScalingService {
 		return (
 			this.globalConfig.endpoints.metrics.includeQueueMetrics &&
 			this.instanceSettings.instanceType === 'main' &&
-			!this.orchestrationService.isMultiMainSetupEnabled
+			this.instanceSettings.isSingleMain
 		);
 	}
 
diff --git a/packages/cli/src/server.ts b/packages/cli/src/server.ts
index 06d2dbe4f8c84..74a13114448aa 100644
--- a/packages/cli/src/server.ts
+++ b/packages/cli/src/server.ts
@@ -32,7 +32,6 @@ import { setupPushServer, setupPushHandler, Push } from '@/push';
 import type { APIRequest } from '@/requests';
 import * as ResponseHelper from '@/response-helper';
 import type { FrontendService } from '@/services/frontend.service';
-import { OrchestrationService } from '@/services/orchestration.service';
 
 import '@/controllers/active-workflows.controller';
 import '@/controllers/annotation-tags.controller.ee';
@@ -79,7 +78,6 @@ export class Server extends AbstractServer {
 
 	constructor(
 		private readonly loadNodesAndCredentials: LoadNodesAndCredentials,
-		private readonly orchestrationService: OrchestrationService,
 		private readonly postHogClient: PostHogClient,
 		private readonly eventService: EventService,
 		private readonly instanceSettings: InstanceSettings,
@@ -111,7 +109,7 @@ export class Server extends AbstractServer {
 	}
 
 	private async registerAdditionalControllers() {
-		if (!inProduction && this.orchestrationService.isMultiMainSetupEnabled) {
+		if (!inProduction && this.instanceSettings.isMultiMain) {
 			await import('@/controllers/debug.controller');
 		}
 
diff --git a/packages/cli/src/services/__tests__/credentials-tester.service.test.ts b/packages/cli/src/services/__tests__/credentials-tester.service.test.ts
index 4da925c532d2d..60c49b7773857 100644
--- a/packages/cli/src/services/__tests__/credentials-tester.service.test.ts
+++ b/packages/cli/src/services/__tests__/credentials-tester.service.test.ts
@@ -8,7 +8,13 @@ import { CredentialsTester } from '@/services/credentials-tester.service';
 describe('CredentialsTester', () => {
 	const credentialTypes = mock<CredentialTypes>();
 	const nodeTypes = mock<NodeTypes>();
-	const credentialsTester = new CredentialsTester(mock(), credentialTypes, nodeTypes, mock());
+	const credentialsTester = new CredentialsTester(
+		mock(),
+		mock(),
+		credentialTypes,
+		nodeTypes,
+		mock(),
+	);
 
 	beforeEach(() => {
 		jest.clearAllMocks();
diff --git a/packages/cli/src/services/credentials-tester.service.ts b/packages/cli/src/services/credentials-tester.service.ts
index 30504e464bcc1..6ae7201ac0558 100644
--- a/packages/cli/src/services/credentials-tester.service.ts
+++ b/packages/cli/src/services/credentials-tester.service.ts
@@ -4,7 +4,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 import get from 'lodash/get';
-import { NodeExecuteFunctions } from 'n8n-core';
+import { ErrorReporter, NodeExecuteFunctions, RoutingNode, isObjectLiteral } from 'n8n-core';
 import type {
 	ICredentialsDecrypted,
 	ICredentialTestFunction,
@@ -23,14 +23,7 @@ import type {
 	ICredentialTestFunctions,
 	IDataObject,
 } from 'n8n-workflow';
-import {
-	VersionedNodeType,
-	NodeHelpers,
-	RoutingNode,
-	Workflow,
-	ErrorReporterProxy as ErrorReporter,
-	ApplicationError,
-} from 'n8n-workflow';
+import { VersionedNodeType, NodeHelpers, Workflow, ApplicationError } from 'n8n-workflow';
 import { Service } from 'typedi';
 
 import { CredentialTypes } from '@/credential-types';
@@ -41,7 +34,6 @@ import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-da
 
 import { RESPONSE_ERROR_MESSAGES } from '../constants';
 import { CredentialsHelper } from '../credentials-helper';
-import { isObjectLiteral } from '../utils';
 
 const { OAUTH2_CREDENTIAL_TEST_SUCCEEDED, OAUTH2_CREDENTIAL_TEST_FAILED } = RESPONSE_ERROR_MESSAGES;
 
@@ -75,6 +67,7 @@ const mockNodeTypes: INodeTypes = {
 export class CredentialsTester {
 	constructor(
 		private readonly logger: Logger,
+		private readonly errorReporter: ErrorReporter,
 		private readonly credentialTypes: CredentialTypes,
 		private readonly nodeTypes: NodeTypes,
 		private readonly credentialsHelper: CredentialsHelper,
@@ -312,11 +305,10 @@ export class CredentialsTester {
 				runIndex,
 				nodeTypeCopy,
 				{ node, data: {}, source: null },
-				NodeExecuteFunctions,
 				credentialsDecrypted,
 			);
 		} catch (error) {
-			ErrorReporter.error(error);
+			this.errorReporter.error(error);
 			// Do not fail any requests to allow custom error messages and
 			// make logic easier
 			if (error.cause?.response) {
diff --git a/packages/cli/src/services/dynamic-node-parameters.service.ts b/packages/cli/src/services/dynamic-node-parameters.service.ts
index eb6ecc5f67380..65c40ef0b647e 100644
--- a/packages/cli/src/services/dynamic-node-parameters.service.ts
+++ b/packages/cli/src/services/dynamic-node-parameters.service.ts
@@ -1,4 +1,4 @@
-import { LoadOptionsContext, NodeExecuteFunctions } from 'n8n-core';
+import { LoadOptionsContext, RoutingNode, LocalLoadOptionsContext } from 'n8n-core';
 import type {
 	ILoadOptions,
 	ILoadOptionsFunctions,
@@ -17,15 +17,43 @@ import type {
 	INodeTypeNameVersion,
 	NodeParameterValueType,
 	IDataObject,
+	ILocalLoadOptionsFunctions,
 } from 'n8n-workflow';
-import { Workflow, RoutingNode, ApplicationError } from 'n8n-workflow';
+import { Workflow, ApplicationError } from 'n8n-workflow';
 import { Service } from 'typedi';
 
 import { NodeTypes } from '@/node-types';
 
+import { WorkflowLoaderService } from './workflow-loader.service';
+
+type LocalResourceMappingMethod = (
+	this: ILocalLoadOptionsFunctions,
+) => Promise<ResourceMapperFields>;
+type ListSearchMethod = (
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+) => Promise<INodeListSearchResult>;
+type LoadOptionsMethod = (this: ILoadOptionsFunctions) => Promise<INodePropertyOptions[]>;
+type ActionHandlerMethod = (
+	this: ILoadOptionsFunctions,
+	payload?: string,
+) => Promise<NodeParameterValueType>;
+type ResourceMappingMethod = (this: ILoadOptionsFunctions) => Promise<ResourceMapperFields>;
+
+type NodeMethod =
+	| LocalResourceMappingMethod
+	| ListSearchMethod
+	| LoadOptionsMethod
+	| ActionHandlerMethod
+	| ResourceMappingMethod;
+
 @Service()
 export class DynamicNodeParametersService {
-	constructor(private nodeTypes: NodeTypes) {}
+	constructor(
+		private nodeTypes: NodeTypes,
+		private workflowLoaderService: WorkflowLoaderService,
+	) {}
 
 	/** Returns the available options via a predefined method */
 	async getOptionsViaMethodName(
@@ -40,6 +68,8 @@ export class DynamicNodeParametersService {
 		const method = this.getMethod('loadOptions', methodName, nodeType);
 		const workflow = this.getWorkflow(nodeTypeAndVersion, currentNodeParameters, credentials);
 		const thisArgs = this.getThisArg(path, additionalData, workflow);
+		// Need to use untyped call since `this` usage is widespread and we don't have `strictBindCallApply`
+		// enabled in `tsconfig.json`
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-return
 		return method.call(thisArgs);
 	}
@@ -105,13 +135,11 @@ export class DynamicNodeParametersService {
 			main: [[{ json: {} }]],
 		};
 
-		const optionsData = await routingNode.runNode(
-			inputData,
-			runIndex,
-			tempNode,
-			{ node, source: null, data: {} },
-			NodeExecuteFunctions,
-		);
+		const optionsData = await routingNode.runNode(inputData, runIndex, tempNode, {
+			node,
+			source: null,
+			data: {},
+		});
 
 		if (optionsData?.length === 0) {
 			return [];
@@ -159,6 +187,20 @@ export class DynamicNodeParametersService {
 		return method.call(thisArgs);
 	}
 
+	/** Returns the available workflow input mapping fields for the ResourceMapper component */
+	async getLocalResourceMappingFields(
+		methodName: string,
+		path: string,
+		additionalData: IWorkflowExecuteAdditionalData,
+		nodeTypeAndVersion: INodeTypeNameVersion,
+	): Promise<ResourceMapperFields> {
+		const nodeType = this.getNodeType(nodeTypeAndVersion);
+		const method = this.getMethod('localResourceMapping', methodName, nodeType);
+		const thisArgs = this.getLocalLoadOptionsContext(path, additionalData);
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+		return method.call(thisArgs);
+	}
+
 	/** Returns the result of the action handler */
 	async getActionResult(
 		handler: string,
@@ -181,33 +223,34 @@ export class DynamicNodeParametersService {
 		type: 'resourceMapping',
 		methodName: string,
 		nodeType: INodeType,
-	): (this: ILoadOptionsFunctions) => Promise<ResourceMapperFields>;
+	): ResourceMappingMethod;
 	private getMethod(
-		type: 'listSearch',
+		type: 'localResourceMapping',
 		methodName: string,
 		nodeType: INodeType,
-	): (
-		this: ILoadOptionsFunctions,
-		filter?: string | undefined,
-		paginationToken?: string | undefined,
-	) => Promise<INodeListSearchResult>;
+	): LocalResourceMappingMethod;
+	private getMethod(type: 'listSearch', methodName: string, nodeType: INodeType): ListSearchMethod;
 	private getMethod(
 		type: 'loadOptions',
 		methodName: string,
 		nodeType: INodeType,
-	): (this: ILoadOptionsFunctions) => Promise<INodePropertyOptions[]>;
+	): LoadOptionsMethod;
 	private getMethod(
 		type: 'actionHandler',
 		methodName: string,
 		nodeType: INodeType,
-	): (this: ILoadOptionsFunctions, payload?: string) => Promise<NodeParameterValueType>;
-
+	): ActionHandlerMethod;
 	private getMethod(
-		type: 'resourceMapping' | 'listSearch' | 'loadOptions' | 'actionHandler',
+		type:
+			| 'resourceMapping'
+			| 'localResourceMapping'
+			| 'listSearch'
+			| 'loadOptions'
+			| 'actionHandler',
 		methodName: string,
 		nodeType: INodeType,
-	) {
-		const method = nodeType.methods?.[type]?.[methodName];
+	): NodeMethod {
+		const method = nodeType.methods?.[type]?.[methodName] as NodeMethod;
 		if (typeof method !== 'function') {
 			throw new ApplicationError('Node type does not have method defined', {
 				tags: { nodeType: nodeType.description.name },
@@ -255,4 +298,16 @@ export class DynamicNodeParametersService {
 		const node = workflow.nodes['Temp-Node'];
 		return new LoadOptionsContext(workflow, node, additionalData, path);
 	}
+
+	private getLocalLoadOptionsContext(
+		path: string,
+		additionalData: IWorkflowExecuteAdditionalData,
+	): ILocalLoadOptionsFunctions {
+		return new LocalLoadOptionsContext(
+			this.nodeTypes,
+			additionalData,
+			path,
+			this.workflowLoaderService,
+		);
+	}
 }
diff --git a/packages/cli/src/services/frontend.service.ts b/packages/cli/src/services/frontend.service.ts
index 535239d5a46bc..1645e98304d56 100644
--- a/packages/cli/src/services/frontend.service.ts
+++ b/packages/cli/src/services/frontend.service.ts
@@ -5,7 +5,6 @@ import { mkdir } from 'fs/promises';
 import uniq from 'lodash/uniq';
 import { InstanceSettings } from 'n8n-core';
 import type { ICredentialType, INodeTypeBaseDescription } from 'n8n-workflow';
-import fs from 'node:fs';
 import path from 'path';
 import { Container, Service } from 'typedi';
 
@@ -83,7 +82,7 @@ export class FrontendService {
 
 		this.settings = {
 			inE2ETests,
-			isDocker: this.isDocker(),
+			isDocker: this.instanceSettings.isDocker,
 			databaseType: this.globalConfig.database.type,
 			previewMode: process.env.N8N_PREVIEW_MODE === 'true',
 			endpointForm: this.globalConfig.endpoints.form,
@@ -231,7 +230,6 @@ export class FrontendService {
 				blockFileAccessToN8nFiles: this.securityConfig.blockFileAccessToN8nFiles,
 			},
 			betaFeatures: this.frontendConfig.betaFeatures,
-			virtualSchemaView: config.getEnv('virtualSchemaView'),
 			easyAIWorkflowOnboarded: false,
 		};
 	}
@@ -393,20 +391,4 @@ export class FrontendService {
 			}
 		}
 	}
-
-	/**
-	 * Whether this instance is running inside a Docker container.
-	 *
-	 * Based on: https://github.com/sindresorhus/is-docker
-	 */
-	private isDocker() {
-		try {
-			return (
-				fs.existsSync('/.dockerenv') ||
-				fs.readFileSync('/proc/self/cgroup', 'utf8').includes('docker')
-			);
-		} catch {
-			return false;
-		}
-	}
 }
diff --git a/packages/cli/src/services/orchestration.service.ts b/packages/cli/src/services/orchestration.service.ts
index 19da88e412f64..adf03d97bf230 100644
--- a/packages/cli/src/services/orchestration.service.ts
+++ b/packages/cli/src/services/orchestration.service.ts
@@ -22,29 +22,6 @@ export class OrchestrationService {
 
 	isInitialized = false;
 
-	private isMultiMainSetupLicensed = false;
-
-	setMultiMainSetupLicensed(newState: boolean) {
-		this.isMultiMainSetupLicensed = newState;
-	}
-
-	get isMultiMainSetupEnabled() {
-		return (
-			config.getEnv('executions.mode') === 'queue' &&
-			this.globalConfig.multiMainSetup.enabled &&
-			this.instanceSettings.instanceType === 'main' &&
-			this.isMultiMainSetupLicensed
-		);
-	}
-
-	get isSingleMainSetup() {
-		return !this.isMultiMainSetupEnabled;
-	}
-
-	sanityCheck() {
-		return this.isInitialized && config.get('executions.mode') === 'queue';
-	}
-
 	async init() {
 		if (this.isInitialized) return;
 
@@ -56,7 +33,7 @@ export class OrchestrationService {
 			this.subscriber = Container.get(Subscriber);
 		}
 
-		if (this.isMultiMainSetupEnabled) {
+		if (this.instanceSettings.isMultiMain) {
 			await this.multiMainSetup.init();
 		} else {
 			this.instanceSettings.markAsLeader();
@@ -69,7 +46,7 @@ export class OrchestrationService {
 	async shutdown() {
 		if (!this.isInitialized) return;
 
-		if (this.isMultiMainSetupEnabled) await this.multiMainSetup.shutdown();
+		if (this.instanceSettings.isMultiMain) await this.multiMainSetup.shutdown();
 
 		this.publisher.shutdown();
 		this.subscriber.shutdown();
diff --git a/packages/cli/src/services/pruning/__tests__/pruning.service.test.ts b/packages/cli/src/services/pruning/__tests__/pruning.service.test.ts
index 42fe73dd5eb24..050d1b82d9a6f 100644
--- a/packages/cli/src/services/pruning/__tests__/pruning.service.test.ts
+++ b/packages/cli/src/services/pruning/__tests__/pruning.service.test.ts
@@ -17,11 +17,10 @@ describe('PruningService', () => {
 		it('should start pruning on main instance that is the leader', () => {
 			const pruningService = new PruningService(
 				mockLogger(),
-				mock<InstanceSettings>({ isLeader: true }),
+				mock<InstanceSettings>({ isLeader: true, isMultiMain: true }),
 				mock(),
 				mock(),
 				mock<OrchestrationService>({
-					isMultiMainSetupEnabled: true,
 					multiMainSetup: mock<MultiMainSetup>(),
 				}),
 				mock(),
@@ -36,11 +35,10 @@ describe('PruningService', () => {
 		it('should not start pruning on main instance that is a follower', () => {
 			const pruningService = new PruningService(
 				mockLogger(),
-				mock<InstanceSettings>({ isLeader: false }),
+				mock<InstanceSettings>({ isLeader: false, isMultiMain: true }),
 				mock(),
 				mock(),
 				mock<OrchestrationService>({
-					isMultiMainSetupEnabled: true,
 					multiMainSetup: mock<MultiMainSetup>(),
 				}),
 				mock(),
@@ -55,11 +53,10 @@ describe('PruningService', () => {
 		it('should register leadership events if main on multi-main setup', () => {
 			const pruningService = new PruningService(
 				mockLogger(),
-				mock<InstanceSettings>({ isLeader: true }),
+				mock<InstanceSettings>({ isLeader: true, isMultiMain: true }),
 				mock(),
 				mock(),
 				mock<OrchestrationService>({
-					isMultiMainSetupEnabled: true,
 					multiMainSetup: mock<MultiMainSetup>({ on: jest.fn() }),
 				}),
 				mock(),
@@ -85,11 +82,10 @@ describe('PruningService', () => {
 		it('should return `true` based on config if leader main', () => {
 			const pruningService = new PruningService(
 				mockLogger(),
-				mock<InstanceSettings>({ isLeader: true, instanceType: 'main' }),
+				mock<InstanceSettings>({ isLeader: true, instanceType: 'main', isMultiMain: true }),
 				mock(),
 				mock(),
 				mock<OrchestrationService>({
-					isMultiMainSetupEnabled: true,
 					multiMainSetup: mock<MultiMainSetup>(),
 				}),
 				mock<ExecutionsConfig>({ pruneData: true }),
@@ -101,11 +97,10 @@ describe('PruningService', () => {
 		it('should return `false` based on config if leader main', () => {
 			const pruningService = new PruningService(
 				mockLogger(),
-				mock<InstanceSettings>({ isLeader: true, instanceType: 'main' }),
+				mock<InstanceSettings>({ isLeader: true, instanceType: 'main', isMultiMain: true }),
 				mock(),
 				mock(),
 				mock<OrchestrationService>({
-					isMultiMainSetupEnabled: true,
 					multiMainSetup: mock<MultiMainSetup>(),
 				}),
 				mock<ExecutionsConfig>({ pruneData: false }),
@@ -117,11 +112,10 @@ describe('PruningService', () => {
 		it('should return `false` if non-main even if config is enabled', () => {
 			const pruningService = new PruningService(
 				mockLogger(),
-				mock<InstanceSettings>({ isLeader: false, instanceType: 'worker' }),
+				mock<InstanceSettings>({ isLeader: false, instanceType: 'worker', isMultiMain: true }),
 				mock(),
 				mock(),
 				mock<OrchestrationService>({
-					isMultiMainSetupEnabled: true,
 					multiMainSetup: mock<MultiMainSetup>(),
 				}),
 				mock<ExecutionsConfig>({ pruneData: true }),
@@ -133,11 +127,15 @@ describe('PruningService', () => {
 		it('should return `false` if follower main even if config is enabled', () => {
 			const pruningService = new PruningService(
 				mockLogger(),
-				mock<InstanceSettings>({ isLeader: false, isFollower: true, instanceType: 'main' }),
+				mock<InstanceSettings>({
+					isLeader: false,
+					isFollower: true,
+					instanceType: 'main',
+					isMultiMain: true,
+				}),
 				mock(),
 				mock(),
 				mock<OrchestrationService>({
-					isMultiMainSetupEnabled: true,
 					multiMainSetup: mock<MultiMainSetup>(),
 				}),
 				mock<ExecutionsConfig>({ pruneData: true }),
@@ -151,11 +149,10 @@ describe('PruningService', () => {
 		it('should not start pruning if service is disabled', () => {
 			const pruningService = new PruningService(
 				mockLogger(),
-				mock<InstanceSettings>({ isLeader: true, instanceType: 'main' }),
+				mock<InstanceSettings>({ isLeader: true, instanceType: 'main', isMultiMain: true }),
 				mock(),
 				mock(),
 				mock<OrchestrationService>({
-					isMultiMainSetupEnabled: true,
 					multiMainSetup: mock<MultiMainSetup>(),
 				}),
 				mock<ExecutionsConfig>({ pruneData: false }),
@@ -179,11 +176,10 @@ describe('PruningService', () => {
 		it('should start pruning if service is enabled and DB is migrated', () => {
 			const pruningService = new PruningService(
 				mockLogger(),
-				mock<InstanceSettings>({ isLeader: true, instanceType: 'main' }),
+				mock<InstanceSettings>({ isLeader: true, instanceType: 'main', isMultiMain: true }),
 				mock(),
 				mock(),
 				mock<OrchestrationService>({
-					isMultiMainSetupEnabled: true,
 					multiMainSetup: mock<MultiMainSetup>(),
 				}),
 				mock<ExecutionsConfig>({ pruneData: true }),
diff --git a/packages/cli/src/services/pruning/pruning.service.ts b/packages/cli/src/services/pruning/pruning.service.ts
index 3006d3fbd91de..aad8c5490f340 100644
--- a/packages/cli/src/services/pruning/pruning.service.ts
+++ b/packages/cli/src/services/pruning/pruning.service.ts
@@ -13,9 +13,17 @@ import { Logger } from '@/logging/logger.service';
 import { OrchestrationService } from '../orchestration.service';
 
 /**
- * Responsible for pruning executions from the database and their associated binary data
- * from the filesystem, on a rolling basis. By default we soft-delete execution rows
- * every cycle and hard-delete them and their binary data every 4th cycle.
+ * Responsible for deleting old executions from the database and deleting their
+ * associated binary data from the filesystem, on a rolling basis.
+ *
+ * By default:
+ *
+ * - Soft deletion (every 60m) identifies all prunable executions based on max
+ *   age and/or max count, exempting annotated executions.
+ * - Hard deletion (every 15m) processes prunable executions in batches of 100,
+ *   switching to 1s intervals until the total to prune is back down low enough,
+ *   or in case the hard deletion fails.
+ * - Once mostly caught up, hard deletion goes back to the 15m schedule.
  */
 @Service()
 export class PruningService {
@@ -51,7 +59,7 @@ export class PruningService {
 
 		if (this.instanceSettings.isLeader) this.startPruning();
 
-		if (this.orchestrationService.isMultiMainSetupEnabled) {
+		if (this.instanceSettings.isMultiMain) {
 			this.orchestrationService.multiMainSetup.on('leader-takeover', () => this.startPruning());
 			this.orchestrationService.multiMainSetup.on('leader-stepdown', () => this.stopPruning());
 		}
diff --git a/packages/cli/src/services/workflow-loader.service.ts b/packages/cli/src/services/workflow-loader.service.ts
new file mode 100644
index 0000000000000..ca1a9ff48c0b7
--- /dev/null
+++ b/packages/cli/src/services/workflow-loader.service.ts
@@ -0,0 +1,19 @@
+import { ApplicationError, type IWorkflowBase, type IWorkflowLoader } from 'n8n-workflow';
+import { Service } from 'typedi';
+
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+
+@Service()
+export class WorkflowLoaderService implements IWorkflowLoader {
+	constructor(private readonly workflowRepository: WorkflowRepository) {}
+
+	async get(workflowId: string): Promise<IWorkflowBase> {
+		const workflow = await this.workflowRepository.findById(workflowId);
+
+		if (!workflow) {
+			throw new ApplicationError(`Failed to find workflow with ID "${workflowId}"`);
+		}
+
+		return workflow;
+	}
+}
diff --git a/packages/cli/src/shutdown/__tests__/shutdown.service.test.ts b/packages/cli/src/shutdown/__tests__/shutdown.service.test.ts
index 9c2f5b4887fbe..26d6471584573 100644
--- a/packages/cli/src/shutdown/__tests__/shutdown.service.test.ts
+++ b/packages/cli/src/shutdown/__tests__/shutdown.service.test.ts
@@ -1,5 +1,6 @@
 import { mock } from 'jest-mock-extended';
-import { ApplicationError, ErrorReporterProxy } from 'n8n-workflow';
+import type { ErrorReporter } from 'n8n-core';
+import { ApplicationError } from 'n8n-workflow';
 import Container from 'typedi';
 
 import type { ServiceClass } from '@/shutdown/shutdown.service';
@@ -13,14 +14,13 @@ describe('ShutdownService', () => {
 	let shutdownService: ShutdownService;
 	let mockComponent: MockComponent;
 	let onShutdownSpy: jest.SpyInstance;
-	let mockErrorReporterProxy: jest.SpyInstance;
+	const errorReporter = mock<ErrorReporter>();
 
 	beforeEach(() => {
-		shutdownService = new ShutdownService(mock());
+		shutdownService = new ShutdownService(mock(), errorReporter);
 		mockComponent = new MockComponent();
 		Container.set(MockComponent, mockComponent);
 		onShutdownSpy = jest.spyOn(mockComponent, 'onShutdown');
-		mockErrorReporterProxy = jest.spyOn(ErrorReporterProxy, 'error').mockImplementation(() => {});
 	});
 
 	describe('shutdown', () => {
@@ -83,8 +83,8 @@ describe('ShutdownService', () => {
 			shutdownService.shutdown();
 			await shutdownService.waitForShutdown();
 
-			expect(mockErrorReporterProxy).toHaveBeenCalledTimes(1);
-			const error = mockErrorReporterProxy.mock.calls[0][0];
+			expect(errorReporter.error).toHaveBeenCalledTimes(1);
+			const error = errorReporter.error.mock.calls[0][0] as ApplicationError;
 			expect(error).toBeInstanceOf(ApplicationError);
 			expect(error.message).toBe('Failed to shutdown gracefully');
 			expect(error.extra).toEqual({
diff --git a/packages/cli/src/shutdown/shutdown.service.ts b/packages/cli/src/shutdown/shutdown.service.ts
index 1bedc3a7d4b68..8ff8570757b86 100644
--- a/packages/cli/src/shutdown/shutdown.service.ts
+++ b/packages/cli/src/shutdown/shutdown.service.ts
@@ -1,5 +1,5 @@
-import type { Class } from 'n8n-core';
-import { ApplicationError, ErrorReporterProxy, assert } from 'n8n-workflow';
+import { type Class, ErrorReporter } from 'n8n-core';
+import { ApplicationError, assert } from 'n8n-workflow';
 import { Container, Service } from 'typedi';
 
 import { LOWEST_SHUTDOWN_PRIORITY, HIGHEST_SHUTDOWN_PRIORITY } from '@/constants';
@@ -31,7 +31,10 @@ export class ShutdownService {
 
 	private shutdownPromise: Promise<void> | undefined;
 
-	constructor(private readonly logger: Logger) {}
+	constructor(
+		private readonly logger: Logger,
+		private readonly errorReporter: ErrorReporter,
+	) {}
 
 	/** Registers given listener to be notified when the application is shutting down */
 	register(priority: number, handler: ShutdownHandler) {
@@ -108,7 +111,7 @@ export class ShutdownService {
 			await method.call(service);
 		} catch (error) {
 			assert(error instanceof Error);
-			ErrorReporterProxy.error(new ComponentShutdownError(name, error));
+			this.errorReporter.error(new ComponentShutdownError(name, error));
 		}
 	}
 }
diff --git a/packages/cli/src/sso/saml/saml.service.ee.ts b/packages/cli/src/sso/saml/saml.service.ee.ts
index ce69a39e6d0ad..3672c8fe6ff23 100644
--- a/packages/cli/src/sso/saml/saml.service.ee.ts
+++ b/packages/cli/src/sso/saml/saml.service.ee.ts
@@ -68,7 +68,7 @@ export class SamlService {
 		},
 	};
 
-	public get samlPreferences(): SamlPreferences {
+	get samlPreferences(): SamlPreferences {
 		return {
 			...this._samlPreferences,
 			loginEnabled: isSamlLoginEnabled(),
diff --git a/packages/cli/src/user-management/email/node-mailer.ts b/packages/cli/src/user-management/email/node-mailer.ts
index 661c3fed7f79d..a35ab77318456 100644
--- a/packages/cli/src/user-management/email/node-mailer.ts
+++ b/packages/cli/src/user-management/email/node-mailer.ts
@@ -1,6 +1,6 @@
 import { GlobalConfig } from '@n8n/config';
 import { pick } from 'lodash';
-import { ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
+import { ErrorReporter } from 'n8n-core';
 import path from 'node:path';
 import type { Transporter } from 'nodemailer';
 import { createTransport } from 'nodemailer';
@@ -20,6 +20,7 @@ export class NodeMailer {
 	constructor(
 		globalConfig: GlobalConfig,
 		private readonly logger: Logger,
+		private readonly errorReporter: ErrorReporter,
 	) {
 		const smtpConfig = globalConfig.userManagement.emails.smtp;
 		const transportConfig: SMTPConnection.Options = pick(smtpConfig, ['host', 'port', 'secure']);
@@ -66,7 +67,7 @@ export class NodeMailer {
 				`Email sent successfully to the following recipients: ${mailData.emailRecipients.toString()}`,
 			);
 		} catch (error) {
-			ErrorReporter.error(error);
+			this.errorReporter.error(error);
 			this.logger.error('Failed to send email', {
 				recipients: mailData.emailRecipients,
 				error: error as Error,
diff --git a/packages/cli/src/utils.ts b/packages/cli/src/utils.ts
index 700f74f9d068a..d701707a11506 100644
--- a/packages/cli/src/utils.ts
+++ b/packages/cli/src/utils.ts
@@ -58,10 +58,6 @@ export function isStringArray(value: unknown): value is string[] {
 
 export const isIntegerString = (value: string) => /^\d+$/.test(value);
 
-export function isObjectLiteral(item: unknown): item is { [key: string]: unknown } {
-	return typeof item === 'object' && item !== null && !Array.isArray(item);
-}
-
 export function removeTrailingSlash(path: string) {
 	return path.endsWith('/') ? path.slice(0, -1) : path;
 }
diff --git a/packages/cli/src/wait-tracker.ts b/packages/cli/src/wait-tracker.ts
index a80ae8f259510..f42905ace1978 100644
--- a/packages/cli/src/wait-tracker.ts
+++ b/packages/cli/src/wait-tracker.ts
@@ -40,12 +40,11 @@ export class WaitTracker {
 	 * @important Requires `OrchestrationService` to be initialized.
 	 */
 	init() {
-		const { isLeader } = this.instanceSettings;
-		const { isMultiMainSetupEnabled } = this.orchestrationService;
+		const { isLeader, isMultiMain } = this.instanceSettings;
 
 		if (isLeader) this.startTracking();
 
-		if (isMultiMainSetupEnabled) {
+		if (isMultiMain) {
 			this.orchestrationService.multiMainSetup
 				.on('leader-takeover', () => this.startTracking())
 				.on('leader-stepdown', () => this.stopTracking());
diff --git a/packages/cli/src/webhooks/__tests__/test-webhook-registrations.service.test.ts b/packages/cli/src/webhooks/__tests__/test-webhook-registrations.service.test.ts
index 0642a5eaa54fb..b3b4515d68ecf 100644
--- a/packages/cli/src/webhooks/__tests__/test-webhook-registrations.service.test.ts
+++ b/packages/cli/src/webhooks/__tests__/test-webhook-registrations.service.test.ts
@@ -1,7 +1,7 @@
 import { mock } from 'jest-mock-extended';
+import type { InstanceSettings } from 'n8n-core';
 
 import type { CacheService } from '@/services/cache/cache.service';
-import type { OrchestrationService } from '@/services/orchestration.service';
 import type { TestWebhookRegistration } from '@/webhooks/test-webhook-registrations.service';
 import { TestWebhookRegistrationsService } from '@/webhooks/test-webhook-registrations.service';
 
@@ -9,7 +9,7 @@ describe('TestWebhookRegistrationsService', () => {
 	const cacheService = mock<CacheService>();
 	const registrations = new TestWebhookRegistrationsService(
 		cacheService,
-		mock<OrchestrationService>({ isMultiMainSetupEnabled: false }),
+		mock<InstanceSettings>({ isMultiMain: false }),
 	);
 
 	const registration = mock<TestWebhookRegistration>({
diff --git a/packages/cli/src/webhooks/__tests__/test-webhooks.test.ts b/packages/cli/src/webhooks/__tests__/test-webhooks.test.ts
index 50f5bc2f1237d..a07d4fc0fda25 100644
--- a/packages/cli/src/webhooks/__tests__/test-webhooks.test.ts
+++ b/packages/cli/src/webhooks/__tests__/test-webhooks.test.ts
@@ -18,6 +18,7 @@ import type {
 } from '@/webhooks/test-webhook-registrations.service';
 import { TestWebhooks } from '@/webhooks/test-webhooks';
 import * as WebhookHelpers from '@/webhooks/webhook-helpers';
+import type { WebhookService } from '@/webhooks/webhook.service';
 import type { WebhookRequest } from '@/webhooks/webhook.types';
 import * as AdditionalData from '@/workflow-execute-additional-data';
 
@@ -38,13 +39,20 @@ const webhook = mock<IWebhookData>({
 	userId,
 });
 
-const registrations = mock<TestWebhookRegistrationsService>();
-
-let testWebhooks: TestWebhooks;
-
 describe('TestWebhooks', () => {
+	const registrations = mock<TestWebhookRegistrationsService>();
+	const webhookService = mock<WebhookService>();
+
+	const testWebhooks = new TestWebhooks(
+		mock(),
+		mock(),
+		registrations,
+		mock(),
+		mock(),
+		webhookService,
+	);
+
 	beforeAll(() => {
-		testWebhooks = new TestWebhooks(mock(), mock(), registrations, mock(), mock());
 		jest.useFakeTimers();
 	});
 
@@ -68,7 +76,7 @@ describe('TestWebhooks', () => {
 			const needsWebhook = await testWebhooks.needsWebhook(args);
 
 			const [registerOrder] = registrations.register.mock.invocationCallOrder;
-			const [createOrder] = workflow.createWebhookIfNotExists.mock.invocationCallOrder;
+			const [createOrder] = webhookService.createWebhookIfNotExists.mock.invocationCallOrder;
 
 			expect(registerOrder).toBeLessThan(createOrder);
 			expect(needsWebhook).toBe(true);
@@ -132,11 +140,11 @@ describe('TestWebhooks', () => {
 
 			// ASSERT
 			const [registerOrder] = registrations.register.mock.invocationCallOrder;
-			const [createOrder] = workflow.createWebhookIfNotExists.mock.invocationCallOrder;
+			const [createOrder] = webhookService.createWebhookIfNotExists.mock.invocationCallOrder;
 
 			expect(registerOrder).toBeLessThan(createOrder);
 			expect(registrations.register.mock.calls[0][0].webhook.node).toBe(webhook2.node);
-			expect(workflow.createWebhookIfNotExists.mock.calls[0][0].node).toBe(webhook2.node);
+			expect(webhookService.createWebhookIfNotExists.mock.calls[0][1].node).toBe(webhook2.node);
 			expect(needsWebhook).toBe(true);
 		});
 	});
diff --git a/packages/cli/src/webhooks/__tests__/waiting-forms.test.ts b/packages/cli/src/webhooks/__tests__/waiting-forms.test.ts
index bec6f95d7fad5..f342095b77feb 100644
--- a/packages/cli/src/webhooks/__tests__/waiting-forms.test.ts
+++ b/packages/cli/src/webhooks/__tests__/waiting-forms.test.ts
@@ -6,7 +6,7 @@ import { WaitingForms } from '@/webhooks/waiting-forms';
 
 describe('WaitingForms', () => {
 	const executionRepository = mock<ExecutionRepository>();
-	const waitingWebhooks = new WaitingForms(mock(), mock(), executionRepository);
+	const waitingWebhooks = new WaitingForms(mock(), mock(), executionRepository, mock());
 
 	beforeEach(() => {
 		jest.restoreAllMocks();
diff --git a/packages/cli/src/webhooks/__tests__/waiting-webhooks.test.ts b/packages/cli/src/webhooks/__tests__/waiting-webhooks.test.ts
index 892d87e773ce3..72fe654c55b95 100644
--- a/packages/cli/src/webhooks/__tests__/waiting-webhooks.test.ts
+++ b/packages/cli/src/webhooks/__tests__/waiting-webhooks.test.ts
@@ -10,7 +10,7 @@ import type { WaitingWebhookRequest } from '@/webhooks/webhook.types';
 
 describe('WaitingWebhooks', () => {
 	const executionRepository = mock<ExecutionRepository>();
-	const waitingWebhooks = new WaitingWebhooks(mock(), mock(), executionRepository);
+	const waitingWebhooks = new WaitingWebhooks(mock(), mock(), executionRepository, mock());
 
 	beforeEach(() => {
 		jest.restoreAllMocks();
diff --git a/packages/cli/src/webhooks/__tests__/webhook-form-data.test.ts b/packages/cli/src/webhooks/__tests__/webhook-form-data.test.ts
index 1b43143d382d1..8eb308f7e45c0 100644
--- a/packages/cli/src/webhooks/__tests__/webhook-form-data.test.ts
+++ b/packages/cli/src/webhooks/__tests__/webhook-form-data.test.ts
@@ -14,7 +14,7 @@ jest.unmock('node:fs');
 
 /** Test server for testing the form data parsing */
 class TestServer {
-	public agent: TestAgent;
+	agent: TestAgent;
 
 	private app: express.Application;
 
diff --git a/packages/cli/src/webhooks/__tests__/webhook.service.test.ts b/packages/cli/src/webhooks/__tests__/webhook.service.test.ts
index 534c36bca0878..46ffb82dc6e7e 100644
--- a/packages/cli/src/webhooks/__tests__/webhook.service.test.ts
+++ b/packages/cli/src/webhooks/__tests__/webhook.service.test.ts
@@ -1,11 +1,14 @@
+import { mock } from 'jest-mock-extended';
+import type { INode, INodeType, IWebhookData, IWorkflowExecuteAdditionalData } from 'n8n-workflow';
+import { Workflow } from 'n8n-workflow';
 import { v4 as uuid } from 'uuid';
 
 import config from '@/config';
 import { WebhookEntity } from '@/databases/entities/webhook-entity';
-import { WebhookRepository } from '@/databases/repositories/webhook.repository';
-import { CacheService } from '@/services/cache/cache.service';
+import type { WebhookRepository } from '@/databases/repositories/webhook.repository';
+import type { NodeTypes } from '@/node-types';
+import type { CacheService } from '@/services/cache/cache.service';
 import { WebhookService } from '@/webhooks/webhook.service';
-import { mockInstance } from '@test/mocking';
 
 const createWebhook = (method: string, path: string, webhookId?: string, pathSegments?: number) =>
 	Object.assign(new WebhookEntity(), {
@@ -16,9 +19,11 @@ const createWebhook = (method: string, path: string, webhookId?: string, pathSeg
 	}) as WebhookEntity;
 
 describe('WebhookService', () => {
-	const webhookRepository = mockInstance(WebhookRepository);
-	const cacheService = mockInstance(CacheService);
-	const webhookService = new WebhookService(webhookRepository, cacheService);
+	const webhookRepository = mock<WebhookRepository>();
+	const cacheService = mock<CacheService>();
+	const nodeTypes = mock<NodeTypes>();
+	const webhookService = new WebhookService(mock(), webhookRepository, cacheService, nodeTypes);
+	const additionalData = mock<IWorkflowExecuteAdditionalData>();
 
 	beforeEach(() => {
 		config.load(config.default);
@@ -188,4 +193,171 @@ describe('WebhookService', () => {
 			expect(webhookRepository.upsert).toHaveBeenCalledWith(mockWebhook, ['method', 'webhookPath']);
 		});
 	});
+
+	describe('getNodeWebhooks()', () => {
+		const workflow = new Workflow({
+			id: 'test-workflow',
+			nodes: [],
+			connections: {},
+			active: true,
+			nodeTypes,
+		});
+
+		test('should return empty array if node is disabled', async () => {
+			const node = { disabled: true } as INode;
+
+			const webhooks = webhookService.getNodeWebhooks(workflow, node, additionalData);
+
+			expect(webhooks).toEqual([]);
+		});
+
+		test('should return webhooks for node with webhook definitions', async () => {
+			const node = {
+				name: 'Webhook',
+				type: 'n8n-nodes-base.webhook',
+				disabled: false,
+			} as INode;
+
+			const nodeType = {
+				description: {
+					webhooks: [
+						{
+							name: 'default',
+							httpMethod: 'GET',
+							path: '/webhook',
+							isFullPath: false,
+							restartWebhook: false,
+						},
+					],
+				},
+			} as INodeType;
+
+			nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+
+			const webhooks = webhookService.getNodeWebhooks(workflow, node, additionalData);
+
+			expect(webhooks).toHaveLength(1);
+			expect(webhooks[0]).toMatchObject({
+				httpMethod: 'GET',
+				node: 'Webhook',
+				workflowId: 'test-workflow',
+			});
+		});
+	});
+
+	describe('createWebhookIfNotExists()', () => {
+		const workflow = new Workflow({
+			id: 'test-workflow',
+			nodes: [
+				mock<INode>({
+					name: 'Webhook',
+					type: 'n8n-nodes-base.webhook',
+					typeVersion: 1,
+					parameters: {},
+				}),
+			],
+			connections: {},
+			active: false,
+			nodeTypes,
+		});
+
+		const webhookData = mock<IWebhookData>({
+			node: 'Webhook',
+			webhookDescription: {
+				name: 'default',
+				httpMethod: 'GET',
+				path: '/webhook',
+			},
+		});
+
+		const defaultWebhookMethods = {
+			checkExists: jest.fn(),
+			create: jest.fn(),
+		};
+
+		const nodeType = mock<INodeType>({
+			webhookMethods: { default: defaultWebhookMethods },
+		});
+
+		test('should create webhook if it does not exist', async () => {
+			defaultWebhookMethods.checkExists.mockResolvedValue(false);
+			defaultWebhookMethods.create.mockResolvedValue(true);
+			nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+
+			await webhookService.createWebhookIfNotExists(workflow, webhookData, 'trigger', 'init');
+
+			expect(defaultWebhookMethods.checkExists).toHaveBeenCalled();
+			expect(defaultWebhookMethods.create).toHaveBeenCalled();
+		});
+
+		test('should not create webhook if it already exists', async () => {
+			defaultWebhookMethods.checkExists.mockResolvedValue(true);
+			nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+
+			await webhookService.createWebhookIfNotExists(workflow, webhookData, 'trigger', 'init');
+
+			expect(defaultWebhookMethods.checkExists).toHaveBeenCalled();
+			expect(defaultWebhookMethods.create).not.toHaveBeenCalled();
+		});
+
+		test('should handle case when webhook methods are not defined', async () => {
+			nodeTypes.getByNameAndVersion.mockReturnValue({} as INodeType);
+
+			await webhookService.createWebhookIfNotExists(workflow, webhookData, 'trigger', 'init');
+			// Test passes if no error is thrown when webhook methods are undefined
+		});
+	});
+
+	describe('deleteWebhook()', () => {
+		test('should call runWebhookMethod with delete', async () => {
+			const workflow = mock<Workflow>();
+			const webhookData = mock<IWebhookData>();
+			const runWebhookMethodSpy = jest.spyOn(webhookService as any, 'runWebhookMethod');
+
+			await webhookService.deleteWebhook(workflow, webhookData, 'trigger', 'init');
+
+			expect(runWebhookMethodSpy).toHaveBeenCalledWith(
+				'delete',
+				workflow,
+				webhookData,
+				'trigger',
+				'init',
+			);
+		});
+	});
+
+	describe('runWebhook()', () => {
+		const workflow = mock<Workflow>();
+		const webhookData = mock<IWebhookData>();
+		const node = mock<INode>();
+		const responseData = { workflowData: [] };
+
+		test('should throw error if node does not have webhooks', async () => {
+			const nodeType = {} as INodeType;
+			nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+
+			await expect(
+				webhookService.runWebhook(workflow, webhookData, node, additionalData, 'trigger', null),
+			).rejects.toThrow('Node does not have any webhooks defined');
+		});
+
+		test('should execute webhook and return response data', async () => {
+			const nodeType = mock<INodeType>({
+				webhook: jest.fn().mockResolvedValue(responseData),
+			});
+			nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+
+			const result = await webhookService.runWebhook(
+				workflow,
+				webhookData,
+				node,
+				additionalData,
+				'trigger',
+				null,
+			);
+
+			expect(result).toEqual(responseData);
+			expect(nodeType.webhook).toHaveBeenCalled();
+		});
+	});
 });
diff --git a/packages/cli/src/webhooks/live-webhooks.ts b/packages/cli/src/webhooks/live-webhooks.ts
index 458701caee061..6d6fc9161de2c 100644
--- a/packages/cli/src/webhooks/live-webhooks.ts
+++ b/packages/cli/src/webhooks/live-webhooks.ts
@@ -1,5 +1,5 @@
 import type { Response } from 'express';
-import { Workflow, NodeHelpers, CHAT_TRIGGER_NODE_TYPE } from 'n8n-workflow';
+import { Workflow, CHAT_TRIGGER_NODE_TYPE } from 'n8n-workflow';
 import type { INode, IWebhookData, IHttpRequestMethods } from 'n8n-workflow';
 import { Service } from 'typedi';
 
@@ -114,11 +114,9 @@ export class LiveWebhooks implements IWebhookManager {
 
 		const additionalData = await WorkflowExecuteAdditionalData.getBase();
 
-		const webhookData = NodeHelpers.getNodeWebhooks(
-			workflow,
-			workflow.getNode(webhook.node) as INode,
-			additionalData,
-		).find((w) => w.httpMethod === httpMethod && w.path === webhook.webhookPath) as IWebhookData;
+		const webhookData = this.webhookService
+			.getNodeWebhooks(workflow, workflow.getNode(webhook.node) as INode, additionalData)
+			.find((w) => w.httpMethod === httpMethod && w.path === webhook.webhookPath) as IWebhookData;
 
 		// Get the node which has the webhook defined to know where to start from and to
 		// get additional data
diff --git a/packages/cli/src/webhooks/test-webhook-registrations.service.ts b/packages/cli/src/webhooks/test-webhook-registrations.service.ts
index 6a3e205f58964..e25b3102db3bc 100644
--- a/packages/cli/src/webhooks/test-webhook-registrations.service.ts
+++ b/packages/cli/src/webhooks/test-webhook-registrations.service.ts
@@ -1,10 +1,10 @@
+import { InstanceSettings } from 'n8n-core';
 import type { IWebhookData } from 'n8n-workflow';
 import { Service } from 'typedi';
 
 import { TEST_WEBHOOK_TIMEOUT, TEST_WEBHOOK_TIMEOUT_BUFFER } from '@/constants';
 import type { IWorkflowDb } from '@/interfaces';
 import { CacheService } from '@/services/cache/cache.service';
-import { OrchestrationService } from '@/services/orchestration.service';
 
 export type TestWebhookRegistration = {
 	pushRef?: string;
@@ -17,7 +17,7 @@ export type TestWebhookRegistration = {
 export class TestWebhookRegistrationsService {
 	constructor(
 		private readonly cacheService: CacheService,
-		private readonly orchestrationService: OrchestrationService,
+		private readonly instanceSettings: InstanceSettings,
 	) {}
 
 	private readonly cacheKey = 'test-webhooks';
@@ -27,7 +27,7 @@ export class TestWebhookRegistrationsService {
 
 		await this.cacheService.setHash(this.cacheKey, { [hashKey]: registration });
 
-		if (!this.orchestrationService.isMultiMainSetupEnabled) return;
+		if (this.instanceSettings.isSingleMain) return;
 
 		/**
 		 * Multi-main setup: In a manual webhook execution, the main process that
diff --git a/packages/cli/src/webhooks/test-webhooks.ts b/packages/cli/src/webhooks/test-webhooks.ts
index 2bdf94b312f58..b90b1db59d985 100644
--- a/packages/cli/src/webhooks/test-webhooks.ts
+++ b/packages/cli/src/webhooks/test-webhooks.ts
@@ -1,5 +1,5 @@
 import type express from 'express';
-import * as NodeExecuteFunctions from 'n8n-core';
+import { InstanceSettings } from 'n8n-core';
 import { WebhookPathTakenError, Workflow } from 'n8n-workflow';
 import type {
 	IWebhookData,
@@ -17,7 +17,6 @@ import type { IWorkflowDb } from '@/interfaces';
 import { NodeTypes } from '@/node-types';
 import { Push } from '@/push';
 import { Publisher } from '@/scaling/pubsub/publisher.service';
-import { OrchestrationService } from '@/services/orchestration.service';
 import { removeTrailingSlash } from '@/utils';
 import type { TestWebhookRegistration } from '@/webhooks/test-webhook-registrations.service';
 import { TestWebhookRegistrationsService } from '@/webhooks/test-webhook-registrations.service';
@@ -25,6 +24,7 @@ import * as WebhookHelpers from '@/webhooks/webhook-helpers';
 import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
 import type { WorkflowRequest } from '@/workflows/workflow.request';
 
+import { WebhookService } from './webhook.service';
 import type {
 	IWebhookResponseCallbackData,
 	IWebhookManager,
@@ -42,8 +42,9 @@ export class TestWebhooks implements IWebhookManager {
 		private readonly push: Push,
 		private readonly nodeTypes: NodeTypes,
 		private readonly registrations: TestWebhookRegistrationsService,
-		private readonly orchestrationService: OrchestrationService,
+		private readonly instanceSettings: InstanceSettings,
 		private readonly publisher: Publisher,
+		private readonly webhookService: WebhookService,
 	) {}
 
 	private timeouts: { [webhookKey: string]: NodeJS.Timeout } = {};
@@ -141,8 +142,7 @@ export class TestWebhooks implements IWebhookManager {
 				// Inform editor-ui that webhook got received
 				if (pushRef !== undefined) {
 					this.push.send(
-						'testWebhookReceived',
-						{ workflowId: webhook?.workflowId, executionId },
+						{ type: 'testWebhookReceived', data: { workflowId: webhook?.workflowId, executionId } },
 						pushRef,
 					);
 				}
@@ -155,7 +155,7 @@ export class TestWebhooks implements IWebhookManager {
 			 * the handler process commands the creator process to clear its test webhooks.
 			 */
 			if (
-				this.orchestrationService.isMultiMainSetupEnabled &&
+				this.instanceSettings.isMultiMain &&
 				pushRef &&
 				!this.push.getBackend().hasPushRef(pushRef)
 			) {
@@ -314,7 +314,7 @@ export class TestWebhooks implements IWebhookManager {
 				 */
 				await this.registrations.register(registration);
 
-				await workflow.createWebhookIfNotExists(webhook, NodeExecuteFunctions, 'manual', 'manual');
+				await this.webhookService.createWebhookIfNotExists(workflow, webhook, 'manual', 'manual');
 
 				cacheableWebhook.staticData = workflow.staticData;
 
@@ -353,7 +353,7 @@ export class TestWebhooks implements IWebhookManager {
 
 			if (pushRef !== undefined) {
 				try {
-					this.push.send('testWebhookDeleted', { workflowId }, pushRef);
+					this.push.send({ type: 'testWebhookDeleted', data: { workflowId } }, pushRef);
 				} catch {
 					// Could not inform editor, probably is not connected anymore. So simply go on.
 				}
@@ -431,7 +431,7 @@ export class TestWebhooks implements IWebhookManager {
 
 			if (staticData) workflow.staticData = staticData;
 
-			await workflow.deleteWebhook(webhook, NodeExecuteFunctions, 'internal', 'update');
+			await this.webhookService.deleteWebhook(workflow, webhook, 'internal', 'update');
 		}
 
 		await this.registrations.deregisterAll();
diff --git a/packages/cli/src/webhooks/waiting-webhooks.ts b/packages/cli/src/webhooks/waiting-webhooks.ts
index 3176bbdf2d950..63557091893b0 100644
--- a/packages/cli/src/webhooks/waiting-webhooks.ts
+++ b/packages/cli/src/webhooks/waiting-webhooks.ts
@@ -3,7 +3,6 @@ import {
 	FORM_NODE_TYPE,
 	type INodes,
 	type IWorkflowBase,
-	NodeHelpers,
 	SEND_AND_WAIT_OPERATION,
 	WAIT_NODE_TYPE,
 	Workflow,
@@ -19,6 +18,7 @@ import { NodeTypes } from '@/node-types';
 import * as WebhookHelpers from '@/webhooks/webhook-helpers';
 import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
 
+import { WebhookService } from './webhook.service';
 import type {
 	IWebhookResponseCallbackData,
 	IWebhookManager,
@@ -38,6 +38,7 @@ export class WaitingWebhooks implements IWebhookManager {
 		protected readonly logger: Logger,
 		protected readonly nodeTypes: NodeTypes,
 		private readonly executionRepository: ExecutionRepository,
+		private readonly webhookService: WebhookService,
 	) {}
 
 	// TODO: implement `getWebhookMethods` for CORS support
@@ -164,17 +165,15 @@ export class WaitingWebhooks implements IWebhookManager {
 		}
 
 		const additionalData = await WorkflowExecuteAdditionalData.getBase();
-		const webhookData = NodeHelpers.getNodeWebhooks(
-			workflow,
-			workflowStartNode,
-			additionalData,
-		).find(
-			(webhook) =>
-				webhook.httpMethod === req.method &&
-				webhook.path === (suffix ?? '') &&
-				webhook.webhookDescription.restartWebhook === true &&
-				(webhook.webhookDescription.isForm || false) === this.includeForms,
-		);
+		const webhookData = this.webhookService
+			.getNodeWebhooks(workflow, workflowStartNode, additionalData)
+			.find(
+				(webhook) =>
+					webhook.httpMethod === req.method &&
+					webhook.path === (suffix ?? '') &&
+					webhook.webhookDescription.restartWebhook === true &&
+					(webhook.webhookDescription.isForm || false) === this.includeForms,
+			);
 
 		if (webhookData === undefined) {
 			// If no data got found it means that the execution can not be started via a webhook.
diff --git a/packages/cli/src/webhooks/webhook-helpers.ts b/packages/cli/src/webhooks/webhook-helpers.ts
index 259142561a4f1..665708988171c 100644
--- a/packages/cli/src/webhooks/webhook-helpers.ts
+++ b/packages/cli/src/webhooks/webhook-helpers.ts
@@ -9,7 +9,7 @@
 import { GlobalConfig } from '@n8n/config';
 import type express from 'express';
 import get from 'lodash/get';
-import { BinaryDataService, NodeExecuteFunctions } from 'n8n-core';
+import { BinaryDataService, ErrorReporter } from 'n8n-core';
 import type {
 	IBinaryData,
 	IBinaryKeyData,
@@ -33,11 +33,8 @@ import {
 	ApplicationError,
 	BINARY_ENCODING,
 	createDeferredPromise,
-	ErrorReporterProxy as ErrorReporter,
-	ErrorReporterProxy,
 	ExecutionCancelledError,
 	FORM_NODE_TYPE,
-	NodeHelpers,
 	NodeOperationError,
 } from 'n8n-workflow';
 import { finished } from 'stream/promises';
@@ -59,6 +56,7 @@ import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-da
 import * as WorkflowHelpers from '@/workflow-helpers';
 import { WorkflowRunner } from '@/workflow-runner';
 
+import { WebhookService } from './webhook.service';
 import type { IWebhookResponseCallbackData, WebhookRequest } from './webhook.types';
 
 /**
@@ -90,7 +88,12 @@ export function getWorkflowWebhooks(
 		}
 		returnData.push.apply(
 			returnData,
-			NodeHelpers.getNodeWebhooks(workflow, node, additionalData, ignoreRestartWebhooks),
+			Container.get(WebhookService).getNodeWebhooks(
+				workflow,
+				node,
+				additionalData,
+				ignoreRestartWebhooks,
+			),
 		);
 	}
 
@@ -256,11 +259,11 @@ export async function executeWebhook(
 		}
 
 		try {
-			webhookResultData = await workflow.runWebhook(
+			webhookResultData = await Container.get(WebhookService).runWebhook(
+				workflow,
 				webhookData,
 				workflowStartNode,
 				additionalData,
-				NodeExecuteFunctions,
 				executionMode,
 				runExecutionData ?? null,
 			);
@@ -280,7 +283,7 @@ export async function executeWebhook(
 				errorMessage = err.message;
 			}
 
-			ErrorReporterProxy.error(err, {
+			Container.get(ErrorReporter).error(err, {
 				extra: {
 					nodeName: workflowStartNode.name,
 					nodeType: workflowStartNode.type,
@@ -521,7 +524,7 @@ export async function executeWebhook(
 					didSendResponse = true;
 				})
 				.catch(async (error) => {
-					ErrorReporter.error(error);
+					Container.get(ErrorReporter).error(error);
 					Container.get(Logger).error(
 						`Error with Webhook-Response for execution "${executionId}": "${error.message}"`,
 						{ executionId, workflowId: workflow.id },
diff --git a/packages/cli/src/webhooks/webhook.service.ts b/packages/cli/src/webhooks/webhook.service.ts
index 8e72f0abf969e..80b12b04cd897 100644
--- a/packages/cli/src/webhooks/webhook.service.ts
+++ b/packages/cli/src/webhooks/webhook.service.ts
@@ -1,8 +1,23 @@
-import type { IHttpRequestMethods } from 'n8n-workflow';
+import { HookContext, WebhookContext } from 'n8n-core';
+import { ApplicationError, Node, NodeHelpers } from 'n8n-workflow';
+import type {
+	IHttpRequestMethods,
+	INode,
+	IRunExecutionData,
+	IWebhookData,
+	IWebhookResponseData,
+	IWorkflowExecuteAdditionalData,
+	WebhookSetupMethodNames,
+	Workflow,
+	WorkflowActivateMode,
+	WorkflowExecuteMode,
+} from 'n8n-workflow';
 import { Service } from 'typedi';
 
 import type { WebhookEntity } from '@/databases/entities/webhook-entity';
 import { WebhookRepository } from '@/databases/repositories/webhook.repository';
+import { Logger } from '@/logging/logger.service';
+import { NodeTypes } from '@/node-types';
 import { CacheService } from '@/services/cache/cache.service';
 
 type Method = NonNullable<IHttpRequestMethods>;
@@ -10,8 +25,10 @@ type Method = NonNullable<IHttpRequestMethods>;
 @Service()
 export class WebhookService {
 	constructor(
-		private webhookRepository: WebhookRepository,
-		private cacheService: CacheService,
+		private readonly logger: Logger,
+		private readonly webhookRepository: WebhookRepository,
+		private readonly cacheService: CacheService,
+		private readonly nodeTypes: NodeTypes,
 	) {}
 
 	async populateCache() {
@@ -118,4 +135,210 @@ export class WebhookService {
 			.find({ select: ['method'], where: { webhookPath: path } })
 			.then((rows) => rows.map((r) => r.method));
 	}
+
+	/**
+	 * Returns all the webhooks which should be created for the give node
+	 */
+	getNodeWebhooks(
+		workflow: Workflow,
+		node: INode,
+		additionalData: IWorkflowExecuteAdditionalData,
+		ignoreRestartWebhooks = false,
+	): IWebhookData[] {
+		if (node.disabled === true) {
+			// Node is disabled so webhooks will also not be enabled
+			return [];
+		}
+
+		const nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+
+		if (nodeType.description.webhooks === undefined) {
+			// Node does not have any webhooks so return
+			return [];
+		}
+
+		const workflowId = workflow.id || '__UNSAVED__';
+		const mode = 'internal';
+
+		const returnData: IWebhookData[] = [];
+		for (const webhookDescription of nodeType.description.webhooks) {
+			if (ignoreRestartWebhooks && webhookDescription.restartWebhook === true) {
+				continue;
+			}
+
+			let nodeWebhookPath = workflow.expression.getSimpleParameterValue(
+				node,
+				webhookDescription.path,
+				mode,
+				{},
+			);
+			if (nodeWebhookPath === undefined) {
+				this.logger.error(
+					`No webhook path could be found for node "${node.name}" in workflow "${workflowId}".`,
+				);
+				continue;
+			}
+
+			nodeWebhookPath = nodeWebhookPath.toString();
+
+			if (nodeWebhookPath.startsWith('/')) {
+				nodeWebhookPath = nodeWebhookPath.slice(1);
+			}
+			if (nodeWebhookPath.endsWith('/')) {
+				nodeWebhookPath = nodeWebhookPath.slice(0, -1);
+			}
+
+			const isFullPath: boolean = workflow.expression.getSimpleParameterValue(
+				node,
+				webhookDescription.isFullPath,
+				'internal',
+				{},
+				undefined,
+				false,
+			) as boolean;
+			const restartWebhook: boolean = workflow.expression.getSimpleParameterValue(
+				node,
+				webhookDescription.restartWebhook,
+				'internal',
+				{},
+				undefined,
+				false,
+			) as boolean;
+			const path = NodeHelpers.getNodeWebhookPath(
+				workflowId,
+				node,
+				nodeWebhookPath,
+				isFullPath,
+				restartWebhook,
+			);
+
+			const webhookMethods = workflow.expression.getSimpleParameterValue(
+				node,
+				webhookDescription.httpMethod,
+				mode,
+				{},
+				undefined,
+				'GET',
+			);
+
+			if (webhookMethods === undefined) {
+				this.logger.error(
+					`The webhook "${path}" for node "${node.name}" in workflow "${workflowId}" could not be added because the httpMethod is not defined.`,
+				);
+				continue;
+			}
+
+			let webhookId: string | undefined;
+			if ((path.startsWith(':') || path.includes('/:')) && node.webhookId) {
+				webhookId = node.webhookId;
+			}
+
+			String(webhookMethods)
+				.split(',')
+				.forEach((httpMethod) => {
+					if (!httpMethod) return;
+					returnData.push({
+						httpMethod: httpMethod.trim() as IHttpRequestMethods,
+						node: node.name,
+						path,
+						webhookDescription,
+						workflowId,
+						workflowExecuteAdditionalData: additionalData,
+						webhookId,
+					});
+				});
+		}
+
+		return returnData;
+	}
+
+	async createWebhookIfNotExists(
+		workflow: Workflow,
+		webhookData: IWebhookData,
+		mode: WorkflowExecuteMode,
+		activation: WorkflowActivateMode,
+	): Promise<void> {
+		const webhookExists = await this.runWebhookMethod(
+			'checkExists',
+			workflow,
+			webhookData,
+			mode,
+			activation,
+		);
+		if (!webhookExists) {
+			// If webhook does not exist yet create it
+			await this.runWebhookMethod('create', workflow, webhookData, mode, activation);
+		}
+	}
+
+	async deleteWebhook(
+		workflow: Workflow,
+		webhookData: IWebhookData,
+		mode: WorkflowExecuteMode,
+		activation: WorkflowActivateMode,
+	) {
+		await this.runWebhookMethod('delete', workflow, webhookData, mode, activation);
+	}
+
+	private async runWebhookMethod(
+		method: WebhookSetupMethodNames,
+		workflow: Workflow,
+		webhookData: IWebhookData,
+		mode: WorkflowExecuteMode,
+		activation: WorkflowActivateMode,
+	): Promise<boolean | undefined> {
+		const node = workflow.getNode(webhookData.node);
+
+		if (!node) return;
+
+		const nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+
+		const webhookFn = nodeType.webhookMethods?.[webhookData.webhookDescription.name]?.[method];
+		if (webhookFn === undefined) return;
+
+		const context = new HookContext(
+			workflow,
+			node,
+			webhookData.workflowExecuteAdditionalData,
+			mode,
+			activation,
+			webhookData,
+		);
+
+		return (await webhookFn.call(context)) as boolean;
+	}
+
+	/**
+	 * Executes the webhook data to see what it should return and if the
+	 * workflow should be started or not
+	 */
+	async runWebhook(
+		workflow: Workflow,
+		webhookData: IWebhookData,
+		node: INode,
+		additionalData: IWorkflowExecuteAdditionalData,
+		mode: WorkflowExecuteMode,
+		runExecutionData: IRunExecutionData | null,
+	): Promise<IWebhookResponseData> {
+		const nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+		if (nodeType.webhook === undefined) {
+			throw new ApplicationError('Node does not have any webhooks defined', {
+				extra: { nodeName: node.name },
+			});
+		}
+
+		const context = new WebhookContext(
+			workflow,
+			node,
+			additionalData,
+			mode,
+			webhookData,
+			[],
+			runExecutionData ?? null,
+		);
+
+		return nodeType instanceof Node
+			? await nodeType.webhook(context)
+			: ((await nodeType.webhook.call(context)) as IWebhookResponseData);
+	}
 }
diff --git a/packages/cli/src/workflow-execute-additional-data.ts b/packages/cli/src/workflow-execute-additional-data.ts
index e3e65bcb4df25..29c8d67502f80 100644
--- a/packages/cli/src/workflow-execute-additional-data.ts
+++ b/packages/cli/src/workflow-execute-additional-data.ts
@@ -1,19 +1,12 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 /* eslint-disable @typescript-eslint/no-use-before-define */
-
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-import type { PushType } from '@n8n/api-types';
+import type { PushMessage, PushType } from '@n8n/api-types';
 import { GlobalConfig } from '@n8n/config';
 import { stringify } from 'flatted';
-import { WorkflowExecute } from 'n8n-core';
-import {
-	ApplicationError,
-	ErrorReporterProxy as ErrorReporter,
-	NodeOperationError,
-	Workflow,
-	WorkflowHooks,
-} from 'n8n-workflow';
+import { ErrorReporter, WorkflowExecute, isObjectLiteral } from 'n8n-core';
+import { ApplicationError, NodeOperationError, Workflow, WorkflowHooks } from 'n8n-workflow';
 import type {
 	IDataObject,
 	IExecuteData,
@@ -52,7 +45,7 @@ import type { IWorkflowErrorData, UpdateExecutionPayload } from '@/interfaces';
 import { NodeTypes } from '@/node-types';
 import { Push } from '@/push';
 import { WorkflowStatisticsService } from '@/services/workflow-statistics.service';
-import { findSubworkflowStart, isObjectLiteral, isWorkflowIdValid } from '@/utils';
+import { findSubworkflowStart, isWorkflowIdValid } from '@/utils';
 import * as WorkflowHelpers from '@/workflow-helpers';
 
 import { WorkflowRepository } from './databases/repositories/workflow.repository';
@@ -215,7 +208,7 @@ export function executeErrorWorkflow(
 					);
 				})
 				.catch((error: Error) => {
-					ErrorReporter.error(error);
+					Container.get(ErrorReporter).error(error);
 					logger.error(
 						`Could not execute ErrorWorkflow for execution ID ${this.executionId} because of error querying the workflow owner`,
 						{
@@ -269,7 +262,7 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 					workflowId: this.workflowData.id,
 				});
 
-				pushInstance.send('nodeExecuteBefore', { executionId, nodeName }, pushRef);
+				pushInstance.send({ type: 'nodeExecuteBefore', data: { executionId, nodeName } }, pushRef);
 			},
 		],
 		nodeExecuteAfter: [
@@ -286,7 +279,10 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 					workflowId: this.workflowData.id,
 				});
 
-				pushInstance.send('nodeExecuteAfter', { executionId, nodeName, data }, pushRef);
+				pushInstance.send(
+					{ type: 'nodeExecuteAfter', data: { executionId, nodeName, data } },
+					pushRef,
+				);
 			},
 		],
 		workflowExecuteBefore: [
@@ -303,17 +299,19 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 					return;
 				}
 				pushInstance.send(
-					'executionStarted',
 					{
-						executionId,
-						mode: this.mode,
-						startedAt: new Date(),
-						retryOf: this.retryOf,
-						workflowId,
-						workflowName,
-						flattedRunData: data?.resultData.runData
-							? stringify(data.resultData.runData)
-							: stringify({}),
+						type: 'executionStarted',
+						data: {
+							executionId,
+							mode: this.mode,
+							startedAt: new Date(),
+							retryOf: this.retryOf,
+							workflowId,
+							workflowName,
+							flattedRunData: data?.resultData.runData
+								? stringify(data.resultData.runData)
+								: stringify({}),
+						},
 					},
 					pushRef,
 				);
@@ -333,12 +331,11 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 
 				const { status } = fullRunData;
 				if (status === 'waiting') {
-					pushInstance.send('executionWaiting', { executionId }, pushRef);
+					pushInstance.send({ type: 'executionWaiting', data: { executionId } }, pushRef);
 				} else {
 					const rawData = stringify(fullRunData.data);
 					pushInstance.send(
-						'executionFinished',
-						{ executionId, workflowId, status, rawData },
+						{ type: 'executionFinished', data: { executionId, workflowId, status, rawData } },
 						pushRef,
 					);
 				}
@@ -423,7 +420,7 @@ function hookFunctionsSave(): IWorkflowExecuteHooks {
 								newStaticData,
 							);
 						} catch (e) {
-							ErrorReporter.error(e);
+							Container.get(ErrorReporter).error(e);
 							logger.error(
 								`There was a problem saving the workflow with id "${this.workflowData.id}" to save changed staticData: "${e.message}" (hookFunctionsSave)`,
 								{ executionId: this.executionId, workflowId: this.workflowData.id },
@@ -502,7 +499,7 @@ function hookFunctionsSave(): IWorkflowExecuteHooks {
 						);
 					}
 				} catch (error) {
-					ErrorReporter.error(error);
+					Container.get(ErrorReporter).error(error);
 					logger.error(`Failed saving execution data to DB on execution ID ${this.executionId}`, {
 						executionId: this.executionId,
 						workflowId: this.workflowData.id,
@@ -584,7 +581,7 @@ function hookFunctionsSaveWorker(): IWorkflowExecuteHooks {
 								newStaticData,
 							);
 						} catch (e) {
-							ErrorReporter.error(e);
+							Container.get(ErrorReporter).error(e);
 							logger.error(
 								`There was a problem saving the workflow with id "${this.workflowData.id}" to save changed staticData: "${e.message}" (workflowExecuteAfter)`,
 								{ pushRef: this.pushRef, workflowId: this.workflowData.id },
@@ -653,7 +650,7 @@ function hookFunctionsSaveWorker(): IWorkflowExecuteHooks {
 							this.executionId,
 						]);
 					} catch (error) {
-						ErrorReporter.error(error);
+						Container.get(ErrorReporter).error(error);
 						Container.get(Logger).error(
 							'There was a problem running hook "workflow.postExecute"',
 							error,
@@ -981,7 +978,7 @@ export function sendDataToUI(type: PushType, data: IDataObject | IDataObject[])
 	// Push data to session which started workflow
 	try {
 		const pushInstance = Container.get(Push);
-		pushInstance.send(type, data, pushRef);
+		pushInstance.send({ type, data } as PushMessage, pushRef);
 	} catch (error) {
 		const logger = Container.get(Logger);
 		logger.warn(`There was a problem sending message to UI: ${error.message}`);
@@ -1036,9 +1033,6 @@ export async function getBase(
 			mode: WorkflowExecuteMode,
 			envProviderState: EnvProviderState,
 			executeData?: IExecuteData,
-			defaultReturnRunIndex?: number,
-			selfData?: IDataObject,
-			contextNodeName?: string,
 		) {
 			return await Container.get(TaskManager).startTask(
 				additionalData,
@@ -1057,9 +1051,6 @@ export async function getBase(
 				mode,
 				envProviderState,
 				executeData,
-				defaultReturnRunIndex,
-				selfData,
-				contextNodeName,
 			);
 		},
 		logAiEvent: (eventName: keyof AiEventMap, payload: AiEventPayload) =>
diff --git a/packages/cli/src/workflow-helpers.ts b/packages/cli/src/workflow-helpers.ts
index 7cbce6b8a2751..addae4e290b7e 100644
--- a/packages/cli/src/workflow-helpers.ts
+++ b/packages/cli/src/workflow-helpers.ts
@@ -7,9 +7,7 @@ import type {
 	NodeApiError,
 	WorkflowExecuteMode,
 	WorkflowOperationError,
-	Workflow,
 	NodeOperationError,
-	IWorkflowExecutionDataProcess,
 } from 'n8n-workflow';
 import { Container } from 'typedi';
 import { v4 as uuid } from 'uuid';
@@ -223,18 +221,6 @@ export async function replaceInvalidCredentials(workflow: WorkflowEntity): Promi
 	return workflow;
 }
 
-export function getExecutionStartNode(data: IWorkflowExecutionDataProcess, workflow: Workflow) {
-	let startNode;
-	if (
-		data.startNodes?.length === 1 &&
-		Object.keys(data.pinData ?? {}).includes(data.startNodes[0].name)
-	) {
-		startNode = workflow.getNode(data.startNodes[0].name) ?? undefined;
-	}
-
-	return startNode;
-}
-
 export async function getVariables(): Promise<IDataObject> {
 	const variables = await Container.get(VariablesService).getAllCached();
 	return Object.freeze(
diff --git a/packages/cli/src/workflow-runner.ts b/packages/cli/src/workflow-runner.ts
index 19ae201a8da3a..973d512e62079 100644
--- a/packages/cli/src/workflow-runner.ts
+++ b/packages/cli/src/workflow-runner.ts
@@ -2,14 +2,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-shadow */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-import * as a from 'assert/strict';
-import {
-	DirectedGraph,
-	InstanceSettings,
-	WorkflowExecute,
-	filterDisabledNodes,
-	recreateNodeExecutionStack,
-} from 'n8n-core';
+import { ErrorReporter, InstanceSettings, WorkflowExecute } from 'n8n-core';
 import type {
 	ExecutionError,
 	IDeferredPromise,
@@ -19,13 +12,8 @@ import type {
 	WorkflowExecuteMode,
 	WorkflowHooks,
 	IWorkflowExecutionDataProcess,
-	IRunExecutionData,
-} from 'n8n-workflow';
-import {
-	ErrorReporterProxy as ErrorReporter,
-	ExecutionCancelledError,
-	Workflow,
 } from 'n8n-workflow';
+import { ExecutionCancelledError, Workflow } from 'n8n-workflow';
 import PCancelable from 'p-cancelable';
 import { Container, Service } from 'typedi';
 
@@ -39,12 +27,12 @@ import type { ScalingService } from '@/scaling/scaling.service';
 import type { Job, JobData } from '@/scaling/scaling.types';
 import { PermissionChecker } from '@/user-management/permission-checker';
 import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
-import * as WorkflowHelpers from '@/workflow-helpers';
 import { generateFailedExecutionFromError } from '@/workflow-helpers';
 import { WorkflowStaticDataService } from '@/workflows/workflow-static-data.service';
 
 import { ExecutionNotFoundError } from './errors/execution-not-found-error';
 import { EventService } from './events/event.service';
+import { ManualExecutionService } from './manual-execution.service';
 
 @Service()
 export class WorkflowRunner {
@@ -54,6 +42,7 @@ export class WorkflowRunner {
 
 	constructor(
 		private readonly logger: Logger,
+		private readonly errorReporter: ErrorReporter,
 		private readonly activeExecutions: ActiveExecutions,
 		private readonly executionRepository: ExecutionRepository,
 		private readonly externalHooks: ExternalHooks,
@@ -62,6 +51,7 @@ export class WorkflowRunner {
 		private readonly permissionChecker: PermissionChecker,
 		private readonly eventService: EventService,
 		private readonly instanceSettings: InstanceSettings,
+		private readonly manualExecutionService: ManualExecutionService,
 	) {}
 
 	/** The process did error */
@@ -81,7 +71,7 @@ export class WorkflowRunner {
 			return;
 		}
 
-		ErrorReporter.error(error, { executionId });
+		this.errorReporter.error(error, { executionId });
 
 		const isQueueMode = config.getEnv('executions.mode') === 'queue';
 
@@ -192,14 +182,14 @@ export class WorkflowRunner {
 								executionId,
 							]);
 						} catch (error) {
-							ErrorReporter.error(error);
+							this.errorReporter.error(error);
 							this.logger.error('There was a problem running hook "workflow.postExecute"', error);
 						}
 					}
 				})
 				.catch((error) => {
 					if (error instanceof ExecutionCancelledError) return;
-					ErrorReporter.error(error);
+					this.errorReporter.error(error);
 					this.logger.error(
 						'There was a problem running internal hook "onWorkflowPostExecute"',
 						error,
@@ -295,88 +285,14 @@ export class WorkflowRunner {
 					data.executionData,
 				);
 				workflowExecution = workflowExecute.processRunExecutionData(workflow);
-			} else if (data.triggerToStartFrom?.data && data.startNodes && !data.destinationNode) {
-				this.logger.debug(
-					`Execution ID ${executionId} had triggerToStartFrom. Starting from that trigger.`,
-					{ executionId },
-				);
-				const startNodes = data.startNodes.map((data) => {
-					const node = workflow.getNode(data.name);
-					a.ok(node, `Could not find a node named "${data.name}" in the workflow.`);
-					return node;
-				});
-				const runData = { [data.triggerToStartFrom.name]: [data.triggerToStartFrom.data] };
-
-				const { nodeExecutionStack, waitingExecution, waitingExecutionSource } =
-					recreateNodeExecutionStack(
-						filterDisabledNodes(DirectedGraph.fromWorkflow(workflow)),
-						new Set(startNodes),
-						runData,
-						data.pinData ?? {},
-					);
-				const executionData: IRunExecutionData = {
-					resultData: { runData, pinData },
-					executionData: {
-						contextData: {},
-						metadata: {},
-						nodeExecutionStack,
-						waitingExecution,
-						waitingExecutionSource,
-					},
-				};
-
-				const workflowExecute = new WorkflowExecute(additionalData, 'manual', executionData);
-				workflowExecution = workflowExecute.processRunExecutionData(workflow);
-			} else if (
-				data.runData === undefined ||
-				data.startNodes === undefined ||
-				data.startNodes.length === 0
-			) {
-				// Full Execution
-				// TODO: When the old partial execution logic is removed this block can
-				// be removed and the previous one can be merged into
-				// `workflowExecute.runPartialWorkflow2`.
-				// Partial executions then require either a destination node from which
-				// everything else can be derived, or a triggerToStartFrom with
-				// triggerData.
-				this.logger.debug(`Execution ID ${executionId} will run executing all nodes.`, {
-					executionId,
-				});
-				// Execute all nodes
-
-				const startNode = WorkflowHelpers.getExecutionStartNode(data, workflow);
-
-				// Can execute without webhook so go on
-				const workflowExecute = new WorkflowExecute(additionalData, data.executionMode);
-				workflowExecution = workflowExecute.run(
+			} else {
+				workflowExecution = this.manualExecutionService.runManually(
+					data,
 					workflow,
-					startNode,
-					data.destinationNode,
-					data.pinData,
+					additionalData,
+					executionId,
+					pinData,
 				);
-			} else {
-				// Partial Execution
-				this.logger.debug(`Execution ID ${executionId} is a partial execution.`, { executionId });
-				// Execute only the nodes between start and destination nodes
-				const workflowExecute = new WorkflowExecute(additionalData, data.executionMode);
-
-				if (data.partialExecutionVersion === '1') {
-					workflowExecution = workflowExecute.runPartialWorkflow2(
-						workflow,
-						data.runData,
-						data.pinData,
-						data.dirtyNodeNames,
-						data.destinationNode,
-					);
-				} else {
-					workflowExecution = workflowExecute.runPartialWorkflow(
-						workflow,
-						data.runData,
-						data.startNodes,
-						data.destinationNode,
-						data.pinData,
-					);
-				}
 			}
 
 			this.activeExecutions.attachWorkflowExecution(executionId, workflowExecution);
diff --git a/packages/cli/src/workflows/__tests__/workflow-execution.service.test.ts b/packages/cli/src/workflows/__tests__/workflow-execution.service.test.ts
index 35228dcfd4206..3d0bec39de3b4 100644
--- a/packages/cli/src/workflows/__tests__/workflow-execution.service.test.ts
+++ b/packages/cli/src/workflows/__tests__/workflow-execution.service.test.ts
@@ -57,6 +57,7 @@ describe('WorkflowExecutionService', () => {
 		mock(),
 		mock(),
 		mock(),
+		mock(),
 		workflowRunner,
 		mock(),
 		mock(),
diff --git a/packages/cli/src/workflows/workflow-execution.service.ts b/packages/cli/src/workflows/workflow-execution.service.ts
index 1df4af2f76268..27b673c245f66 100644
--- a/packages/cli/src/workflows/workflow-execution.service.ts
+++ b/packages/cli/src/workflows/workflow-execution.service.ts
@@ -1,4 +1,5 @@
 import { GlobalConfig } from '@n8n/config';
+import { ErrorReporter } from 'n8n-core';
 import type {
 	IDeferredPromise,
 	IExecuteData,
@@ -11,11 +12,7 @@ import type {
 	WorkflowExecuteMode,
 	IWorkflowExecutionDataProcess,
 } from 'n8n-workflow';
-import {
-	SubworkflowOperationError,
-	Workflow,
-	ErrorReporterProxy as ErrorReporter,
-} from 'n8n-workflow';
+import { SubworkflowOperationError, Workflow } from 'n8n-workflow';
 import { Service } from 'typedi';
 
 import type { Project } from '@/databases/entities/project';
@@ -36,6 +33,7 @@ import type { WorkflowRequest } from '@/workflows/workflow.request';
 export class WorkflowExecutionService {
 	constructor(
 		private readonly logger: Logger,
+		private readonly errorReporter: ErrorReporter,
 		private readonly executionRepository: ExecutionRepository,
 		private readonly workflowRepository: WorkflowRepository,
 		private readonly nodeTypes: NodeTypes,
@@ -293,7 +291,7 @@ export class WorkflowExecutionService {
 
 			await this.workflowRunner.run(runData);
 		} catch (error) {
-			ErrorReporter.error(error);
+			this.errorReporter.error(error);
 			this.logger.error(
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 				`Calling Error Workflow for "${workflowErrorData.workflow.id}": "${error.message}"`,
diff --git a/packages/cli/src/workflows/workflow-static-data.service.ts b/packages/cli/src/workflows/workflow-static-data.service.ts
index 10655b77c7a02..3e5159dc9a438 100644
--- a/packages/cli/src/workflows/workflow-static-data.service.ts
+++ b/packages/cli/src/workflows/workflow-static-data.service.ts
@@ -1,5 +1,6 @@
 import { GlobalConfig } from '@n8n/config';
-import { type IDataObject, type Workflow, ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
+import { ErrorReporter } from 'n8n-core';
+import type { IDataObject, Workflow } from 'n8n-workflow';
 import { Service } from 'typedi';
 
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
@@ -11,6 +12,7 @@ export class WorkflowStaticDataService {
 	constructor(
 		private readonly globalConfig: GlobalConfig,
 		private readonly logger: Logger,
+		private readonly errorReporter: ErrorReporter,
 		private readonly workflowRepository: WorkflowRepository,
 	) {}
 
@@ -33,7 +35,7 @@ export class WorkflowStaticDataService {
 					await this.saveStaticDataById(workflow.id, workflow.staticData);
 					workflow.staticData.__dataChanged = false;
 				} catch (error) {
-					ErrorReporter.error(error);
+					this.errorReporter.error(error);
 					this.logger.error(
 						// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 						`There was a problem saving the workflow with id "${workflow.id}" to save changed Data: "${error.message}"`,
diff --git a/packages/cli/templates/form-trigger-completion.handlebars b/packages/cli/templates/form-trigger-completion.handlebars
index 49520fd14c1f5..a15855d371752 100644
--- a/packages/cli/templates/form-trigger-completion.handlebars
+++ b/packages/cli/templates/form-trigger-completion.handlebars
@@ -69,6 +69,9 @@
 				{{/if}}
 			</section>
 		</div>
+		<script>
+			fetch('', { method: 'POST', body: {}, }).catch(() => {});
+		</script>
 	</body>
 
 </html>
diff --git a/packages/cli/templates/form-trigger.handlebars b/packages/cli/templates/form-trigger.handlebars
index 8d2b13e5a793a..ee868b072fd05 100644
--- a/packages/cli/templates/form-trigger.handlebars
+++ b/packages/cli/templates/form-trigger.handlebars
@@ -450,7 +450,11 @@
 
 				<div class='card' id='submitted-form' style='display: none;'>
 					<div class='form-header'>
-						<h1 id='submitted-header'>Form Submitted</h1>
+						{{#if formSubmittedHeader}}
+							<h1 id='submitted-header'>{{formSubmittedHeader}}</h1>
+						{{else}}
+							<h1 id='submitted-header'>Form Submitted</h1>
+						{{/if}}
 						{{#if formSubmittedText}}
 							<p id='submitted-content'>
 								{{formSubmittedText}}
diff --git a/packages/cli/test/integration/active-workflow-manager.test.ts b/packages/cli/test/integration/active-workflow-manager.test.ts
index 8ea790ade7209..a3e4f657f26ed 100644
--- a/packages/cli/test/integration/active-workflow-manager.test.ts
+++ b/packages/cli/test/integration/active-workflow-manager.test.ts
@@ -1,6 +1,5 @@
 import { mock } from 'jest-mock-extended';
-import type { InstanceSettings } from 'n8n-core';
-import { NodeApiError, NodeOperationError, Workflow } from 'n8n-workflow';
+import { NodeApiError, Workflow } from 'n8n-workflow';
 import type { IWebhookData, WorkflowActivateMode } from 'n8n-workflow';
 import { Container } from 'typedi';
 
@@ -10,7 +9,7 @@ import type { WebhookEntity } from '@/databases/entities/webhook-entity';
 import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
 import { ExecutionService } from '@/executions/execution.service';
 import { ExternalHooks } from '@/external-hooks';
-import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
+import { Logger } from '@/logging/logger.service';
 import { NodeTypes } from '@/node-types';
 import { Push } from '@/push';
 import { SecretsHelper } from '@/secrets-helpers';
@@ -22,29 +21,16 @@ import { WorkflowService } from '@/workflows/workflow.service';
 import { createOwner } from './shared/db/users';
 import { createWorkflow } from './shared/db/workflows';
 import * as testDb from './shared/test-db';
+import * as utils from './shared/utils/';
 import { mockInstance } from '../shared/mocking';
 
 mockInstance(ActiveExecutions);
+mockInstance(Logger);
 mockInstance(Push);
 mockInstance(SecretsHelper);
 mockInstance(ExecutionService);
 mockInstance(WorkflowService);
 
-const loader = mockInstance(LoadNodesAndCredentials);
-
-Object.assign(loader.loadedNodes, {
-	'n8n-nodes-base.scheduleTrigger': {
-		type: {
-			description: {
-				displayName: 'Schedule Trigger',
-				name: 'scheduleTrigger',
-				properties: [],
-			},
-			trigger: async () => {},
-		},
-	},
-});
-
 const webhookService = mockInstance(WebhookService);
 const externalHooks = mockInstance(ExternalHooks);
 
@@ -58,15 +44,17 @@ beforeAll(async () => {
 
 	activeWorkflowManager = Container.get(ActiveWorkflowManager);
 
+	await utils.initNodeTypes();
+
 	const owner = await createOwner();
 	createActiveWorkflow = async () => await createWorkflow({ active: true }, owner);
 	createInactiveWorkflow = async () => await createWorkflow({ active: false }, owner);
 });
 
 afterEach(async () => {
-	await testDb.truncate(['Workflow', 'Webhook']);
 	await activeWorkflowManager.removeAll();
-	jest.restoreAllMocks();
+	await testDb.truncate(['Workflow', 'Webhook']);
+	jest.clearAllMocks();
 });
 
 afterAll(async () => {
@@ -98,7 +86,7 @@ describe('init()', () => {
 		await Promise.all([createActiveWorkflow(), createActiveWorkflow()]);
 
 		const checkSpy = jest
-			.spyOn(Workflow.prototype, 'checkIfWorkflowCanBeActivated')
+			.spyOn(activeWorkflowManager, 'checkIfWorkflowCanBeActivated')
 			.mockReturnValue(true);
 
 		await activeWorkflowManager.init();
@@ -179,7 +167,6 @@ describe('remove()', () => {
 
 		it('should remove all webhooks of a workflow from external service', async () => {
 			const dbWorkflow = await createActiveWorkflow();
-			const deleteWebhookSpy = jest.spyOn(Workflow.prototype, 'deleteWebhook');
 			jest
 				.spyOn(WebhookHelpers, 'getWorkflowWebhooks')
 				.mockReturnValue([mock<IWebhookData>({ path: 'some-path' })]);
@@ -187,7 +174,7 @@ describe('remove()', () => {
 			await activeWorkflowManager.init();
 			await activeWorkflowManager.remove(dbWorkflow.id);
 
-			expect(deleteWebhookSpy).toHaveBeenCalledTimes(1);
+			expect(webhookService.deleteWebhook).toHaveBeenCalledTimes(1);
 		});
 
 		it('should stop running triggers and pollers', async () => {
@@ -206,22 +193,22 @@ describe('remove()', () => {
 });
 
 describe('executeErrorWorkflow()', () => {
-	it('should delegate to `WorkflowExecuteAdditionalData`', async () => {
-		const dbWorkflow = await createActiveWorkflow();
-		const [node] = dbWorkflow.nodes;
+	// it('should delegate to `WorkflowExecuteAdditionalData`', async () => {
+	// 	const dbWorkflow = await createActiveWorkflow();
+	// 	const [node] = dbWorkflow.nodes;
 
-		const executeSpy = jest.spyOn(AdditionalData, 'executeErrorWorkflow');
+	// 	const executeSpy = jest.spyOn(AdditionalData, 'executeErrorWorkflow');
 
-		await activeWorkflowManager.init();
+	// 	await activeWorkflowManager.init();
 
-		activeWorkflowManager.executeErrorWorkflow(
-			new NodeOperationError(node, 'Something went wrong'),
-			dbWorkflow,
-			'trigger',
-		);
+	// 	activeWorkflowManager.executeErrorWorkflow(
+	// 		new NodeOperationError(node, 'Something went wrong'),
+	// 		dbWorkflow,
+	// 		'trigger',
+	// 	);
 
-		expect(executeSpy).toHaveBeenCalledTimes(1);
-	});
+	// 	expect(executeSpy).toHaveBeenCalledTimes(1);
+	// });
 
 	it('should be called on failure to activate due to 401', async () => {
 		const dbWorkflow = await createActiveWorkflow();
@@ -271,80 +258,11 @@ describe('addWebhooks()', () => {
 		const [node] = dbWorkflow.nodes;
 
 		jest.spyOn(Workflow.prototype, 'getNode').mockReturnValue(node);
-		jest.spyOn(Workflow.prototype, 'checkIfWorkflowCanBeActivated').mockReturnValue(true);
-		jest.spyOn(Workflow.prototype, 'createWebhookIfNotExists').mockResolvedValue(undefined);
+		jest.spyOn(activeWorkflowManager, 'checkIfWorkflowCanBeActivated').mockReturnValue(true);
+		webhookService.createWebhookIfNotExists.mockResolvedValue(undefined);
 
 		await activeWorkflowManager.addWebhooks(workflow, additionalData, 'trigger', 'init');
 
 		expect(webhookService.storeWebhook).toHaveBeenCalledTimes(1);
 	});
 });
-
-describe('shouldAddWebhooks', () => {
-	describe('if leader', () => {
-		const activeWorkflowManager = new ActiveWorkflowManager(
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock<InstanceSettings>({ isLeader: true, isFollower: false }),
-			mock(),
-		);
-
-		test('should return `true` for `init`', () => {
-			// ensure webhooks are populated on init: https://github.com/n8n-io/n8n/pull/8830
-			const result = activeWorkflowManager.shouldAddWebhooks('init');
-			expect(result).toBe(true);
-		});
-
-		test('should return `false` for `leadershipChange`', () => {
-			const result = activeWorkflowManager.shouldAddWebhooks('leadershipChange');
-			expect(result).toBe(false);
-		});
-
-		test('should return `true` for `update` or `activate`', () => {
-			const modes = ['update', 'activate'] as WorkflowActivateMode[];
-			for (const mode of modes) {
-				const result = activeWorkflowManager.shouldAddWebhooks(mode);
-				expect(result).toBe(true);
-			}
-		});
-	});
-
-	describe('if follower', () => {
-		const activeWorkflowManager = new ActiveWorkflowManager(
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock<InstanceSettings>({ isLeader: false, isFollower: true }),
-			mock(),
-		);
-
-		test('should return `false` for `update` or `activate`', () => {
-			const modes = ['update', 'activate'] as WorkflowActivateMode[];
-			for (const mode of modes) {
-				const result = activeWorkflowManager.shouldAddWebhooks(mode);
-				expect(result).toBe(false);
-			}
-		});
-	});
-});
diff --git a/packages/cli/test/integration/collaboration/collaboration.service.test.ts b/packages/cli/test/integration/collaboration/collaboration.service.test.ts
index df5f901f2817d..ab7a8314b3a55 100644
--- a/packages/cli/test/integration/collaboration/collaboration.service.test.ts
+++ b/packages/cli/test/integration/collaboration/collaboration.service.test.ts
@@ -78,37 +78,41 @@ describe('CollaborationService', () => {
 			// Assert
 			expect(sendToUsersSpy).toHaveBeenNthCalledWith(
 				1,
-				'collaboratorsChanged',
 				{
-					collaborators: [
-						{
-							lastSeen: expect.any(String),
-							user: owner.toIUser(),
-						},
-					],
-					workflowId: workflow.id,
+					type: 'collaboratorsChanged',
+					data: {
+						collaborators: [
+							{
+								lastSeen: expect.any(String),
+								user: owner.toIUser(),
+							},
+						],
+						workflowId: workflow.id,
+					},
 				},
 				[owner.id],
 			);
 			expect(sendToUsersSpy).toHaveBeenNthCalledWith(
 				2,
-				'collaboratorsChanged',
 				{
-					collaborators: expect.arrayContaining([
-						expect.objectContaining({
-							lastSeen: expect.any(String),
-							user: expect.objectContaining({
-								id: owner.id,
+					type: 'collaboratorsChanged',
+					data: {
+						collaborators: expect.arrayContaining([
+							expect.objectContaining({
+								lastSeen: expect.any(String),
+								user: expect.objectContaining({
+									id: owner.id,
+								}),
 							}),
-						}),
-						expect.objectContaining({
-							lastSeen: expect.any(String),
-							user: expect.objectContaining({
-								id: memberWithAccess.id,
+							expect.objectContaining({
+								lastSeen: expect.any(String),
+								user: expect.objectContaining({
+									id: memberWithAccess.id,
+								}),
 							}),
-						}),
-					]),
-					workflowId: workflow.id,
+						]),
+						workflowId: workflow.id,
+					},
 				},
 				[owner.id, memberWithAccess.id],
 			);
@@ -151,17 +155,19 @@ describe('CollaborationService', () => {
 
 			// Assert
 			expect(sendToUsersSpy).toHaveBeenCalledWith(
-				'collaboratorsChanged',
 				{
-					collaborators: expect.arrayContaining([
-						expect.objectContaining({
-							lastSeen: expect.any(String),
-							user: expect.objectContaining({
-								id: memberWithAccess.id,
+					type: 'collaboratorsChanged',
+					data: {
+						collaborators: expect.arrayContaining([
+							expect.objectContaining({
+								lastSeen: expect.any(String),
+								user: expect.objectContaining({
+									id: memberWithAccess.id,
+								}),
 							}),
-						}),
-					]),
-					workflowId: workflow.id,
+						]),
+						workflowId: workflow.id,
+					},
 				},
 				[memberWithAccess.id],
 			);
diff --git a/packages/cli/test/integration/deduplication/deduplication-helper.test.ts b/packages/cli/test/integration/deduplication/deduplication-helper.test.ts
index 2859bb363cf17..467e6e0924d8d 100644
--- a/packages/cli/test/integration/deduplication/deduplication-helper.test.ts
+++ b/packages/cli/test/integration/deduplication/deduplication-helper.test.ts
@@ -1,5 +1,5 @@
 import { DataDeduplicationService } from 'n8n-core';
-import type { ICheckProcessedContextData, INodeTypeData } from 'n8n-workflow';
+import type { ICheckProcessedContextData } from 'n8n-workflow';
 import type { IDeduplicationOutput, INode, DeduplicationItemTypes } from 'n8n-workflow';
 import { Workflow } from 'n8n-workflow';
 
@@ -8,6 +8,7 @@ import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
 import { NodeTypes } from '@/node-types';
 import { mockInstance } from '@test/mocking';
 import { createWorkflow } from '@test-integration/db/workflows';
+import { mockNodeTypesData } from '@test-integration/utils/node-types-data';
 
 import * as testDb from '../shared/test-db';
 
@@ -22,35 +23,7 @@ mockInstance(LoadNodesAndCredentials, {
 		credentials: {},
 	},
 });
-function mockNodeTypesData(
-	nodeNames: string[],
-	options?: {
-		addTrigger?: boolean;
-	},
-) {
-	return nodeNames.reduce<INodeTypeData>((acc, nodeName) => {
-		return (
-			(acc[`n8n-nodes-base.${nodeName}`] = {
-				sourcePath: '',
-				type: {
-					description: {
-						displayName: nodeName,
-						name: nodeName,
-						group: [],
-						description: '',
-						version: 1,
-						defaults: {},
-						inputs: [],
-						outputs: [],
-						properties: [],
-					},
-					trigger: options?.addTrigger ? async () => undefined : undefined,
-				},
-			}),
-			acc
-		);
-	}, {});
-}
+
 const node: INode = {
 	id: 'uuid-1234',
 	parameters: {},
diff --git a/packages/cli/test/integration/environments/source-control-import.service.test.ts b/packages/cli/test/integration/environments/source-control-import.service.test.ts
index 78732a99bcd17..4d2a3d668a6e6 100644
--- a/packages/cli/test/integration/environments/source-control-import.service.test.ts
+++ b/packages/cli/test/integration/environments/source-control-import.service.test.ts
@@ -30,6 +30,7 @@ describe('SourceControlImportService', () => {
 			mock(),
 			mock(),
 			mock(),
+			mock(),
 			mock<InstanceSettings>({ n8nFolder: '/some-path' }),
 		);
 
diff --git a/packages/cli/test/integration/permission-checker.test.ts b/packages/cli/test/integration/permission-checker.test.ts
index e746ec29f7c58..1a0963b6851cd 100644
--- a/packages/cli/test/integration/permission-checker.test.ts
+++ b/packages/cli/test/integration/permission-checker.test.ts
@@ -1,4 +1,4 @@
-import type { INode, INodeTypeData } from 'n8n-workflow';
+import type { INode } from 'n8n-workflow';
 import { randomInt } from 'n8n-workflow';
 import { Container } from 'typedi';
 import { v4 as uuid } from 'uuid';
@@ -14,6 +14,7 @@ import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
 import { NodeTypes } from '@/node-types';
 import { OwnershipService } from '@/services/ownership.service';
 import { PermissionChecker } from '@/user-management/permission-checker';
+import { mockNodeTypesData } from '@test-integration/utils/node-types-data';
 
 import { affixRoleToSaveCredential } from './shared/db/credentials';
 import { getPersonalProject } from './shared/db/projects';
@@ -25,36 +26,6 @@ import { mockInstance } from '../shared/mocking';
 
 const ownershipService = mockInstance(OwnershipService);
 
-function mockNodeTypesData(
-	nodeNames: string[],
-	options?: {
-		addTrigger?: boolean;
-	},
-) {
-	return nodeNames.reduce<INodeTypeData>((acc, nodeName) => {
-		return (
-			(acc[`n8n-nodes-base.${nodeName}`] = {
-				sourcePath: '',
-				type: {
-					description: {
-						displayName: nodeName,
-						name: nodeName,
-						group: [],
-						description: '',
-						version: 1,
-						defaults: {},
-						inputs: [],
-						outputs: [],
-						properties: [],
-					},
-					trigger: options?.addTrigger ? async () => undefined : undefined,
-				},
-			}),
-			acc
-		);
-	}, {});
-}
-
 const createWorkflow = async (nodes: INode[], workflowOwner?: User): Promise<WorkflowEntity> => {
 	const workflowDetails = {
 		id: randomInt(1, 10).toString(),
diff --git a/packages/cli/test/integration/public-api/workflows.test.ts b/packages/cli/test/integration/public-api/workflows.test.ts
index 687b29da6af8d..28f9d444daa27 100644
--- a/packages/cli/test/integration/public-api/workflows.test.ts
+++ b/packages/cli/test/integration/public-api/workflows.test.ts
@@ -378,6 +378,47 @@ describe('GET /workflows', () => {
 			expect(updatedAt).toBeDefined();
 		}
 	});
+
+	test('should return all owned workflows without pinned data', async () => {
+		await Promise.all([
+			createWorkflow(
+				{
+					pinData: {
+						Webhook1: [{ json: { first: 'first' } }],
+					},
+				},
+				member,
+			),
+			createWorkflow(
+				{
+					pinData: {
+						Webhook2: [{ json: { second: 'second' } }],
+					},
+				},
+				member,
+			),
+			createWorkflow(
+				{
+					pinData: {
+						Webhook3: [{ json: { third: 'third' } }],
+					},
+				},
+				member,
+			),
+		]);
+
+		const response = await authMemberAgent.get('/workflows?excludePinnedData=true');
+
+		expect(response.statusCode).toBe(200);
+		expect(response.body.data.length).toBe(3);
+		expect(response.body.nextCursor).toBeNull();
+
+		for (const workflow of response.body.data) {
+			const { pinData } = workflow;
+
+			expect(pinData).not.toBeDefined();
+		}
+	});
 });
 
 describe('GET /workflows/:id', () => {
@@ -444,6 +485,26 @@ describe('GET /workflows/:id', () => {
 		expect(createdAt).toEqual(workflow.createdAt.toISOString());
 		expect(updatedAt).toEqual(workflow.updatedAt.toISOString());
 	});
+
+	test('should retrieve workflow without pinned data', async () => {
+		// create and assign workflow to owner
+		const workflow = await createWorkflow(
+			{
+				pinData: {
+					Webhook1: [{ json: { first: 'first' } }],
+				},
+			},
+			member,
+		);
+
+		const response = await authMemberAgent.get(`/workflows/${workflow.id}?excludePinnedData=true`);
+
+		expect(response.statusCode).toBe(200);
+
+		const { pinData } = response.body;
+
+		expect(pinData).not.toBeDefined();
+	});
 });
 
 describe('DELETE /workflows/:id', () => {
@@ -528,8 +589,28 @@ describe('POST /workflows/:id/activate', () => {
 		expect(response.statusCode).toBe(404);
 	});
 
+	test('should fail due to trying to activate a workflow without any nodes', async () => {
+		const workflow = await createWorkflow({ nodes: [] }, owner);
+		const response = await authOwnerAgent.post(`/workflows/${workflow.id}/activate`);
+		expect(response.statusCode).toBe(400);
+	});
+
 	test('should fail due to trying to activate a workflow without a trigger', async () => {
-		const workflow = await createWorkflow({}, owner);
+		const workflow = await createWorkflow(
+			{
+				nodes: [
+					{
+						id: 'uuid-1234',
+						name: 'Start',
+						parameters: {},
+						position: [-20, 260],
+						type: 'n8n-nodes-base.start',
+						typeVersion: 1,
+					},
+				],
+			},
+			owner,
+		);
 		const response = await authOwnerAgent.post(`/workflows/${workflow.id}/activate`);
 		expect(response.statusCode).toBe(400);
 	});
diff --git a/packages/cli/test/integration/runners/task-runner-module.external.test.ts b/packages/cli/test/integration/runners/task-runner-module.external.test.ts
index 8e872c25ec1da..bb61dae6d476b 100644
--- a/packages/cli/test/integration/runners/task-runner-module.external.test.ts
+++ b/packages/cli/test/integration/runners/task-runner-module.external.test.ts
@@ -33,7 +33,7 @@ describe('TaskRunnerModule in external mode', () => {
 			runnerConfig.enabled = true;
 			runnerConfig.authToken = '';
 
-			const module = new TaskRunnerModule(mock(), runnerConfig);
+			const module = new TaskRunnerModule(mock(), mock(), runnerConfig);
 
 			await expect(module.start()).rejects.toThrowError(MissingAuthTokenError);
 		});
diff --git a/packages/cli/test/integration/shared/retry-until.ts b/packages/cli/test/integration/shared/retry-until.ts
index f469149b31fe3..b6f375ecb42e7 100644
--- a/packages/cli/test/integration/shared/retry-until.ts
+++ b/packages/cli/test/integration/shared/retry-until.ts
@@ -8,7 +8,7 @@
  */
 export const retryUntil = async (
 	assertion: () => Promise<void> | void,
-	{ interval = 20, timeout = 1000 } = {},
+	{ intervalMs = 200, timeoutMs = 5000 } = {},
 ) => {
 	return await new Promise((resolve, reject) => {
 		const startTime = Date.now();
@@ -18,13 +18,13 @@ export const retryUntil = async (
 				try {
 					resolve(await assertion());
 				} catch (error) {
-					if (Date.now() - startTime > timeout) {
+					if (Date.now() - startTime > timeoutMs) {
 						reject(error);
 					} else {
 						tryAgain();
 					}
 				}
-			}, interval);
+			}, intervalMs);
 		};
 
 		tryAgain();
diff --git a/packages/cli/test/integration/shared/utils/community-nodes.ts b/packages/cli/test/integration/shared/utils/community-nodes.ts
index 7734f707620fa..d29a9361be31e 100644
--- a/packages/cli/test/integration/shared/utils/community-nodes.ts
+++ b/packages/cli/test/integration/shared/utils/community-nodes.ts
@@ -22,7 +22,7 @@ export const mockNode = (packageName: string) => {
 
 	return Container.get(InstalledNodesRepository).create({
 		name: nodeName,
-		type: nodeName,
+		type: `${packageName}.${nodeName}`,
 		latestVersion: COMMUNITY_NODE_VERSION.CURRENT,
 		package: { packageName },
 	});
diff --git a/packages/cli/test/integration/shared/utils/index.ts b/packages/cli/test/integration/shared/utils/index.ts
index 78de2c1b25361..ba99e1ca07407 100644
--- a/packages/cli/test/integration/shared/utils/index.ts
+++ b/packages/cli/test/integration/shared/utils/index.ts
@@ -1,10 +1,17 @@
-import { BinaryDataService } from 'n8n-core';
+import { mock } from 'jest-mock-extended';
+import {
+	BinaryDataService,
+	InstanceSettings,
+	UnrecognizedNodeTypeError,
+	type DirectoryLoader,
+} from 'n8n-core';
 import { Ftp } from 'n8n-nodes-base/credentials/Ftp.credentials';
 import { GithubApi } from 'n8n-nodes-base/credentials/GithubApi.credentials';
 import { Cron } from 'n8n-nodes-base/nodes/Cron/Cron.node';
+import { ScheduleTrigger } from 'n8n-nodes-base/nodes/Schedule/ScheduleTrigger.node';
 import { Set } from 'n8n-nodes-base/nodes/Set/Set.node';
 import { Start } from 'n8n-nodes-base/nodes/Start/Start.node';
-import { type INode } from 'n8n-workflow';
+import type { INodeTypeData, INode } from 'n8n-workflow';
 import type request from 'supertest';
 import { Container } from 'typedi';
 import { v4 as uuid } from 'uuid';
@@ -16,7 +23,6 @@ import { SettingsRepository } from '@/databases/repositories/settings.repository
 import { ExecutionService } from '@/executions/execution.service';
 import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
 import { Push } from '@/push';
-import { OrchestrationService } from '@/services/orchestration.service';
 
 import { mockInstance } from '../../../shared/mocking';
 
@@ -30,8 +36,8 @@ export { setupTestServer } from './test-server';
  * Initialize node types.
  */
 export async function initActiveWorkflowManager() {
-	mockInstance(OrchestrationService, {
-		isMultiMainSetupEnabled: false,
+	mockInstance(InstanceSettings, {
+		isMultiMain: false,
 	});
 
 	mockInstance(Push);
@@ -62,7 +68,8 @@ export async function initCredentialsTypes(): Promise<void> {
  * Initialize node types.
  */
 export async function initNodeTypes() {
-	Container.get(LoadNodesAndCredentials).loaded.nodes = {
+	ScheduleTrigger.prototype.trigger = async () => ({});
+	const nodes: INodeTypeData = {
 		'n8n-nodes-base.start': {
 			type: new Start(),
 			sourcePath: '',
@@ -75,7 +82,21 @@ export async function initNodeTypes() {
 			type: new Set(),
 			sourcePath: '',
 		},
+		'n8n-nodes-base.scheduleTrigger': {
+			type: new ScheduleTrigger(),
+			sourcePath: '',
+		},
 	};
+	const loader = mock<DirectoryLoader>();
+	loader.getNode.mockImplementation((nodeType) => {
+		const node = nodes[`n8n-nodes-base.${nodeType}`];
+		if (!node) throw new UnrecognizedNodeTypeError('n8n-nodes-base', nodeType);
+		return node;
+	});
+
+	const loadNodesAndCredentials = Container.get(LoadNodesAndCredentials);
+	loadNodesAndCredentials.loaders = { 'n8n-nodes-base': loader };
+	loadNodesAndCredentials.loaded.nodes = nodes;
 }
 
 /**
diff --git a/packages/cli/test/integration/shared/utils/node-types-data.ts b/packages/cli/test/integration/shared/utils/node-types-data.ts
new file mode 100644
index 0000000000000..35178de207131
--- /dev/null
+++ b/packages/cli/test/integration/shared/utils/node-types-data.ts
@@ -0,0 +1,33 @@
+import type { INodeTypeData } from 'n8n-workflow';
+
+export function mockNodeTypesData(
+	nodeNames: string[],
+	options?: {
+		addTrigger?: boolean;
+	},
+) {
+	return nodeNames.reduce<INodeTypeData>((acc, nodeName) => {
+		const fullName = nodeName.indexOf('.') === -1 ? `n8n-nodes-base.${nodeName}` : nodeName;
+
+		return (
+			(acc[fullName] = {
+				sourcePath: '',
+				type: {
+					description: {
+						displayName: nodeName,
+						name: nodeName,
+						group: [],
+						description: '',
+						version: 1,
+						defaults: {},
+						inputs: [],
+						outputs: [],
+						properties: [],
+					},
+					trigger: options?.addTrigger ? async () => undefined : undefined,
+				},
+			}),
+			acc
+		);
+	}, {});
+}
diff --git a/packages/cli/test/integration/variables.test.ts b/packages/cli/test/integration/variables.test.ts
index f8cef375391a4..7dd8d00aaedd8 100644
--- a/packages/cli/test/integration/variables.test.ts
+++ b/packages/cli/test/integration/variables.test.ts
@@ -4,6 +4,7 @@ import type { Variables } from '@/databases/entities/variables';
 import { VariablesRepository } from '@/databases/repositories/variables.repository';
 import { generateNanoId } from '@/databases/utils/generators';
 import { VariablesService } from '@/environments/variables/variables.service.ee';
+import { CacheService } from '@/services/cache/cache.service';
 
 import { createOwner, createUser } from './shared/db/users';
 import * as testDb from './shared/test-db';
@@ -65,19 +66,41 @@ beforeEach(async () => {
 // ----------------------------------------
 describe('GET /variables', () => {
 	beforeEach(async () => {
-		await Promise.all([createVariable('test1', 'value1'), createVariable('test2', 'value2')]);
+		await Promise.all([
+			createVariable('test1', 'value1'),
+			createVariable('test2', 'value2'),
+			createVariable('empty', ''),
+		]);
+	});
+
+	test('should return an empty array if there is nothing in the cache', async () => {
+		const cacheService = Container.get(CacheService);
+		const spy = jest.spyOn(cacheService, 'get').mockResolvedValueOnce(undefined);
+		const response = await authOwnerAgent.get('/variables');
+		expect(spy).toHaveBeenCalledTimes(1);
+		expect(response.statusCode).toBe(200);
+		expect(response.body.data.length).toBe(0);
 	});
 
 	test('should return all variables for an owner', async () => {
 		const response = await authOwnerAgent.get('/variables');
 		expect(response.statusCode).toBe(200);
-		expect(response.body.data.length).toBe(2);
+		expect(response.body.data.length).toBe(3);
 	});
 
 	test('should return all variables for a member', async () => {
 		const response = await authMemberAgent.get('/variables');
 		expect(response.statusCode).toBe(200);
-		expect(response.body.data.length).toBe(2);
+		expect(response.body.data.length).toBe(3);
+	});
+
+	describe('state:empty', () => {
+		test('only return empty variables', async () => {
+			const response = await authOwnerAgent.get('/variables').query({ state: 'empty' });
+			expect(response.statusCode).toBe(200);
+			expect(response.body.data.length).toBe(1);
+			expect(response.body.data[0]).toMatchObject({ key: 'empty', value: '', type: 'string' });
+		});
 	});
 });
 
diff --git a/packages/cli/test/setup-test-folder.ts b/packages/cli/test/setup-test-folder.ts
index 997a0ec80f811..8a58c48f865f4 100644
--- a/packages/cli/test/setup-test-folder.ts
+++ b/packages/cli/test/setup-test-folder.ts
@@ -10,6 +10,7 @@ mkdirSync(baseDir, { recursive: true });
 const testDir = mkdtempSync(baseDir);
 mkdirSync(join(testDir, '.n8n'));
 process.env.N8N_USER_FOLDER = testDir;
+process.env.N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS = 'false';
 
 writeFileSync(
 	join(testDir, '.n8n/config'),
diff --git a/packages/core/bin/generate-known b/packages/core/bin/generate-known
deleted file mode 100755
index 3784f15fb1f8f..0000000000000
--- a/packages/core/bin/generate-known
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/usr/bin/env node
-
-const path = require('path');
-const glob = require('fast-glob');
-const uniq = require('lodash/uniq');
-const { LoggerProxy, getCredentialsForNode } = require('n8n-workflow');
-const { packageDir, writeJSON } = require('./common');
-const { loadClassInIsolation } = require('../dist/ClassLoader');
-
-LoggerProxy.init(console);
-
-const loadClass = (sourcePath) => {
-	try {
-		const [className] = path.parse(sourcePath).name.split('.');
-		const filePath = path.resolve(packageDir, sourcePath);
-		const instance = loadClassInIsolation(filePath, className);
-		return { instance, sourcePath, className };
-	} catch (e) {
-		LoggerProxy.warn(`Failed to load ${sourcePath}: ${e.message}`);
-	}
-};
-
-const generateKnownNodes = async () => {
-	const nodeClasses = glob
-		.sync('dist/nodes/**/*.node.js', { cwd: packageDir })
-		.map(loadClass)
-		// Ignore node versions
-		.filter((nodeClass) => nodeClass && !/[vV]\d.node\.js$/.test(nodeClass.sourcePath));
-
-	const nodes = {};
-	const nodesByCredential = {};
-
-	for (const { className, sourcePath, instance } of nodeClasses) {
-		const nodeName = instance.description.name;
-		nodes[nodeName] = { className, sourcePath };
-
-		for (const credential of getCredentialsForNode(instance)) {
-			if (!nodesByCredential[credential.name]) {
-				nodesByCredential[credential.name] = [];
-			}
-
-			nodesByCredential[credential.name].push(nodeName);
-		}
-	}
-
-	LoggerProxy.info(`Detected ${Object.keys(nodes).length} nodes`);
-	await writeJSON('known/nodes.json', nodes);
-	return { nodes, nodesByCredential };
-};
-
-const generateKnownCredentials = async (nodesByCredential) => {
-	const credentialClasses = glob
-		.sync(`dist/credentials/**/*.credentials.js`, { cwd: packageDir })
-		.map(loadClass)
-		.filter((data) => !!data);
-
-	for (const { instance } of credentialClasses) {
-		if (Array.isArray(instance.extends)) {
-			for (const extendedCredential of instance.extends) {
-				nodesByCredential[extendedCredential] = [
-					...(nodesByCredential[extendedCredential] ?? []),
-					...(nodesByCredential[instance.name] ?? []),
-				];
-			}
-		}
-	}
-
-	const credentials = credentialClasses.reduce(
-		(credentials, { className, sourcePath, instance }) => {
-			const credentialName = instance.name;
-			const credential = {
-				className,
-				sourcePath,
-			};
-
-			if (Array.isArray(instance.extends)) {
-				credential.extends = instance.extends;
-			}
-
-			if (nodesByCredential[credentialName]) {
-				credential.supportedNodes = Array.from(new Set(nodesByCredential[credentialName]));
-			}
-
-			credentials[credentialName] = credential;
-
-			return credentials;
-		},
-		{},
-	);
-
-	LoggerProxy.info(`Detected ${Object.keys(credentials).length} credentials`);
-	await writeJSON('known/credentials.json', credentials);
-	return credentials;
-};
-
-(async () => {
-	const { nodesByCredential } = await generateKnownNodes();
-	await generateKnownCredentials(nodesByCredential);
-})();
diff --git a/packages/core/bin/generate-ui-types b/packages/core/bin/generate-metadata
similarity index 59%
rename from packages/core/bin/generate-ui-types
rename to packages/core/bin/generate-metadata
index f73ca87a15eca..18dbca687a2b3 100755
--- a/packages/core/bin/generate-ui-types
+++ b/packages/core/bin/generate-metadata
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-const { LoggerProxy, NodeHelpers } = require('n8n-workflow');
+const { LoggerProxy } = require('n8n-workflow');
 const { PackageDirectoryLoader } = require('../dist/DirectoryLoader');
 const { packageDir, writeJSON } = require('./common');
 
@@ -33,7 +33,7 @@ function findReferencedMethods(obj, refs = {}, latestName = '') {
 	const loaderNodeTypes = Object.values(loader.nodeTypes);
 
 	const definedMethods = loaderNodeTypes.reduce((acc, cur) => {
-		NodeHelpers.getVersionedNodeTypeAll(cur.type).forEach((type) => {
+		loader.getVersionedNodeTypeAll(cur.type).forEach((type) => {
 			const methods = type.description?.__loadOptionsMethods;
 
 			if (!methods) return;
@@ -52,51 +52,21 @@ function findReferencedMethods(obj, refs = {}, latestName = '') {
 	}, {});
 
 	const nodeTypes = loaderNodeTypes
-		.map((data) => {
-			const nodeType = NodeHelpers.getVersionedNodeType(data.type);
-			NodeHelpers.applySpecialNodeParameters(nodeType);
-			return data.type;
-		})
+		.map(({ type }) => type)
 		.flatMap((nodeType) =>
-			NodeHelpers.getVersionedNodeTypeAll(nodeType).map((item) => {
+			loader.getVersionedNodeTypeAll(nodeType).map((item) => {
 				const { __loadOptionsMethods, ...rest } = item.description;
 				return rest;
 			}),
 		);
 
 	const knownCredentials = loader.known.credentials;
-	const credentialTypes = Object.values(loader.credentialTypes).map((data) => {
-		const credentialType = data.type;
-		const supportedNodes = knownCredentials[credentialType.name].supportedNodes ?? [];
-		if (supportedNodes.length > 0 && credentialType.httpRequestNode) {
-			credentialType.httpRequestNode.hidden = true;
-		}
-
-		credentialType.supportedNodes = supportedNodes;
-
-		if (!credentialType.iconUrl && !credentialType.icon) {
-			for (const supportedNode of supportedNodes) {
-				const nodeType = loader.nodeTypes[supportedNode]?.type.description;
-
-				if (!nodeType) continue;
-				if (nodeType.icon) {
-					credentialType.icon = nodeType.icon;
-					credentialType.iconColor = nodeType.iconColor;
-					break;
-				}
-				if (nodeType.iconUrl) {
-					credentialType.iconUrl = nodeType.iconUrl;
-					break;
-				}
-			}
-		}
-
-		return credentialType;
-	});
-
+	const credentialTypes = Object.values(loader.credentialTypes).map(({ type }) => type);
 	const referencedMethods = findReferencedMethods(nodeTypes);
 
 	await Promise.all([
+		writeJSON('known/nodes.json', loader.known.nodes),
+		writeJSON('known/credentials.json', loader.known.credentials),
 		writeJSON('types/credentials.json', credentialTypes),
 		writeJSON('types/nodes.json', nodeTypes),
 		writeJSON('methods/defined.json', definedMethods),
diff --git a/packages/core/package.json b/packages/core/package.json
index d334e118f1c5a..26b41800d9c75 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,14 +1,13 @@
 {
   "name": "n8n-core",
-  "version": "1.71.0",
+  "version": "1.73.0",
   "description": "Core functionality of n8n",
   "main": "dist/index",
   "types": "dist/index.d.ts",
   "bin": {
     "n8n-copy-icons": "./bin/copy-icons",
-    "n8n-generate-known": "./bin/generate-known",
     "n8n-generate-translations": "./bin/generate-translations",
-    "n8n-generate-ui-types": "./bin/generate-ui-types"
+    "n8n-generate-metadata": "./bin/generate-metadata"
   },
   "scripts": {
     "clean": "rimraf dist .turbo",
@@ -40,8 +39,10 @@
     "@langchain/core": "catalog:",
     "@n8n/client-oauth2": "workspace:*",
     "@n8n/config": "workspace:*",
+    "@sentry/node": "catalog:",
     "aws4": "1.11.0",
     "axios": "catalog:",
+    "chardet": "2.0.0",
     "concat-stream": "2.0.0",
     "cron": "3.1.7",
     "fast-glob": "catalog:",
diff --git a/packages/core/src/ActiveWorkflows.ts b/packages/core/src/ActiveWorkflows.ts
index 93e67488d55c9..e3ca8614c2fa8 100644
--- a/packages/core/src/ActiveWorkflows.ts
+++ b/packages/core/src/ActiveWorkflows.ts
@@ -11,7 +11,6 @@ import type {
 } from 'n8n-workflow';
 import {
 	ApplicationError,
-	ErrorReporterProxy as ErrorReporter,
 	LoggerProxy as Logger,
 	toCronExpression,
 	TriggerCloseError,
@@ -20,12 +19,18 @@ import {
 } from 'n8n-workflow';
 import { Service } from 'typedi';
 
+import { ErrorReporter } from './error-reporter';
 import type { IWorkflowData } from './Interfaces';
 import { ScheduledTaskManager } from './ScheduledTaskManager';
+import { TriggersAndPollers } from './TriggersAndPollers';
 
 @Service()
 export class ActiveWorkflows {
-	constructor(private readonly scheduledTaskManager: ScheduledTaskManager) {}
+	constructor(
+		private readonly scheduledTaskManager: ScheduledTaskManager,
+		private readonly triggersAndPollers: TriggersAndPollers,
+		private readonly errorReporter: ErrorReporter,
+	) {}
 
 	private activeWorkflows: { [workflowId: string]: IWorkflowData } = {};
 
@@ -66,16 +71,14 @@ export class ActiveWorkflows {
 		getTriggerFunctions: IGetExecuteTriggerFunctions,
 		getPollFunctions: IGetExecutePollFunctions,
 	) {
-		this.activeWorkflows[workflowId] = {};
 		const triggerNodes = workflow.getTriggerNodes();
 
-		let triggerResponse: ITriggerResponse | undefined;
-
-		this.activeWorkflows[workflowId].triggerResponses = [];
+		const triggerResponses: ITriggerResponse[] = [];
 
 		for (const triggerNode of triggerNodes) {
 			try {
-				triggerResponse = await workflow.runTrigger(
+				const triggerResponse = await this.triggersAndPollers.runTrigger(
+					workflow,
 					triggerNode,
 					getTriggerFunctions,
 					additionalData,
@@ -83,10 +86,7 @@ export class ActiveWorkflows {
 					activation,
 				);
 				if (triggerResponse !== undefined) {
-					// If a response was given save it
-
-					// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-					this.activeWorkflows[workflowId].triggerResponses!.push(triggerResponse);
+					triggerResponses.push(triggerResponse);
 				}
 			} catch (e) {
 				const error = e instanceof Error ? e : new Error(`${e}`);
@@ -98,6 +98,8 @@ export class ActiveWorkflows {
 			}
 		}
 
+		this.activeWorkflows[workflowId] = { triggerResponses };
+
 		const pollingNodes = workflow.getPollNodes();
 
 		if (pollingNodes.length === 0) return;
@@ -113,6 +115,11 @@ export class ActiveWorkflows {
 					activation,
 				);
 			} catch (e) {
+				// Do not mark this workflow as active if there are no triggerResponses, and any polling activation failed
+				if (triggerResponses.length === 0) {
+					delete this.activeWorkflows[workflowId];
+				}
+
 				const error = e instanceof Error ? e : new Error(`${e}`);
 
 				throw new WorkflowActivationError(
@@ -126,7 +133,7 @@ export class ActiveWorkflows {
 	/**
 	 * Activates polling for the given node
 	 */
-	async activatePolling(
+	private async activatePolling(
 		node: INode,
 		workflow: Workflow,
 		additionalData: IWorkflowExecuteAdditionalData,
@@ -150,7 +157,7 @@ export class ActiveWorkflows {
 			});
 
 			try {
-				const pollResponse = await workflow.runPoll(node, pollFunctions);
+				const pollResponse = await this.triggersAndPollers.runPoll(workflow, node, pollFunctions);
 
 				if (pollResponse !== null) {
 					pollFunctions.__emit(pollResponse);
@@ -218,7 +225,7 @@ export class ActiveWorkflows {
 				Logger.error(
 					`There was a problem calling "closeFunction" on "${e.node.name}" in workflow "${workflowId}"`,
 				);
-				ErrorReporter.error(e, { extra: { workflowId } });
+				this.errorReporter.error(e, { extra: { workflowId } });
 				return;
 			}
 
diff --git a/packages/core/src/Agent/index.ts b/packages/core/src/Agent/index.ts
deleted file mode 100644
index ed842d99eee28..0000000000000
--- a/packages/core/src/Agent/index.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import type {
-	IExecuteFunctions,
-	Workflow,
-	IRunExecutionData,
-	INodeExecutionData,
-	ITaskDataConnections,
-	INode,
-	IWorkflowExecuteAdditionalData,
-	WorkflowExecuteMode,
-	INodeParameters,
-	IExecuteData,
-	IDataObject,
-	Result,
-} from 'n8n-workflow';
-import { createEnvProviderState } from 'n8n-workflow';
-
-export const createAgentStartJob = (
-	additionalData: IWorkflowExecuteAdditionalData,
-	inputData: ITaskDataConnections,
-	node: INode,
-	workflow: Workflow,
-	runExecutionData: IRunExecutionData,
-	runIndex: number,
-	activeNodeName: string,
-	connectionInputData: INodeExecutionData[],
-	siblingParameters: INodeParameters,
-	mode: WorkflowExecuteMode,
-	executeData?: IExecuteData,
-	defaultReturnRunIndex?: number,
-	selfData?: IDataObject,
-	contextNodeName?: string,
-): IExecuteFunctions['startJob'] => {
-	return async function startJob<T = unknown, E = unknown>(
-		this: IExecuteFunctions,
-		jobType: string,
-		settings: unknown,
-		itemIndex: number,
-	): Promise<Result<T, E>> {
-		return await additionalData.startAgentJob<T, E>(
-			additionalData,
-			jobType,
-			settings,
-			this,
-			inputData,
-			node,
-			workflow,
-			runExecutionData,
-			runIndex,
-			itemIndex,
-			activeNodeName,
-			connectionInputData,
-			siblingParameters,
-			mode,
-			createEnvProviderState(),
-			executeData,
-			defaultReturnRunIndex,
-			selfData,
-			contextNodeName,
-		);
-	};
-};
diff --git a/packages/core/src/Constants.ts b/packages/core/src/Constants.ts
index d5fc12bffd983..ceaf77566a0d3 100644
--- a/packages/core/src/Constants.ts
+++ b/packages/core/src/Constants.ts
@@ -1,3 +1,6 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { cronNodeOptions } from 'n8n-workflow';
+
 export const CUSTOM_EXTENSION_ENV = 'N8N_CUSTOM_EXTENSIONS';
 export const PLACEHOLDER_EMPTY_EXECUTION_ID = '__UNKNOWN__';
 export const PLACEHOLDER_EMPTY_WORKFLOW_ID = '__EMPTY__';
@@ -12,3 +15,30 @@ export const CONFIG_FILES = 'N8N_CONFIG_FILES';
 export const BINARY_DATA_STORAGE_PATH = 'N8N_BINARY_DATA_STORAGE_PATH';
 export const UM_EMAIL_TEMPLATES_INVITE = 'N8N_UM_EMAIL_TEMPLATES_INVITE';
 export const UM_EMAIL_TEMPLATES_PWRESET = 'N8N_UM_EMAIL_TEMPLATES_PWRESET';
+
+export const commonPollingParameters: INodeProperties[] = [
+	{
+		displayName: 'Poll Times',
+		name: 'pollTimes',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+			multipleValueButtonText: 'Add Poll Time',
+		},
+		default: { item: [{ mode: 'everyMinute' }] },
+		description: 'Time at which polling should occur',
+		placeholder: 'Add Poll Time',
+		options: cronNodeOptions,
+	},
+];
+
+export const commonCORSParameters: INodeProperties[] = [
+	{
+		displayName: 'Allowed Origins (CORS)',
+		name: 'allowedOrigins',
+		type: 'string',
+		default: '*',
+		description:
+			'Comma-separated list of URLs allowed for cross-origin non-preflight requests. Use * (default) to allow all origins.',
+	},
+];
diff --git a/packages/core/src/CreateNodeAsTool.ts b/packages/core/src/CreateNodeAsTool.ts
index c569f943ce272..da34b377dfc4f 100644
--- a/packages/core/src/CreateNodeAsTool.ts
+++ b/packages/core/src/CreateNodeAsTool.ts
@@ -1,11 +1,6 @@
 import { DynamicStructuredTool } from '@langchain/core/tools';
-import type {
-	IExecuteFunctions,
-	INodeParameters,
-	INodeType,
-	ISupplyDataFunctions,
-} from 'n8n-workflow';
-import { jsonParse, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import type { IDataObject, INode, INodeType } from 'n8n-workflow';
+import { jsonParse, NodeOperationError } from 'n8n-workflow';
 import { z } from 'zod';
 
 type AllowedTypes = 'string' | 'number' | 'boolean' | 'json';
@@ -16,6 +11,15 @@ interface FromAIArgument {
 	defaultValue?: string | number | boolean | Record<string, unknown>;
 }
 
+type ParserOptions = {
+	node: INode;
+	nodeType: INodeType;
+	handleToolInvocation: (toolArgs: IDataObject) => Promise<unknown>;
+};
+
+// This file is temporarily duplicated in `packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/utils/FromAIParser.ts`
+// Please apply any changes in both files
+
 /**
  * AIParametersParser
  *
@@ -23,15 +27,10 @@ interface FromAIArgument {
  * generating Zod schemas, and creating LangChain tools.
  */
 class AIParametersParser {
-	private ctx: ISupplyDataFunctions;
-
 	/**
 	 * Constructs an instance of AIParametersParser.
-	 * @param ctx The execution context.
 	 */
-	constructor(ctx: ISupplyDataFunctions) {
-		this.ctx = ctx;
-	}
+	constructor(private readonly options: ParserOptions) {}
 
 	/**
 	 * Generates a Zod schema based on the provided FromAIArgument placeholder.
@@ -162,14 +161,14 @@ class AIParametersParser {
 				} catch (error) {
 					// If parsing fails, throw an ApplicationError with details
 					throw new NodeOperationError(
-						this.ctx.getNode(),
+						this.options.node,
 						`Failed to parse $fromAI arguments: ${argsString}: ${error}`,
 					);
 				}
 			} else {
 				// Log an error if parentheses are unbalanced
 				throw new NodeOperationError(
-					this.ctx.getNode(),
+					this.options.node,
 					`Unbalanced parentheses while parsing $fromAI call: ${str.slice(startIndex)}`,
 				);
 			}
@@ -254,7 +253,7 @@ class AIParametersParser {
 		const type = cleanArgs?.[2] || 'string';
 
 		if (!['string', 'number', 'boolean', 'json'].includes(type.toLowerCase())) {
-			throw new NodeOperationError(this.ctx.getNode(), `Invalid type: ${type}`);
+			throw new NodeOperationError(this.options.node, `Invalid type: ${type}`);
 		}
 
 		return {
@@ -286,42 +285,21 @@ class AIParametersParser {
 	}
 
 	/**
-	 * Generates a description for a node based on the provided parameters.
-	 * @param node The node type.
-	 * @param nodeParameters The parameters of the node.
-	 * @returns A string description for the node.
-	 */
-	private getDescription(node: INodeType, nodeParameters: INodeParameters): string {
-		const manualDescription = nodeParameters.toolDescription as string;
-
-		if (nodeParameters.descriptionType === 'auto') {
-			const resource = nodeParameters.resource as string;
-			const operation = nodeParameters.operation as string;
-			let description = node.description.description;
-			if (resource) {
-				description += `\n Resource: ${resource}`;
-			}
-			if (operation) {
-				description += `\n Operation: ${operation}`;
-			}
-			return description.trim();
-		}
-		if (nodeParameters.descriptionType === 'manual') {
-			return manualDescription ?? node.description.description;
-		}
-
-		return node.description.description;
-	}
-
-	/**
-	 * Creates a DynamicStructuredTool from a node.
-	 * @param node The node type.
-	 * @param nodeParameters The parameters of the node.
-	 * @returns A DynamicStructuredTool instance.
+	 * Retrieves and validates the Zod schema for the tool.
+	 *
+	 * This method:
+	 * 1. Collects all $fromAI arguments from node parameters
+	 * 2. Validates parameter keys against naming rules
+	 * 3. Checks for duplicate keys and ensures consistency
+	 * 4. Generates a Zod schema from the validated arguments
+	 *
+	 * @throws {NodeOperationError} When parameter keys are invalid or when duplicate keys have inconsistent definitions
+	 * @returns {z.ZodObject} A Zod schema object representing the structure and validation rules for the node parameters
 	 */
-	public createTool(node: INodeType, nodeParameters: INodeParameters): DynamicStructuredTool {
+	private getSchema() {
+		const { node } = this.options;
 		const collectedArguments: FromAIArgument[] = [];
-		this.traverseNodeParameters(nodeParameters, collectedArguments);
+		this.traverseNodeParameters(node.parameters, collectedArguments);
 
 		// Validate each collected argument
 		const nameValidationRegex = /^[a-zA-Z0-9_-]{1,64}$/;
@@ -331,7 +309,7 @@ class AIParametersParser {
 				const isEmptyError = 'You must specify a key when using $fromAI()';
 				const isInvalidError = `Parameter key \`${argument.key}\` is invalid`;
 				const error = new Error(argument.key.length === 0 ? isEmptyError : isInvalidError);
-				throw new NodeOperationError(this.ctx.getNode(), error, {
+				throw new NodeOperationError(node, error, {
 					description:
 						'Invalid parameter key, must be between 1 and 64 characters long and only contain letters, numbers, underscores, and hyphens',
 				});
@@ -348,7 +326,7 @@ class AIParametersParser {
 				) {
 					// If not, throw an error for inconsistent duplicate keys
 					throw new NodeOperationError(
-						this.ctx.getNode(),
+						node,
 						`Duplicate key '${argument.key}' found with different description or type`,
 						{
 							description:
@@ -377,43 +355,56 @@ class AIParametersParser {
 			return acc;
 		}, {});
 
-		const schema = z.object(schemaObj).required();
-		const description = this.getDescription(node, nodeParameters);
-		const nodeName = this.ctx.getNode().name.replace(/ /g, '_');
-		const name = nodeName || node.description.name;
+		return z.object(schemaObj).required();
+	}
 
-		const tool = new DynamicStructuredTool({
+	/**
+	 * Generates a description for a node based on the provided parameters.
+	 * @param node The node type.
+	 * @param nodeParameters The parameters of the node.
+	 * @returns A string description for the node.
+	 */
+	private getDescription(): string {
+		const { node, nodeType } = this.options;
+		const manualDescription = node.parameters.toolDescription as string;
+
+		if (node.parameters.descriptionType === 'auto') {
+			const resource = node.parameters.resource as string;
+			const operation = node.parameters.operation as string;
+			let description = nodeType.description.description;
+			if (resource) {
+				description += `\n Resource: ${resource}`;
+			}
+			if (operation) {
+				description += `\n Operation: ${operation}`;
+			}
+			return description.trim();
+		}
+		if (node.parameters.descriptionType === 'manual') {
+			return manualDescription ?? nodeType.description.description;
+		}
+
+		return nodeType.description.description;
+	}
+
+	/**
+	 * Creates a DynamicStructuredTool from a node.
+	 * @returns A DynamicStructuredTool instance.
+	 */
+	createTool(): DynamicStructuredTool {
+		const { node, nodeType } = this.options;
+		const schema = this.getSchema();
+		const description = this.getDescription();
+		const nodeName = node.name.replace(/ /g, '_');
+		const name = nodeName || nodeType.description.name;
+
+		return new DynamicStructuredTool({
 			name,
 			description,
 			schema,
-			func: async (functionArgs: z.infer<typeof schema>) => {
-				const { index } = this.ctx.addInputData(NodeConnectionType.AiTool, [
-					[{ json: functionArgs }],
-				]);
-
-				try {
-					// Execute the node with the proxied context
-					const result = await node.execute?.bind(this.ctx as IExecuteFunctions)();
-
-					// Process and map the results
-					const mappedResults = result?.[0]?.flatMap((item) => item.json);
-
-					// Add output data to the context
-					this.ctx.addOutputData(NodeConnectionType.AiTool, index, [
-						[{ json: { response: mappedResults } }],
-					]);
-
-					// Return the stringified results
-					return JSON.stringify(mappedResults);
-				} catch (error) {
-					const nodeError = new NodeOperationError(this.ctx.getNode(), error as Error);
-					this.ctx.addOutputData(NodeConnectionType.AiTool, index, nodeError);
-					return 'Error during node execution: ' + nodeError.description;
-				}
-			},
+			func: async (toolArgs: z.infer<typeof schema>) =>
+				await this.options.handleToolInvocation(toolArgs),
 		});
-
-		return tool;
 	}
 }
 
@@ -421,20 +412,8 @@ class AIParametersParser {
  * Converts node into LangChain tool by analyzing node parameters,
  * identifying placeholders using the $fromAI function, and generating a Zod schema. It then creates
  * a DynamicStructuredTool that can be used in LangChain workflows.
- *
- * @param ctx The execution context.
- * @param node The node type.
- * @param nodeParameters The parameters of the node.
- * @returns An object containing the DynamicStructuredTool instance.
  */
-export function createNodeAsTool(
-	ctx: ISupplyDataFunctions,
-	node: INodeType,
-	nodeParameters: INodeParameters,
-) {
-	const parser = new AIParametersParser(ctx);
-
-	return {
-		response: parser.createTool(node, nodeParameters),
-	};
+export function createNodeAsTool(options: ParserOptions) {
+	const parser = new AIParametersParser(options);
+	return { response: parser.createTool() };
 }
diff --git a/packages/core/src/DirectoryLoader.ts b/packages/core/src/DirectoryLoader.ts
index b0e77125a7cc3..cd223da2ddf6f 100644
--- a/packages/core/src/DirectoryLoader.ts
+++ b/packages/core/src/DirectoryLoader.ts
@@ -1,9 +1,12 @@
 import glob from 'fast-glob';
+import uniqBy from 'lodash/uniqBy';
 import type {
 	CodexData,
 	DocumentationLink,
 	ICredentialType,
 	ICredentialTypeData,
+	INodeCredentialDescription,
+	INodePropertyOptions,
 	INodeType,
 	INodeTypeBaseDescription,
 	INodeTypeData,
@@ -15,8 +18,7 @@ import type {
 import {
 	ApplicationError,
 	LoggerProxy as Logger,
-	getCredentialsForNode,
-	getVersionedNodeTypeAll,
+	applyDeclarativeNodeOptionParameters,
 	jsonParse,
 } from 'n8n-workflow';
 import { readFileSync } from 'node:fs';
@@ -24,7 +26,9 @@ import { readFile } from 'node:fs/promises';
 import * as path from 'path';
 
 import { loadClassInIsolation } from './ClassLoader';
-import { CUSTOM_NODES_CATEGORY } from './Constants';
+import { commonCORSParameters, commonPollingParameters, CUSTOM_NODES_CATEGORY } from './Constants';
+import { UnrecognizedCredentialTypeError } from './errors/unrecognized-credential-type.error';
+import { UnrecognizedNodeTypeError } from './errors/unrecognized-node-type.error';
 import type { n8n } from './Interfaces';
 
 function toJSON(this: ICredentialType) {
@@ -34,11 +38,25 @@ function toJSON(this: ICredentialType) {
 	};
 }
 
+type Codex = {
+	categories: string[];
+	subcategories: { [subcategory: string]: string[] };
+	resources: {
+		primaryDocumentation: DocumentationLink[];
+		credentialDocumentation: DocumentationLink[];
+	};
+	alias: string[];
+};
+
 export type Types = {
 	nodes: INodeTypeBaseDescription[];
 	credentials: ICredentialType[];
 };
 
+/**
+ * Base class for loading n8n nodes and credentials from a directory.
+ * Handles the common functionality for resolving paths, loading classes, and managing node and credential types.
+ */
 export abstract class DirectoryLoader {
 	isLazyLoaded = false;
 
@@ -58,7 +76,7 @@ export abstract class DirectoryLoader {
 	// Stores the different versions with their individual descriptions
 	types: Types = { nodes: [], credentials: [] };
 
-	protected nodesByCredential: Record<string, string[]> = {};
+	readonly nodesByCredential: Record<string, string[]> = {};
 
 	constructor(
 		readonly directory: string,
@@ -82,35 +100,40 @@ export abstract class DirectoryLoader {
 		return path.resolve(this.directory, file);
 	}
 
-	protected loadNodeFromFile(nodeName: string, filePath: string) {
-		let tempNode: INodeType | IVersionedNodeType;
-		let nodeVersion = 1;
-		const isCustom = this.packageName === 'CUSTOM';
-
+	private loadClass<T>(sourcePath: string) {
+		const filePath = this.resolvePath(sourcePath);
+		const [className] = path.parse(sourcePath).name.split('.');
 		try {
-			tempNode = loadClassInIsolation(filePath, nodeName);
-			this.addCodex({ node: tempNode, filePath, isCustom });
+			return loadClassInIsolation<T>(filePath, className);
 		} catch (error) {
-			Logger.error(
-				`Error loading node "${nodeName}" from: "${filePath}" - ${(error as Error).message}`,
-			);
-			throw error;
+			throw error instanceof TypeError
+				? new ApplicationError(
+						'Class could not be found. Please check if the class is named correctly.',
+						{ extra: { className } },
+					)
+				: error;
 		}
+	}
+
+	/** Loads a nodes class from a file, fixes icons, and augments the codex */
+	loadNodeFromFile(filePath: string) {
+		const tempNode = this.loadClass<INodeType | IVersionedNodeType>(filePath);
+		this.addCodex(tempNode, filePath);
 
-		const fullNodeName = `${this.packageName}.${tempNode.description.name}`;
+		const nodeType = tempNode.description.name;
+		const fullNodeType = `${this.packageName}.${nodeType}`;
 
-		if (this.includeNodes.length && !this.includeNodes.includes(fullNodeName)) {
+		if (this.includeNodes.length && !this.includeNodes.includes(fullNodeType)) {
 			return;
 		}
 
-		if (this.excludeNodes.includes(fullNodeName)) {
+		if (this.excludeNodes.includes(fullNodeType)) {
 			return;
 		}
 
-		tempNode.description.name = fullNodeName;
-
 		this.fixIconPaths(tempNode.description, filePath);
 
+		let nodeVersion = 1;
 		if ('nodeVersions' in tempNode) {
 			for (const versionNode of Object.values(tempNode.nodeVersions)) {
 				this.fixIconPaths(versionNode.description, filePath);
@@ -118,85 +141,93 @@ export abstract class DirectoryLoader {
 
 			for (const version of Object.values(tempNode.nodeVersions)) {
 				this.addLoadOptionsMethods(version);
+				this.applySpecialNodeParameters(version);
 			}
 
 			const currentVersionNode = tempNode.nodeVersions[tempNode.currentVersion];
-			this.addCodex({ node: currentVersionNode, filePath, isCustom });
+			this.addCodex(currentVersionNode, filePath);
 			nodeVersion = tempNode.currentVersion;
 
 			if (currentVersionNode.hasOwnProperty('executeSingle')) {
 				throw new ApplicationError(
 					'"executeSingle" has been removed. Please update the code of this node to use "execute" instead.',
-					{ extra: { nodeName: `${this.packageName}.${nodeName}` } },
+					{ extra: { nodeType: fullNodeType } },
 				);
 			}
 		} else {
 			this.addLoadOptionsMethods(tempNode);
-			// Short renaming to avoid type issues
+			this.applySpecialNodeParameters(tempNode);
 
+			// Short renaming to avoid type issues
 			nodeVersion = Array.isArray(tempNode.description.version)
 				? tempNode.description.version.slice(-1)[0]
 				: tempNode.description.version;
 		}
 
-		this.known.nodes[fullNodeName] = {
-			className: nodeName,
+		this.known.nodes[nodeType] = {
+			className: tempNode.constructor.name,
 			sourcePath: filePath,
 		};
 
-		this.nodeTypes[fullNodeName] = {
+		this.nodeTypes[nodeType] = {
 			type: tempNode,
 			sourcePath: filePath,
 		};
 
 		this.loadedNodes.push({
-			name: fullNodeName,
+			name: nodeType,
 			version: nodeVersion,
 		});
 
-		getVersionedNodeTypeAll(tempNode).forEach(({ description }) => {
+		this.getVersionedNodeTypeAll(tempNode).forEach(({ description }) => {
 			this.types.nodes.push(description);
 		});
 
-		for (const credential of getCredentialsForNode(tempNode)) {
+		for (const credential of this.getCredentialsForNode(tempNode)) {
 			if (!this.nodesByCredential[credential.name]) {
 				this.nodesByCredential[credential.name] = [];
 			}
-			this.nodesByCredential[credential.name].push(fullNodeName);
+			this.nodesByCredential[credential.name].push(nodeType);
 		}
 	}
 
-	protected loadCredentialFromFile(credentialClassName: string, filePath: string): void {
-		let tempCredential: ICredentialType;
-		try {
-			tempCredential = loadClassInIsolation(filePath, credentialClassName);
-
-			// Add serializer method "toJSON" to the class so that authenticate method (if defined)
-			// gets mapped to the authenticate attribute before it is sent to the client.
-			// The authenticate property is used by the client to decide whether or not to
-			// include the credential type in the predefined credentials (HTTP node)
-			Object.assign(tempCredential, { toJSON });
+	getNode(nodeType: string) {
+		const {
+			nodeTypes,
+			known: { nodes: knownNodes },
+		} = this;
+		if (!(nodeType in nodeTypes) && nodeType in knownNodes) {
+			const { sourcePath } = knownNodes[nodeType];
+			this.loadNodeFromFile(sourcePath);
+		}
 
-			this.fixIconPaths(tempCredential, filePath);
-		} catch (e) {
-			if (e instanceof TypeError) {
-				throw new ApplicationError(
-					'Class could not be found. Please check if the class is named correctly.',
-					{ extra: { credentialClassName } },
-				);
-			} else {
-				throw e;
-			}
+		if (nodeType in nodeTypes) {
+			return nodeTypes[nodeType];
 		}
 
-		this.known.credentials[tempCredential.name] = {
-			className: credentialClassName,
+		throw new UnrecognizedNodeTypeError(this.packageName, nodeType);
+	}
+
+	/** Loads a credential class from a file, and fixes icons */
+	loadCredentialFromFile(filePath: string): void {
+		const tempCredential = this.loadClass<ICredentialType>(filePath);
+		// Add serializer method "toJSON" to the class so that authenticate method (if defined)
+		// gets mapped to the authenticate attribute before it is sent to the client.
+		// The authenticate property is used by the client to decide whether or not to
+		// include the credential type in the predefined credentials (HTTP node)
+		Object.assign(tempCredential, { toJSON });
+
+		this.fixIconPaths(tempCredential, filePath);
+
+		const credentialType = tempCredential.name;
+		this.known.credentials[credentialType] = {
+			className: tempCredential.constructor.name,
 			sourcePath: filePath,
 			extends: tempCredential.extends,
-			supportedNodes: this.nodesByCredential[tempCredential.name],
+			supportedNodes: this.nodesByCredential[credentialType],
 		};
 
-		this.credentialTypes[tempCredential.name] = {
+		this.credentialTypes[credentialType] = {
 			type: tempCredential,
 			sourcePath: filePath,
 		};
@@ -204,40 +235,79 @@ export abstract class DirectoryLoader {
 		this.types.credentials.push(tempCredential);
 	}
 
+	getCredential(credentialType: string) {
+		const {
+			credentialTypes,
+			known: { credentials: knownCredentials },
+		} = this;
+		if (!(credentialType in credentialTypes) && credentialType in knownCredentials) {
+			const { sourcePath } = knownCredentials[credentialType];
+			this.loadCredentialFromFile(sourcePath);
+		}
+
+		if (credentialType in credentialTypes) {
+			return credentialTypes[credentialType];
+		}
+
+		throw new UnrecognizedCredentialTypeError(credentialType);
+	}
+
+	/**
+	 * Returns an array of credential descriptions that are supported by a node.
+	 * For versioned nodes, combines and deduplicates credentials from all versions.
+	 */
+	getCredentialsForNode(object: IVersionedNodeType | INodeType): INodeCredentialDescription[] {
+		if ('nodeVersions' in object) {
+			const credentials = Object.values(object.nodeVersions).flatMap(
+				({ description }) => description.credentials ?? [],
+			);
+			return uniqBy(credentials, 'name');
+		}
+		return object.description.credentials ?? [];
+	}
+
+	/**
+	 * Returns an array of all versions of a node type.
+	 * For non-versioned nodes, returns an array with just that node.
+	 * For versioned nodes, returns all available versions.
+	 */
+	getVersionedNodeTypeAll(object: IVersionedNodeType | INodeType): INodeType[] {
+		if ('nodeVersions' in object) {
+			const nodeVersions = Object.values(object.nodeVersions).map((element) => {
+				element.description.name = object.description.name;
+				element.description.codex = object.description.codex;
+				return element;
+			});
+			return uniqBy(nodeVersions.reverse(), (node) => {
+				const { version } = node.description;
+				return Array.isArray(version) ? version.join(',') : version.toString();
+			});
+		}
+		return [object];
+	}
+
 	/**
 	 * Retrieves `categories`, `subcategories` and alias (if defined)
 	 * from the codex data for the node at the given file path.
 	 */
 	private getCodex(filePath: string): CodexData {
-		type Codex = {
-			categories: string[];
-			subcategories: { [subcategory: string]: string[] };
-			resources: {
-				primaryDocumentation: DocumentationLink[];
-				credentialDocumentation: DocumentationLink[];
-			};
-			alias: string[];
-		};
-
-		const codexFilePath = `${filePath}on`; // .js to .json
+		const codexFilePath = this.resolvePath(`${filePath}on`); // .js to .json
 
 		const {
 			categories,
 			subcategories,
-			resources: allResources,
+			resources: { primaryDocumentation, credentialDocumentation },
 			alias,
 		} = module.require(codexFilePath) as Codex;
 
-		const resources = {
-			primaryDocumentation: allResources.primaryDocumentation,
-			credentialDocumentation: allResources.credentialDocumentation,
-		};
-
 		return {
 			...(categories && { categories }),
 			...(subcategories && { subcategories }),
-			...(resources && { resources }),
 			...(alias && { alias }),
+			resources: {
+				primaryDocumentation,
+				credentialDocumentation,
+			},
 		};
 	}
 
@@ -245,15 +315,8 @@ export abstract class DirectoryLoader {
 	 * Adds a node codex `categories` and `subcategories` (if defined)
 	 * to a node description `codex` property.
 	 */
-	private addCodex({
-		node,
-		filePath,
-		isCustom,
-	}: {
-		node: INodeType | IVersionedNodeType;
-		filePath: string;
-		isCustom: boolean;
-	}) {
+	private addCodex(node: INodeType | IVersionedNodeType, filePath: string) {
+		const isCustom = this.packageName === 'CUSTOM';
 		try {
 			let codex;
 
@@ -273,7 +336,7 @@ export abstract class DirectoryLoader {
 
 			node.description.codex = codex;
 		} catch {
-			Logger.debug(`No codex available for: ${filePath.split('/').pop() ?? ''}`);
+			Logger.debug(`No codex available for: ${node.description.name}`);
 
 			if (isCustom) {
 				node.description.codex = {
@@ -289,10 +352,27 @@ export abstract class DirectoryLoader {
 		}
 	}
 
+	private applySpecialNodeParameters(nodeType: INodeType): void {
+		const { properties, polling, supportsCORS } = nodeType.description;
+		if (polling) {
+			properties.unshift(...commonPollingParameters);
+		}
+		if (nodeType.webhook && supportsCORS) {
+			const optionsProperty = properties.find(({ name }) => name === 'options');
+			if (optionsProperty)
+				optionsProperty.options = [
+					...commonCORSParameters,
+					...(optionsProperty.options as INodePropertyOptions[]),
+				];
+			else properties.push(...commonCORSParameters);
+		}
+
+		applyDeclarativeNodeOptionParameters(nodeType);
+	}
+
 	private getIconPath(icon: string, filePath: string) {
 		const iconPath = path.join(path.dirname(filePath), icon.replace('file:', ''));
-		const relativePath = path.relative(this.directory, iconPath);
-		return `icons/${this.packageName}/${relativePath}`;
+		return `icons/${this.packageName}/${iconPath}`;
 	}
 
 	private fixIconPaths(
@@ -305,14 +385,14 @@ export abstract class DirectoryLoader {
 		if (typeof icon === 'string') {
 			if (icon.startsWith('file:')) {
 				obj.iconUrl = this.getIconPath(icon, filePath);
-				delete obj.icon;
+				obj.icon = undefined;
 			}
 		} else if (icon.light.startsWith('file:') && icon.dark.startsWith('file:')) {
 			obj.iconUrl = {
 				light: this.getIconPath(icon.light, filePath),
 				dark: this.getIconPath(icon.dark, filePath),
 			};
-			delete obj.icon;
+			obj.icon = undefined;
 		}
 	}
 }
@@ -331,8 +411,7 @@ export class CustomDirectoryLoader extends DirectoryLoader {
 		});
 
 		for (const nodePath of nodes) {
-			const [fileName] = path.parse(nodePath).name.split('.');
-			this.loadNodeFromFile(fileName, nodePath);
+			this.loadNodeFromFile(nodePath);
 		}
 
 		const credentials = await glob('**/*.credentials.js', {
@@ -341,8 +420,7 @@ export class CustomDirectoryLoader extends DirectoryLoader {
 		});
 
 		for (const credentialPath of credentials) {
-			const [fileName] = path.parse(credentialPath).name.split('.');
-			this.loadCredentialFromFile(fileName, credentialPath);
+			this.loadCredentialFromFile(credentialPath);
 		}
 	}
 }
@@ -363,33 +441,55 @@ export class PackageDirectoryLoader extends DirectoryLoader {
 		const { nodes, credentials } = n8n;
 
 		if (Array.isArray(nodes)) {
-			for (const node of nodes) {
-				const filePath = this.resolvePath(node);
-				const [nodeName] = path.parse(node).name.split('.');
-
-				this.loadNodeFromFile(nodeName, filePath);
+			for (const nodePath of nodes) {
+				this.loadNodeFromFile(nodePath);
 			}
 		}
 
 		if (Array.isArray(credentials)) {
-			for (const credential of credentials) {
-				const filePath = this.resolvePath(credential);
-				const [credentialName] = path.parse(credential).name.split('.');
-
-				this.loadCredentialFromFile(credentialName, filePath);
+			for (const credentialPath of credentials) {
+				this.loadCredentialFromFile(credentialPath);
 			}
 		}
 
+		this.inferSupportedNodes();
+
 		Logger.debug(`Loaded all credentials and nodes from ${this.packageName}`, {
 			credentials: credentials?.length ?? 0,
 			nodes: nodes?.length ?? 0,
 		});
 	}
 
-	protected readJSONSync<T>(file: string): T {
-		const filePath = this.resolvePath(file);
-		const fileString = readFileSync(filePath, 'utf8');
+	private inferSupportedNodes() {
+		const knownCredentials = this.known.credentials;
+		for (const { type: credentialType } of Object.values(this.credentialTypes)) {
+			const supportedNodes = knownCredentials[credentialType.name].supportedNodes ?? [];
+			if (supportedNodes.length > 0 && credentialType.httpRequestNode) {
+				credentialType.httpRequestNode.hidden = true;
+			}
 
+			credentialType.supportedNodes = supportedNodes;
+
+			if (!credentialType.iconUrl && !credentialType.icon) {
+				for (const supportedNode of supportedNodes) {
+					const nodeDescription = this.nodeTypes[supportedNode]?.type.description;
+
+					if (!nodeDescription) continue;
+					if (nodeDescription.icon) {
+						credentialType.icon = nodeDescription.icon;
+						credentialType.iconColor = nodeDescription.iconColor;
+						break;
+					}
+					if (nodeDescription.iconUrl) {
+						credentialType.iconUrl = nodeDescription.iconUrl;
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	private parseJSON<T>(fileString: string, filePath: string): T {
 		try {
 			return jsonParse<T>(fileString);
 		} catch (error) {
@@ -397,15 +497,16 @@ export class PackageDirectoryLoader extends DirectoryLoader {
 		}
 	}
 
+	protected readJSONSync<T>(file: string): T {
+		const filePath = this.resolvePath(file);
+		const fileString = readFileSync(filePath, 'utf8');
+		return this.parseJSON<T>(fileString, filePath);
+	}
+
 	protected async readJSON<T>(file: string): Promise<T> {
 		const filePath = this.resolvePath(file);
 		const fileString = await readFile(filePath, 'utf8');
-
-		try {
-			return jsonParse<T>(fileString);
-		} catch (error) {
-			throw new ApplicationError('Failed to parse JSON', { extra: { filePath } });
-		}
+		return this.parseJSON<T>(fileString, filePath);
 	}
 }
 
@@ -415,10 +516,7 @@ export class PackageDirectoryLoader extends DirectoryLoader {
 export class LazyPackageDirectoryLoader extends PackageDirectoryLoader {
 	override async loadAll() {
 		try {
-			const knownNodes: typeof this.known.nodes = await this.readJSON('dist/known/nodes.json');
-			for (const nodeName in knownNodes) {
-				this.known.nodes[`${this.packageName}.${nodeName}`] = knownNodes[nodeName];
-			}
+			this.known.nodes = await this.readJSON('dist/known/nodes.json');
 			this.known.credentials = await this.readJSON('dist/known/credentials.json');
 
 			this.types.nodes = await this.readJSON('dist/types/nodes.json');
@@ -426,9 +524,10 @@ export class LazyPackageDirectoryLoader extends PackageDirectoryLoader {
 
 			if (this.includeNodes.length) {
 				const allowedNodes: typeof this.known.nodes = {};
-				for (const nodeName of this.includeNodes) {
-					if (nodeName in this.known.nodes) {
-						allowedNodes[nodeName] = this.known.nodes[nodeName];
+				for (const fullNodeType of this.includeNodes) {
+					const [packageName, nodeType] = fullNodeType.split('.');
+					if (packageName === this.packageName && nodeType in this.known.nodes) {
+						allowedNodes[nodeType] = this.known.nodes[nodeType];
 					}
 				}
 				this.known.nodes = allowedNodes;
@@ -439,8 +538,11 @@ export class LazyPackageDirectoryLoader extends PackageDirectoryLoader {
 			}
 
 			if (this.excludeNodes.length) {
-				for (const nodeName of this.excludeNodes) {
-					delete this.known.nodes[nodeName];
+				for (const fullNodeType of this.excludeNodes) {
+					const [packageName, nodeType] = fullNodeType.split('.');
+					if (packageName === this.packageName) {
+						delete this.known.nodes[nodeType];
+					}
 				}
 
 				this.types.nodes = this.types.nodes.filter(
diff --git a/packages/core/src/InstanceSettings.ts b/packages/core/src/InstanceSettings.ts
index 7d38f21184187..f611e034b337f 100644
--- a/packages/core/src/InstanceSettings.ts
+++ b/packages/core/src/InstanceSettings.ts
@@ -1,10 +1,11 @@
 import { createHash, randomBytes } from 'crypto';
-import { chmodSync, existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from 'fs';
 import { ApplicationError, jsonParse, ALPHABET, toResult } from 'n8n-workflow';
 import { customAlphabet } from 'nanoid';
+import { chmodSync, existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from 'node:fs';
 import path from 'path';
 import { Service } from 'typedi';
 
+import { Memoized } from './decorators';
 import { InstanceSettingsConfig } from './InstanceSettingsConfig';
 
 const nanoid = customAlphabet(ALPHABET, 16);
@@ -86,6 +87,29 @@ export class InstanceSettings {
 	 */
 	readonly hostId: string;
 
+	private isMultiMainEnabled = false;
+
+	private isMultiMainLicensed = false;
+
+	/** Set whether multi-main mode is enabled. Does not imply licensed status. */
+	setMultiMainEnabled(newState: boolean) {
+		this.isMultiMainEnabled = newState;
+	}
+
+	setMultiMainLicensed(newState: boolean) {
+		this.isMultiMainLicensed = newState;
+	}
+
+	/** Whether this `main` instance is running in multi-main mode. */
+	get isMultiMain() {
+		return this.instanceType === 'main' && this.isMultiMainEnabled && this.isMultiMainLicensed;
+	}
+
+	/** Whether this `main` instance is running in single-main mode. */
+	get isSingleMain() {
+		return !this.isMultiMain;
+	}
+
 	get isLeader() {
 		return this.instanceRole === 'leader';
 	}
@@ -110,6 +134,22 @@ export class InstanceSettings {
 		return this.settings.tunnelSubdomain;
 	}
 
+	/**
+	 * Whether this instance is running inside a Docker container.
+	 *
+	 * Based on: https://github.com/sindresorhus/is-docker
+	 */
+	@Memoized
+	get isDocker() {
+		try {
+			return (
+				existsSync('/.dockerenv') || readFileSync('/proc/self/cgroup', 'utf8').includes('docker')
+			);
+		} catch {
+			return false;
+		}
+	}
+
 	update(newSettings: WritableSettings) {
 		this.save({ ...this.settings, ...newSettings });
 	}
diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts
index 4400609fd8cb2..20d5ae0833f04 100644
--- a/packages/core/src/NodeExecuteFunctions.ts
+++ b/packages/core/src/NodeExecuteFunctions.ts
@@ -15,6 +15,7 @@ import type {
 import { ClientOAuth2 } from '@n8n/client-oauth2';
 import type { AxiosError, AxiosHeaders, AxiosRequestConfig, AxiosResponse } from 'axios';
 import axios from 'axios';
+import chardet from 'chardet';
 import crypto, { createHmac } from 'crypto';
 import FileType from 'file-type';
 import FormData from 'form-data';
@@ -30,7 +31,6 @@ import pick from 'lodash/pick';
 import { extension, lookup } from 'mime-types';
 import type {
 	BinaryHelperFunctions,
-	CloseFunction,
 	FileSystemHelperFunctions,
 	GenericValue,
 	IAdditionalCredentialOptions,
@@ -41,26 +41,19 @@ import type {
 	IDataObject,
 	IExecuteData,
 	IExecuteFunctions,
-	IExecuteSingleFunctions,
-	IHookFunctions,
 	IHttpRequestOptions,
 	IN8nHttpFullResponse,
 	IN8nHttpResponse,
 	INode,
 	INodeExecutionData,
-	INodeInputConfiguration,
 	IOAuth2Options,
 	IPairedItemData,
 	IPollFunctions,
 	IRequestOptions,
 	IRunExecutionData,
-	ITaskData,
 	ITaskDataConnections,
-	ITaskMetadata,
 	ITriggerFunctions,
-	IWebhookData,
 	IWebhookDescription,
-	IWebhookFunctions,
 	IWorkflowDataProxyAdditionalKeys,
 	IWorkflowExecuteAdditionalData,
 	NodeExecutionWithMetadata,
@@ -79,12 +72,10 @@ import type {
 	DeduplicationScope,
 	DeduplicationItemTypes,
 	ICheckProcessedContextData,
-	ISupplyDataFunctions,
 	WebhookType,
 	SchedulingFunctions,
 } from 'n8n-workflow';
 import {
-	NodeConnectionType,
 	LoggerProxy as Logger,
 	NodeApiError,
 	NodeHelpers,
@@ -118,20 +109,11 @@ import {
 	UM_EMAIL_TEMPLATES_INVITE,
 	UM_EMAIL_TEMPLATES_PWRESET,
 } from './Constants';
-import { createNodeAsTool } from './CreateNodeAsTool';
 import { DataDeduplicationService } from './data-deduplication-service';
 import { InstanceSettings } from './InstanceSettings';
 import type { IResponseError } from './Interfaces';
 // eslint-disable-next-line import/no-cycle
-import {
-	ExecuteContext,
-	ExecuteSingleContext,
-	HookContext,
-	PollContext,
-	SupplyDataContext,
-	TriggerContext,
-	WebhookContext,
-} from './node-execution-context';
+import { PollContext, TriggerContext } from './node-execution-context';
 import { ScheduledTaskManager } from './ScheduledTaskManager';
 import { SSHClientsManager } from './SSHClientsManager';
 
@@ -1063,6 +1045,10 @@ export async function getBinaryDataBuffer(
 	return await Container.get(BinaryDataService).getAsBuffer(binaryData);
 }
 
+export function detectBinaryEncoding(buffer: Buffer): string {
+	return chardet.detect(buffer) as string;
+}
+
 /**
  * Store an incoming IBinaryData & related buffer using the configured binary data manager.
  *
@@ -2021,265 +2007,6 @@ export function getWebhookDescription(
 	return undefined;
 }
 
-// TODO: Change options to an object
-export const addExecutionDataFunctions = async (
-	type: 'input' | 'output',
-	nodeName: string,
-	data: INodeExecutionData[][] | ExecutionBaseError,
-	runExecutionData: IRunExecutionData,
-	connectionType: NodeConnectionType,
-	additionalData: IWorkflowExecuteAdditionalData,
-	sourceNodeName: string,
-	sourceNodeRunIndex: number,
-	currentNodeRunIndex: number,
-	metadata?: ITaskMetadata,
-): Promise<void> => {
-	if (connectionType === NodeConnectionType.Main) {
-		throw new ApplicationError('Setting type is not supported for main connection', {
-			extra: { type },
-		});
-	}
-
-	let taskData: ITaskData | undefined;
-	if (type === 'input') {
-		taskData = {
-			startTime: new Date().getTime(),
-			executionTime: 0,
-			executionStatus: 'running',
-			source: [null],
-		};
-	} else {
-		// At the moment we expect that there is always an input sent before the output
-		taskData = get(
-			runExecutionData,
-			['resultData', 'runData', nodeName, currentNodeRunIndex],
-			undefined,
-		);
-		if (taskData === undefined) {
-			return;
-		}
-		taskData.metadata = metadata;
-	}
-	taskData = taskData!;
-
-	if (data instanceof Error) {
-		taskData.executionStatus = 'error';
-		taskData.error = data;
-	} else {
-		if (type === 'output') {
-			taskData.executionStatus = 'success';
-		}
-		taskData.data = {
-			[connectionType]: data,
-		} as ITaskDataConnections;
-	}
-
-	if (type === 'input') {
-		if (!(data instanceof Error)) {
-			taskData.inputOverride = {
-				[connectionType]: data,
-			} as ITaskDataConnections;
-		}
-
-		if (!runExecutionData.resultData.runData.hasOwnProperty(nodeName)) {
-			runExecutionData.resultData.runData[nodeName] = [];
-		}
-
-		runExecutionData.resultData.runData[nodeName][currentNodeRunIndex] = taskData;
-		if (additionalData.sendDataToUI) {
-			additionalData.sendDataToUI('nodeExecuteBefore', {
-				executionId: additionalData.executionId,
-				nodeName,
-			});
-		}
-	} else {
-		// Outputs
-		taskData.executionTime = new Date().getTime() - taskData.startTime;
-
-		if (additionalData.sendDataToUI) {
-			additionalData.sendDataToUI('nodeExecuteAfter', {
-				executionId: additionalData.executionId,
-				nodeName,
-				data: taskData,
-			});
-		}
-
-		if (get(runExecutionData, 'executionData.metadata', undefined) === undefined) {
-			runExecutionData.executionData!.metadata = {};
-		}
-
-		let sourceTaskData = get(runExecutionData, ['executionData', 'metadata', sourceNodeName]);
-
-		if (!sourceTaskData) {
-			runExecutionData.executionData!.metadata[sourceNodeName] = [];
-			sourceTaskData = runExecutionData.executionData!.metadata[sourceNodeName];
-		}
-
-		if (!sourceTaskData[sourceNodeRunIndex]) {
-			sourceTaskData[sourceNodeRunIndex] = {
-				subRun: [],
-			};
-		}
-
-		sourceTaskData[sourceNodeRunIndex]!.subRun!.push({
-			node: nodeName,
-			runIndex: currentNodeRunIndex,
-		});
-	}
-};
-
-export async function getInputConnectionData(
-	this: IAllExecuteFunctions,
-	workflow: Workflow,
-	runExecutionData: IRunExecutionData,
-	runIndex: number,
-	connectionInputData: INodeExecutionData[],
-	inputData: ITaskDataConnections,
-	additionalData: IWorkflowExecuteAdditionalData,
-	executeData: IExecuteData,
-	mode: WorkflowExecuteMode,
-	closeFunctions: CloseFunction[],
-	inputName: NodeConnectionType,
-	itemIndex: number,
-	abortSignal?: AbortSignal,
-): Promise<unknown> {
-	const node = this.getNode();
-	const nodeType = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
-
-	const inputs = NodeHelpers.getNodeInputs(workflow, node, nodeType.description);
-
-	let inputConfiguration = inputs.find((input) => {
-		if (typeof input === 'string') {
-			return input === inputName;
-		}
-		return input.type === inputName;
-	});
-
-	if (inputConfiguration === undefined) {
-		throw new ApplicationError('Node does not have input of type', {
-			extra: { nodeName: node.name, inputName },
-		});
-	}
-
-	if (typeof inputConfiguration === 'string') {
-		inputConfiguration = {
-			type: inputConfiguration,
-		} as INodeInputConfiguration;
-	}
-
-	const parentNodes = workflow.getParentNodes(node.name, inputName, 1);
-	if (parentNodes.length === 0) {
-		if (inputConfiguration.required) {
-			throw new NodeOperationError(
-				node,
-				`A ${inputConfiguration?.displayName ?? inputName} sub-node must be connected`,
-			);
-		}
-		return inputConfiguration.maxConnections === 1 ? undefined : [];
-	}
-
-	const constParentNodes = parentNodes
-		.map((nodeName) => {
-			return workflow.getNode(nodeName) as INode;
-		})
-		.filter((connectedNode) => connectedNode.disabled !== true)
-		.map(async (connectedNode) => {
-			const nodeType = workflow.nodeTypes.getByNameAndVersion(
-				connectedNode.type,
-				connectedNode.typeVersion,
-			);
-			const context = new SupplyDataContext(
-				workflow,
-				connectedNode,
-				additionalData,
-				mode,
-				runExecutionData,
-				runIndex,
-				connectionInputData,
-				inputData,
-				executeData,
-				closeFunctions,
-				abortSignal,
-			);
-
-			if (!nodeType.supplyData) {
-				if (nodeType.description.outputs.includes(NodeConnectionType.AiTool)) {
-					nodeType.supplyData = async function (this: ISupplyDataFunctions) {
-						return createNodeAsTool(this, nodeType, this.getNode().parameters);
-					};
-				} else {
-					throw new ApplicationError('Node does not have a `supplyData` method defined', {
-						extra: { nodeName: connectedNode.name },
-					});
-				}
-			}
-
-			try {
-				const response = await nodeType.supplyData.call(context, itemIndex);
-				if (response.closeFunction) {
-					closeFunctions.push(response.closeFunction);
-				}
-				return response;
-			} catch (error) {
-				// Propagate errors from sub-nodes
-				if (error.functionality === 'configuration-node') throw error;
-				if (!(error instanceof ExecutionBaseError)) {
-					error = new NodeOperationError(connectedNode, error, {
-						itemIndex,
-					});
-				}
-
-				let currentNodeRunIndex = 0;
-				if (runExecutionData.resultData.runData.hasOwnProperty(node.name)) {
-					currentNodeRunIndex = runExecutionData.resultData.runData[node.name].length;
-				}
-
-				// Display the error on the node which is causing it
-				await addExecutionDataFunctions(
-					'input',
-					connectedNode.name,
-					error,
-					runExecutionData,
-					inputName,
-					additionalData,
-					node.name,
-					runIndex,
-					currentNodeRunIndex,
-				);
-
-				// Display on the calling node which node has the error
-				throw new NodeOperationError(connectedNode, `Error in sub-node ${connectedNode.name}`, {
-					itemIndex,
-					functionality: 'configuration-node',
-					description: error.message,
-				});
-			}
-		});
-
-	// Validate the inputs
-	const nodes = await Promise.all(constParentNodes);
-
-	if (inputConfiguration.required && nodes.length === 0) {
-		throw new NodeOperationError(
-			node,
-			`A ${inputConfiguration?.displayName ?? inputName} sub-node must be connected`,
-		);
-	}
-	if (
-		inputConfiguration.maxConnections !== undefined &&
-		nodes.length > inputConfiguration.maxConnections
-	) {
-		throw new NodeOperationError(
-			node,
-			`Only ${inputConfiguration.maxConnections} ${inputName} sub-nodes are/is allowed to be connected`,
-		);
-	}
-
-	return inputConfiguration.maxConnections === 1
-		? (nodes || [])[0]?.response
-		: nodes.map((node) => node.response);
-}
-
 export const getRequestHelperFunctions = (
 	workflow: Workflow,
 	node: INode,
@@ -2342,7 +2069,7 @@ export const getRequestHelperFunctions = (
 
 			const runIndex = 0;
 
-			const additionalKeys = {
+			const additionalKeys: IWorkflowDataProxyAdditionalKeys = {
 				$request: requestOptions,
 				$response: {} as IN8nHttpFullResponse,
 				$version: node.typeVersion,
@@ -2467,7 +2194,7 @@ export const getRequestHelperFunctions = (
 				responseData.push(tempResponseData);
 
 				additionalKeys.$response = newResponse;
-				additionalKeys.$pageCount = additionalKeys.$pageCount + 1;
+				additionalKeys.$pageCount = (additionalKeys.$pageCount ?? 0) + 1;
 
 				const maxRequests = getResolvedValue(
 					paginationOptions.maxRequests,
@@ -2833,68 +2560,6 @@ export function getExecuteTriggerFunctions(
 	return new TriggerContext(workflow, node, additionalData, mode, activation);
 }
 
-/**
- * Returns the execute functions regular nodes have access to.
- */
-export function getExecuteFunctions(
-	workflow: Workflow,
-	runExecutionData: IRunExecutionData,
-	runIndex: number,
-	connectionInputData: INodeExecutionData[],
-	inputData: ITaskDataConnections,
-	node: INode,
-	additionalData: IWorkflowExecuteAdditionalData,
-	executeData: IExecuteData,
-	mode: WorkflowExecuteMode,
-	closeFunctions: CloseFunction[],
-	abortSignal?: AbortSignal,
-): IExecuteFunctions {
-	return new ExecuteContext(
-		workflow,
-		node,
-		additionalData,
-		mode,
-		runExecutionData,
-		runIndex,
-		connectionInputData,
-		inputData,
-		executeData,
-		closeFunctions,
-		abortSignal,
-	);
-}
-
-/**
- * Returns the execute functions regular nodes have access to when single-function is defined.
- */
-export function getExecuteSingleFunctions(
-	workflow: Workflow,
-	runExecutionData: IRunExecutionData,
-	runIndex: number,
-	connectionInputData: INodeExecutionData[],
-	inputData: ITaskDataConnections,
-	node: INode,
-	itemIndex: number,
-	additionalData: IWorkflowExecuteAdditionalData,
-	executeData: IExecuteData,
-	mode: WorkflowExecuteMode,
-	abortSignal?: AbortSignal,
-): IExecuteSingleFunctions {
-	return new ExecuteSingleContext(
-		workflow,
-		node,
-		additionalData,
-		mode,
-		runExecutionData,
-		runIndex,
-		connectionInputData,
-		inputData,
-		itemIndex,
-		executeData,
-		abortSignal,
-	);
-}
-
 export function getCredentialTestFunctions(): ICredentialTestFunctions {
 	return {
 		helpers: {
@@ -2905,41 +2570,3 @@ export function getCredentialTestFunctions(): ICredentialTestFunctions {
 		},
 	};
 }
-
-/**
- * Returns the execute functions regular nodes have access to in hook-function.
- */
-export function getExecuteHookFunctions(
-	workflow: Workflow,
-	node: INode,
-	additionalData: IWorkflowExecuteAdditionalData,
-	mode: WorkflowExecuteMode,
-	activation: WorkflowActivateMode,
-	webhookData?: IWebhookData,
-): IHookFunctions {
-	return new HookContext(workflow, node, additionalData, mode, activation, webhookData);
-}
-
-/**
- * Returns the execute functions regular nodes have access to when webhook-function is defined.
- */
-// TODO: check where it is used and make sure close functions are called
-export function getExecuteWebhookFunctions(
-	workflow: Workflow,
-	node: INode,
-	additionalData: IWorkflowExecuteAdditionalData,
-	mode: WorkflowExecuteMode,
-	webhookData: IWebhookData,
-	closeFunctions: CloseFunction[],
-	runExecutionData: IRunExecutionData | null,
-): IWebhookFunctions {
-	return new WebhookContext(
-		workflow,
-		node,
-		additionalData,
-		mode,
-		webhookData,
-		closeFunctions,
-		runExecutionData,
-	);
-}
diff --git a/packages/workflow/src/RoutingNode.ts b/packages/core/src/RoutingNode.ts
similarity index 97%
rename from packages/workflow/src/RoutingNode.ts
rename to packages/core/src/RoutingNode.ts
index db3b1809723c6..1c041735d8535 100644
--- a/packages/workflow/src/RoutingNode.ts
+++ b/packages/core/src/RoutingNode.ts
@@ -1,25 +1,18 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
-
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
-
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-
 import get from 'lodash/get';
 import merge from 'lodash/merge';
 import set from 'lodash/set';
-import url from 'node:url';
-
-import { NodeApiError } from './errors/node-api.error';
-import { NodeOperationError } from './errors/node-operation.error';
+import { NodeHelpers, NodeApiError, NodeOperationError, sleep } from 'n8n-workflow';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
 	IHttpRequestOptions,
 	IN8nHttpFullResponse,
 	INode,
-	INodeExecuteFunctions,
 	INodeExecutionData,
 	INodeParameters,
 	INodePropertyOptions,
@@ -43,10 +36,11 @@ import type {
 	CloseFunction,
 	INodeCredentialDescription,
 	IExecutePaginationFunctions,
-} from './Interfaces';
-import * as NodeHelpers from './NodeHelpers';
-import { sleep } from './utils';
-import type { Workflow } from './Workflow';
+	Workflow,
+} from 'n8n-workflow';
+import url from 'node:url';
+
+import { ExecuteContext, ExecuteSingleContext } from './node-execution-context';
 
 export class RoutingNode {
 	additionalData: IWorkflowExecuteAdditionalData;
@@ -83,7 +77,6 @@ export class RoutingNode {
 		runIndex: number,
 		nodeType: INodeType,
 		executeData: IExecuteData,
-		nodeExecuteFunctions: INodeExecuteFunctions,
 		credentialsDecrypted?: ICredentialsDecrypted,
 		abortSignal?: AbortSignal,
 	): Promise<INodeExecutionData[][] | null | undefined> {
@@ -91,16 +84,16 @@ export class RoutingNode {
 		const returnData: INodeExecutionData[] = [];
 
 		const closeFunctions: CloseFunction[] = [];
-		const executeFunctions = nodeExecuteFunctions.getExecuteFunctions(
+		const executeFunctions = new ExecuteContext(
 			this.workflow,
+			this.node,
+			this.additionalData,
+			this.mode,
 			this.runExecutionData,
 			runIndex,
 			this.connectionInputData,
 			inputData,
-			this.node,
-			this.additionalData,
 			executeData,
-			this.mode,
 			closeFunctions,
 			abortSignal,
 		);
@@ -136,6 +129,7 @@ export class RoutingNode {
 				credentials =
 					(await executeFunctions.getCredentials<ICredentialDataDecryptedObject>(
 						credentialDescription.name,
+						0,
 					)) || {};
 			} catch (error) {
 				if (credentialDescription.required) {
@@ -168,20 +162,22 @@ export class RoutingNode {
 				}
 			}
 
+			const thisArgs = new ExecuteSingleContext(
+				this.workflow,
+				this.node,
+				this.additionalData,
+				this.mode,
+				this.runExecutionData,
+				runIndex,
+				this.connectionInputData,
+				inputData,
+				itemIndex,
+				executeData,
+				abortSignal,
+			);
+
 			itemContext.push({
-				thisArgs: nodeExecuteFunctions.getExecuteSingleFunctions(
-					this.workflow,
-					this.runExecutionData,
-					runIndex,
-					this.connectionInputData,
-					inputData,
-					this.node,
-					itemIndex,
-					this.additionalData,
-					executeData,
-					this.mode,
-					abortSignal,
-				),
+				thisArgs,
 				requestData: {
 					options: {
 						qs: {},
@@ -308,6 +304,7 @@ export class RoutingNode {
 		}
 
 		const promisesResponses = await Promise.allSettled(requestPromises);
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		let responseData: any;
 		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
 			responseData = promisesResponses.shift();
diff --git a/packages/core/src/SerializedBuffer.ts b/packages/core/src/SerializedBuffer.ts
new file mode 100644
index 0000000000000..7a96884729bcf
--- /dev/null
+++ b/packages/core/src/SerializedBuffer.ts
@@ -0,0 +1,22 @@
+import { isObjectLiteral } from './utils';
+
+/** A nodejs Buffer gone through JSON.stringify */
+export type SerializedBuffer = {
+	type: 'Buffer';
+	data: number[]; // Array like Uint8Array, each item is uint8 (0-255)
+};
+
+/** Converts the given SerializedBuffer to nodejs Buffer */
+export function toBuffer(serializedBuffer: SerializedBuffer): Buffer {
+	return Buffer.from(serializedBuffer.data);
+}
+
+export function isSerializedBuffer(candidate: unknown): candidate is SerializedBuffer {
+	return (
+		isObjectLiteral(candidate) &&
+		'type' in candidate &&
+		'data' in candidate &&
+		candidate.type === 'Buffer' &&
+		Array.isArray(candidate.data)
+	);
+}
diff --git a/packages/core/src/TriggersAndPollers.ts b/packages/core/src/TriggersAndPollers.ts
new file mode 100644
index 0000000000000..b77926e136132
--- /dev/null
+++ b/packages/core/src/TriggersAndPollers.ts
@@ -0,0 +1,116 @@
+import { ApplicationError } from 'n8n-workflow';
+import type {
+	Workflow,
+	INode,
+	INodeExecutionData,
+	IPollFunctions,
+	IGetExecuteTriggerFunctions,
+	IWorkflowExecuteAdditionalData,
+	WorkflowExecuteMode,
+	WorkflowActivateMode,
+	ITriggerResponse,
+	IDeferredPromise,
+	IExecuteResponsePromiseData,
+	IRun,
+} from 'n8n-workflow';
+import { Service } from 'typedi';
+
+@Service()
+export class TriggersAndPollers {
+	/**
+	 * Runs the given trigger node so that it can trigger the workflow when the node has data.
+	 */
+	async runTrigger(
+		workflow: Workflow,
+		node: INode,
+		getTriggerFunctions: IGetExecuteTriggerFunctions,
+		additionalData: IWorkflowExecuteAdditionalData,
+		mode: WorkflowExecuteMode,
+		activation: WorkflowActivateMode,
+	): Promise<ITriggerResponse | undefined> {
+		const triggerFunctions = getTriggerFunctions(workflow, node, additionalData, mode, activation);
+
+		const nodeType = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+
+		if (!nodeType.trigger) {
+			throw new ApplicationError('Node type does not have a trigger function defined', {
+				extra: { nodeName: node.name },
+				tags: { nodeType: node.type },
+			});
+		}
+
+		if (mode === 'manual') {
+			// In manual mode we do not just start the trigger function we also
+			// want to be able to get informed as soon as the first data got emitted
+			const triggerResponse = await nodeType.trigger.call(triggerFunctions);
+
+			// Add the manual trigger response which resolves when the first time data got emitted
+			triggerResponse!.manualTriggerResponse = new Promise((resolve, reject) => {
+				triggerFunctions.emit = (
+					(resolveEmit) =>
+					(
+						data: INodeExecutionData[][],
+						responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>,
+						donePromise?: IDeferredPromise<IRun>,
+					) => {
+						additionalData.hooks!.hookFunctions.sendResponse = [
+							async (response: IExecuteResponsePromiseData): Promise<void> => {
+								if (responsePromise) {
+									responsePromise.resolve(response);
+								}
+							},
+						];
+
+						if (donePromise) {
+							additionalData.hooks!.hookFunctions.workflowExecuteAfter?.unshift(
+								async (runData: IRun): Promise<void> => {
+									return donePromise.resolve(runData);
+								},
+							);
+						}
+
+						resolveEmit(data);
+					}
+				)(resolve);
+				triggerFunctions.emitError = (
+					(rejectEmit) =>
+					(error: Error, responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>) => {
+						additionalData.hooks!.hookFunctions.sendResponse = [
+							async (): Promise<void> => {
+								if (responsePromise) {
+									responsePromise.reject(error);
+								}
+							},
+						];
+
+						rejectEmit(error);
+					}
+				)(reject);
+			});
+
+			return triggerResponse;
+		}
+		// In all other modes simply start the trigger
+		return await nodeType.trigger.call(triggerFunctions);
+	}
+
+	/**
+	 * Runs the given poller node so that it can trigger the workflow when the node has data.
+	 */
+	async runPoll(
+		workflow: Workflow,
+		node: INode,
+		pollFunctions: IPollFunctions,
+	): Promise<INodeExecutionData[][] | null> {
+		const nodeType = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+
+		if (!nodeType.poll) {
+			throw new ApplicationError('Node type does not have a poll function defined', {
+				extra: { nodeName: node.name },
+				tags: { nodeType: node.type },
+			});
+		}
+
+		return await nodeType.poll.call(pollFunctions);
+	}
+}
diff --git a/packages/core/src/WorkflowExecute.ts b/packages/core/src/WorkflowExecute.ts
index 2990d61cf8626..f340c8da675ba 100644
--- a/packages/core/src/WorkflowExecute.ts
+++ b/packages/core/src/WorkflowExecute.ts
@@ -37,6 +37,9 @@ import type {
 	StartNodeData,
 	NodeExecutionHint,
 	NodeInputConnections,
+	IRunNodeResponse,
+	IWorkflowIssues,
+	INodeIssues,
 } from 'n8n-workflow';
 import {
 	LoggerProxy as Logger,
@@ -46,11 +49,14 @@ import {
 	ApplicationError,
 	NodeExecutionOutput,
 	sleep,
-	ErrorReporterProxy,
 	ExecutionCancelledError,
+	Node,
 } from 'n8n-workflow';
 import PCancelable from 'p-cancelable';
+import Container from 'typedi';
 
+import { ErrorReporter } from './error-reporter';
+import { ExecuteContext, PollContext } from './node-execution-context';
 import * as NodeExecuteFunctions from './NodeExecuteFunctions';
 import {
 	DirectedGraph,
@@ -62,6 +68,8 @@ import {
 	handleCycles,
 	filterDisabledNodes,
 } from './PartialExecutionUtils';
+import { RoutingNode } from './RoutingNode';
+import { TriggersAndPollers } from './TriggersAndPollers';
 
 export class WorkflowExecute {
 	private status: ExecutionStatus = 'new';
@@ -883,6 +891,280 @@ export class WorkflowExecute {
 		}
 	}
 
+	/**
+	 * Checks if everything in the workflow is complete
+	 * and ready to be executed. If it returns null everything
+	 * is fine. If there are issues it returns the issues
+	 * which have been found for the different nodes.
+	 * TODO: Does currently not check for credential issues!
+	 */
+	checkReadyForExecution(
+		workflow: Workflow,
+		inputData: {
+			startNode?: string;
+			destinationNode?: string;
+			pinDataNodeNames?: string[];
+		} = {},
+	): IWorkflowIssues | null {
+		const workflowIssues: IWorkflowIssues = {};
+
+		let checkNodes: string[] = [];
+		if (inputData.destinationNode) {
+			// If a destination node is given we have to check all the nodes
+			// leading up to it
+			checkNodes = workflow.getParentNodes(inputData.destinationNode);
+			checkNodes.push(inputData.destinationNode);
+		} else if (inputData.startNode) {
+			// If a start node is given we have to check all nodes which
+			// come after it
+			checkNodes = workflow.getChildNodes(inputData.startNode);
+			checkNodes.push(inputData.startNode);
+		}
+
+		for (const nodeName of checkNodes) {
+			let nodeIssues: INodeIssues | null = null;
+			const node = workflow.nodes[nodeName];
+
+			if (node.disabled === true) {
+				continue;
+			}
+
+			const nodeType = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+
+			if (nodeType === undefined) {
+				// Node type is not known
+				nodeIssues = {
+					typeUnknown: true,
+				};
+			} else {
+				nodeIssues = NodeHelpers.getNodeParametersIssues(
+					nodeType.description.properties,
+					node,
+					inputData.pinDataNodeNames,
+				);
+			}
+
+			if (nodeIssues !== null) {
+				workflowIssues[node.name] = nodeIssues;
+			}
+		}
+
+		if (Object.keys(workflowIssues).length === 0) {
+			return null;
+		}
+
+		return workflowIssues;
+	}
+
+	/** Executes the given node */
+	// eslint-disable-next-line complexity
+	async runNode(
+		workflow: Workflow,
+		executionData: IExecuteData,
+		runExecutionData: IRunExecutionData,
+		runIndex: number,
+		additionalData: IWorkflowExecuteAdditionalData,
+		mode: WorkflowExecuteMode,
+		abortSignal?: AbortSignal,
+	): Promise<IRunNodeResponse> {
+		const { node } = executionData;
+		let inputData = executionData.data;
+
+		if (node.disabled === true) {
+			// If node is disabled simply pass the data through
+			// return NodeRunHelpers.
+			if (inputData.hasOwnProperty('main') && inputData.main.length > 0) {
+				// If the node is disabled simply return the data from the first main input
+				if (inputData.main[0] === null) {
+					return { data: undefined };
+				}
+				return { data: [inputData.main[0]] };
+			}
+			return { data: undefined };
+		}
+
+		const nodeType = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+
+		let connectionInputData: INodeExecutionData[] = [];
+		if (nodeType.execute || (!nodeType.poll && !nodeType.trigger && !nodeType.webhook)) {
+			// Only stop if first input is empty for execute runs. For all others run anyways
+			// because then it is a trigger node. As they only pass data through and so the input-data
+			// becomes output-data it has to be possible.
+
+			if (inputData.main?.length > 0) {
+				// We always use the data of main input and the first input for execute
+				connectionInputData = inputData.main[0] as INodeExecutionData[];
+			}
+
+			const forceInputNodeExecution = workflow.settings.executionOrder !== 'v1';
+			if (!forceInputNodeExecution) {
+				// If the nodes do not get force executed data of some inputs may be missing
+				// for that reason do we use the data of the first one that contains any
+				for (const mainData of inputData.main) {
+					if (mainData?.length) {
+						connectionInputData = mainData;
+						break;
+					}
+				}
+			}
+
+			if (connectionInputData.length === 0) {
+				// No data for node so return
+				return { data: undefined };
+			}
+		}
+
+		if (
+			runExecutionData.resultData.lastNodeExecuted === node.name &&
+			runExecutionData.resultData.error !== undefined
+		) {
+			// The node did already fail. So throw an error here that it displays and logs it correctly.
+			// Does get used by webhook and trigger nodes in case they throw an error that it is possible
+			// to log the error and display in Editor-UI.
+			if (
+				runExecutionData.resultData.error.name === 'NodeOperationError' ||
+				runExecutionData.resultData.error.name === 'NodeApiError'
+			) {
+				throw runExecutionData.resultData.error;
+			}
+
+			const error = new Error(runExecutionData.resultData.error.message);
+			error.stack = runExecutionData.resultData.error.stack;
+			throw error;
+		}
+
+		if (node.executeOnce === true) {
+			// If node should be executed only once so use only the first input item
+			const newInputData: ITaskDataConnections = {};
+			for (const connectionType of Object.keys(inputData)) {
+				newInputData[connectionType] = inputData[connectionType].map((input) => {
+					// eslint-disable-next-line @typescript-eslint/prefer-optional-chain
+					return input && input.slice(0, 1);
+				});
+			}
+			inputData = newInputData;
+		}
+
+		if (nodeType.execute) {
+			const closeFunctions: CloseFunction[] = [];
+			const context = new ExecuteContext(
+				workflow,
+				node,
+				additionalData,
+				mode,
+				runExecutionData,
+				runIndex,
+				connectionInputData,
+				inputData,
+				executionData,
+				closeFunctions,
+				abortSignal,
+			);
+
+			const data =
+				nodeType instanceof Node
+					? await nodeType.execute(context)
+					: await nodeType.execute.call(context);
+
+			const closeFunctionsResults = await Promise.allSettled(
+				closeFunctions.map(async (fn) => await fn()),
+			);
+
+			const closingErrors = closeFunctionsResults
+				.filter((result): result is PromiseRejectedResult => result.status === 'rejected')
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+				.map((result) => result.reason);
+
+			if (closingErrors.length > 0) {
+				if (closingErrors[0] instanceof Error) throw closingErrors[0];
+				throw new ApplicationError("Error on execution node's close function(s)", {
+					extra: { nodeName: node.name },
+					tags: { nodeType: node.type },
+					cause: closingErrors,
+				});
+			}
+
+			return { data };
+		} else if (nodeType.poll) {
+			if (mode === 'manual') {
+				// In manual mode run the poll function
+				const context = new PollContext(workflow, node, additionalData, mode, 'manual');
+				return { data: await nodeType.poll.call(context) };
+			}
+			// In any other mode pass data through as it already contains the result of the poll
+			return { data: inputData.main as INodeExecutionData[][] };
+		} else if (nodeType.trigger) {
+			if (mode === 'manual') {
+				// In manual mode start the trigger
+				const triggerResponse = await Container.get(TriggersAndPollers).runTrigger(
+					workflow,
+					node,
+					NodeExecuteFunctions.getExecuteTriggerFunctions,
+					additionalData,
+					mode,
+					'manual',
+				);
+
+				if (triggerResponse === undefined) {
+					return { data: null };
+				}
+
+				let closeFunction;
+				if (triggerResponse.closeFunction) {
+					// In manual mode we return the trigger closeFunction. That allows it to be called directly
+					// but we do not have to wait for it to finish. That is important for things like queue-nodes.
+					// There the full close will may be delayed till a message gets acknowledged after the execution.
+					// If we would not be able to wait for it to close would it cause problems with "own" mode as the
+					// process would be killed directly after it and so the acknowledge would not have been finished yet.
+					closeFunction = triggerResponse.closeFunction;
+
+					// Manual testing of Trigger nodes creates an execution. If the execution is cancelled, `closeFunction` should be called to cleanup any open connections/consumers
+					abortSignal?.addEventListener('abort', closeFunction);
+				}
+
+				if (triggerResponse.manualTriggerFunction !== undefined) {
+					// If a manual trigger function is defined call it and wait till it did run
+					await triggerResponse.manualTriggerFunction();
+				}
+
+				const response = await triggerResponse.manualTriggerResponse!;
+
+				if (response.length === 0) {
+					return { data: null, closeFunction };
+				}
+
+				return { data: response, closeFunction };
+			}
+			// For trigger nodes in any mode except "manual" do we simply pass the data through
+			return { data: inputData.main as INodeExecutionData[][] };
+		} else if (nodeType.webhook) {
+			// For webhook nodes always simply pass the data through
+			return { data: inputData.main as INodeExecutionData[][] };
+		} else {
+			// For nodes which have routing information on properties
+
+			const routingNode = new RoutingNode(
+				workflow,
+				node,
+				connectionInputData,
+				runExecutionData ?? null,
+				additionalData,
+				mode,
+			);
+
+			return {
+				data: await routingNode.runNode(
+					inputData,
+					runIndex,
+					nodeType,
+					executionData,
+					undefined,
+					abortSignal,
+				),
+			};
+		}
+	}
+
 	/**
 	 * Runs the given execution data.
 	 *
@@ -908,14 +1190,14 @@ export class WorkflowExecute {
 
 		const pinDataNodeNames = Object.keys(this.runExecutionData.resultData.pinData ?? {});
 
-		const workflowIssues = workflow.checkReadyForExecution({
+		const workflowIssues = this.checkReadyForExecution(workflow, {
 			startNode,
 			destinationNode,
 			pinDataNodeNames,
 		});
 		if (workflowIssues !== null) {
 			throw new WorkflowOperationError(
-				'The workflow has issues and can for that reason not be executed. Please fix them first.',
+				'The workflow has issues and cannot be executed for that reason. Please fix them first.',
 			);
 		}
 
@@ -1018,8 +1300,8 @@ export class WorkflowExecute {
 
 					// Update the pairedItem information on items
 					const newTaskDataConnections: ITaskDataConnections = {};
-					for (const inputName of Object.keys(executionData.data)) {
-						newTaskDataConnections[inputName] = executionData.data[inputName].map(
+					for (const connectionType of Object.keys(executionData.data)) {
+						newTaskDataConnections[connectionType] = executionData.data[connectionType].map(
 							(input, inputIndex) => {
 								if (input === null) {
 									return input;
@@ -1170,12 +1452,12 @@ export class WorkflowExecute {
 									workflowId: workflow.id,
 								});
 
-								let runNodeData = await workflow.runNode(
+								let runNodeData = await this.runNode(
+									workflow,
 									executionData,
 									this.runExecutionData,
 									runIndex,
 									this.additionalData,
-									NodeExecuteFunctions,
 									this.mode,
 									this.abortController.signal,
 								);
@@ -1187,12 +1469,12 @@ export class WorkflowExecute {
 								while (didContinueOnFail && tryIndex !== maxTries - 1) {
 									await sleep(waitBetweenTries);
 
-									runNodeData = await workflow.runNode(
+									runNodeData = await this.runNode(
+										workflow,
 										executionData,
 										this.runExecutionData,
 										runIndex,
 										this.additionalData,
-										NodeExecuteFunctions,
 										this.mode,
 										this.abortController.signal,
 									);
@@ -1229,19 +1511,20 @@ export class WorkflowExecute {
 									const closeFunctions: CloseFunction[] = [];
 									// Create a WorkflowDataProxy instance that we can get the data of the
 									// item which did error
-									const executeFunctions = NodeExecuteFunctions.getExecuteFunctions(
+									const executeFunctions = new ExecuteContext(
 										workflow,
+										executionData.node,
+										this.additionalData,
+										this.mode,
 										this.runExecutionData,
 										runIndex,
 										[],
 										executionData.data,
-										executionData.node,
-										this.additionalData,
 										executionData,
-										this.mode,
 										closeFunctions,
 										this.abortController.signal,
 									);
+
 									const dataProxy = executeFunctions.getWorkflowDataProxy(0);
 
 									// Loop over all outputs except the error output as it would not contain data by default
@@ -1408,7 +1691,7 @@ export class WorkflowExecute {
 								}
 							}
 
-							if (nodeSuccessData === null && !this.runExecutionData.waitTill!) {
+							if (nodeSuccessData === null && !this.runExecutionData.waitTill) {
 								// If null gets returned it means that the node did succeed
 								// but did not have any data. So the branch should end
 								// (meaning the nodes afterwards should not be processed)
@@ -1428,7 +1711,7 @@ export class WorkflowExecute {
 								toReport = error;
 							}
 							if (toReport) {
-								ErrorReporterProxy.error(toReport, {
+								Container.get(ErrorReporter).error(toReport, {
 									extra: {
 										nodeName: executionNode.name,
 										nodeType: executionNode.type,
@@ -1513,16 +1796,13 @@ export class WorkflowExecute {
 								lineResult.json.$json !== undefined
 							) {
 								// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-								// @ts-ignore
 								lineResult.error = lineResult.json.$error as NodeApiError | NodeOperationError;
 								lineResult.json = {
 									// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-									// @ts-ignore
 									error: (lineResult.json.$error as NodeApiError | NodeOperationError).message,
 								};
 							} else if (lineResult.error !== undefined) {
 								// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-								// @ts-ignore
 								lineResult.json = { error: lineResult.error.message };
 							}
 						}
@@ -1535,7 +1815,7 @@ export class WorkflowExecute {
 
 					this.runExecutionData.resultData.runData[executionNode.name].push(taskData);
 
-					if (this.runExecutionData.waitTill!) {
+					if (this.runExecutionData.waitTill) {
 						await this.executeHook('nodeExecuteAfter', [
 							executionNode.name,
 							taskData,
@@ -1916,7 +2196,7 @@ export class WorkflowExecute {
 			if (executionError.message?.includes('canceled')) {
 				fullRunData.status = 'canceled';
 			}
-		} else if (this.runExecutionData.waitTill!) {
+		} else if (this.runExecutionData.waitTill) {
 			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 			Logger.debug(`Workflow execution will wait until ${this.runExecutionData.waitTill}`, {
 				workflowId: workflow.id,
diff --git a/packages/core/src/__tests__/ActiveWorkflows.test.ts b/packages/core/src/__tests__/ActiveWorkflows.test.ts
new file mode 100644
index 0000000000000..85487a0cece09
--- /dev/null
+++ b/packages/core/src/__tests__/ActiveWorkflows.test.ts
@@ -0,0 +1,290 @@
+import { mock } from 'jest-mock-extended';
+import type {
+	IGetExecuteTriggerFunctions,
+	INode,
+	ITriggerResponse,
+	IWorkflowExecuteAdditionalData,
+	Workflow,
+	WorkflowActivateMode,
+	WorkflowExecuteMode,
+	TriggerTime,
+	CronExpression,
+} from 'n8n-workflow';
+import { LoggerProxy, TriggerCloseError, WorkflowActivationError } from 'n8n-workflow';
+
+import { ActiveWorkflows } from '@/ActiveWorkflows';
+import type { ErrorReporter } from '@/error-reporter';
+import type { PollContext } from '@/node-execution-context';
+import type { ScheduledTaskManager } from '@/ScheduledTaskManager';
+import type { TriggersAndPollers } from '@/TriggersAndPollers';
+
+describe('ActiveWorkflows', () => {
+	const workflowId = 'test-workflow-id';
+	const workflow = mock<Workflow>();
+	const additionalData = mock<IWorkflowExecuteAdditionalData>();
+	const mode: WorkflowExecuteMode = 'trigger';
+	const activation: WorkflowActivateMode = 'init';
+
+	const getTriggerFunctions = jest.fn() as IGetExecuteTriggerFunctions;
+	const triggerResponse = mock<ITriggerResponse>();
+
+	const pollFunctions = mock<PollContext>();
+	const getPollFunctions = jest.fn<PollContext, unknown[]>();
+
+	LoggerProxy.init(mock());
+	const scheduledTaskManager = mock<ScheduledTaskManager>();
+	const triggersAndPollers = mock<TriggersAndPollers>();
+	const errorReporter = mock<ErrorReporter>();
+	const triggerNode = mock<INode>();
+	const pollNode = mock<INode>();
+
+	let activeWorkflows: ActiveWorkflows;
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		activeWorkflows = new ActiveWorkflows(scheduledTaskManager, triggersAndPollers, errorReporter);
+	});
+
+	type PollTimes = { item: TriggerTime[] };
+	type TestOptions = {
+		triggerNodes?: INode[];
+		pollNodes?: INode[];
+		triggerError?: Error;
+		pollError?: Error;
+		pollTimes?: PollTimes;
+	};
+
+	const addWorkflow = async ({
+		triggerNodes = [],
+		pollNodes = [],
+		triggerError,
+		pollError,
+		pollTimes = { item: [{ mode: 'everyMinute' }] },
+	}: TestOptions) => {
+		workflow.getTriggerNodes.mockReturnValue(triggerNodes);
+		workflow.getPollNodes.mockReturnValue(pollNodes);
+		pollFunctions.getNodeParameter.calledWith('pollTimes').mockReturnValue(pollTimes);
+
+		if (triggerError) {
+			triggersAndPollers.runTrigger.mockRejectedValueOnce(triggerError);
+		} else {
+			triggersAndPollers.runTrigger.mockResolvedValue(triggerResponse);
+		}
+
+		if (pollError) {
+			triggersAndPollers.runPoll.mockRejectedValueOnce(pollError);
+		} else {
+			getPollFunctions.mockReturnValue(pollFunctions);
+		}
+
+		return await activeWorkflows.add(
+			workflowId,
+			workflow,
+			additionalData,
+			mode,
+			activation,
+			getTriggerFunctions,
+			getPollFunctions,
+		);
+	};
+
+	describe('add()', () => {
+		describe('should activate workflow', () => {
+			it('with trigger nodes', async () => {
+				await addWorkflow({ triggerNodes: [triggerNode] });
+
+				expect(activeWorkflows.isActive(workflowId)).toBe(true);
+				expect(workflow.getTriggerNodes).toHaveBeenCalled();
+				expect(triggersAndPollers.runTrigger).toHaveBeenCalledWith(
+					workflow,
+					triggerNode,
+					getTriggerFunctions,
+					additionalData,
+					mode,
+					activation,
+				);
+			});
+
+			it('with polling nodes', async () => {
+				await addWorkflow({ pollNodes: [pollNode] });
+
+				expect(activeWorkflows.isActive(workflowId)).toBe(true);
+				expect(workflow.getPollNodes).toHaveBeenCalled();
+				expect(scheduledTaskManager.registerCron).toHaveBeenCalled();
+			});
+
+			it('with both trigger and polling nodes', async () => {
+				await addWorkflow({ triggerNodes: [triggerNode], pollNodes: [pollNode] });
+
+				expect(activeWorkflows.isActive(workflowId)).toBe(true);
+				expect(workflow.getTriggerNodes).toHaveBeenCalled();
+				expect(workflow.getPollNodes).toHaveBeenCalled();
+				expect(triggersAndPollers.runTrigger).toHaveBeenCalledWith(
+					workflow,
+					triggerNode,
+					getTriggerFunctions,
+					additionalData,
+					mode,
+					activation,
+				);
+				expect(scheduledTaskManager.registerCron).toHaveBeenCalled();
+				expect(triggersAndPollers.runPoll).toHaveBeenCalledWith(workflow, pollNode, pollFunctions);
+			});
+		});
+
+		describe('should throw error', () => {
+			it('if trigger activation fails', async () => {
+				const error = new Error('Trigger activation failed');
+				await expect(
+					addWorkflow({ triggerNodes: [triggerNode], triggerError: error }),
+				).rejects.toThrow(WorkflowActivationError);
+				expect(activeWorkflows.isActive(workflowId)).toBe(false);
+			});
+
+			it('if polling activation fails', async () => {
+				const error = new Error('Failed to activate polling');
+				await expect(addWorkflow({ pollNodes: [pollNode], pollError: error })).rejects.toThrow(
+					WorkflowActivationError,
+				);
+				expect(activeWorkflows.isActive(workflowId)).toBe(false);
+			});
+
+			it('if the polling interval is too short', async () => {
+				const pollTimes: PollTimes = {
+					item: [
+						{
+							mode: 'custom',
+							cronExpression: '* * * * *' as CronExpression,
+						},
+					],
+				};
+
+				await expect(addWorkflow({ pollNodes: [pollNode], pollTimes })).rejects.toThrow(
+					'The polling interval is too short. It has to be at least a minute.',
+				);
+
+				expect(scheduledTaskManager.registerCron).not.toHaveBeenCalled();
+			});
+		});
+
+		describe('should handle polling errors', () => {
+			it('should throw error when poll fails during initial testing', async () => {
+				const error = new Error('Poll function failed');
+
+				await expect(addWorkflow({ pollNodes: [pollNode], pollError: error })).rejects.toThrow(
+					WorkflowActivationError,
+				);
+
+				expect(triggersAndPollers.runPoll).toHaveBeenCalledWith(workflow, pollNode, pollFunctions);
+				expect(pollFunctions.__emit).not.toHaveBeenCalled();
+				expect(pollFunctions.__emitError).not.toHaveBeenCalled();
+			});
+
+			it('should emit error when poll fails during regular polling', async () => {
+				const error = new Error('Poll function failed');
+				triggersAndPollers.runPoll
+					.mockResolvedValueOnce(null) // Succeed on first call (testing)
+					.mockRejectedValueOnce(error); // Fail on second call (regular polling)
+
+				await addWorkflow({ pollNodes: [pollNode] });
+
+				// Get the executeTrigger function that was registered
+				const registerCronCall = scheduledTaskManager.registerCron.mock.calls[0];
+				const executeTrigger = registerCronCall[2] as () => Promise<void>;
+
+				// Execute the trigger function to simulate a regular poll
+				await executeTrigger();
+
+				expect(triggersAndPollers.runPoll).toHaveBeenCalledTimes(2);
+				expect(pollFunctions.__emit).not.toHaveBeenCalled();
+				expect(pollFunctions.__emitError).toHaveBeenCalledWith(error);
+			});
+		});
+	});
+
+	describe('remove()', () => {
+		const setupForRemoval = async () => {
+			await addWorkflow({ triggerNodes: [triggerNode] });
+			return await activeWorkflows.remove(workflowId);
+		};
+
+		it('should remove an active workflow', async () => {
+			const result = await setupForRemoval();
+
+			expect(result).toBe(true);
+			expect(activeWorkflows.isActive(workflowId)).toBe(false);
+			expect(scheduledTaskManager.deregisterCrons).toHaveBeenCalledWith(workflowId);
+			expect(triggerResponse.closeFunction).toHaveBeenCalled();
+		});
+
+		it('should return false when removing non-existent workflow', async () => {
+			const result = await activeWorkflows.remove('non-existent');
+
+			expect(result).toBe(false);
+			expect(scheduledTaskManager.deregisterCrons).not.toHaveBeenCalled();
+		});
+
+		it('should handle TriggerCloseError when closing trigger', async () => {
+			const triggerCloseError = new TriggerCloseError(triggerNode, { level: 'warning' });
+			(triggerResponse.closeFunction as jest.Mock).mockRejectedValueOnce(triggerCloseError);
+
+			const result = await setupForRemoval();
+
+			expect(result).toBe(true);
+			expect(activeWorkflows.isActive(workflowId)).toBe(false);
+			expect(triggerResponse.closeFunction).toHaveBeenCalled();
+			expect(errorReporter.error).toHaveBeenCalledWith(triggerCloseError, {
+				extra: { workflowId },
+			});
+		});
+
+		it('should throw WorkflowDeactivationError when closeFunction throws regular error', async () => {
+			const error = new Error('Close function failed');
+			(triggerResponse.closeFunction as jest.Mock).mockRejectedValueOnce(error);
+
+			await addWorkflow({ triggerNodes: [triggerNode] });
+
+			await expect(activeWorkflows.remove(workflowId)).rejects.toThrow(
+				`Failed to deactivate trigger of workflow ID "${workflowId}": "Close function failed"`,
+			);
+
+			expect(triggerResponse.closeFunction).toHaveBeenCalled();
+			expect(errorReporter.error).not.toHaveBeenCalled();
+		});
+	});
+
+	describe('get() and isActive()', () => {
+		it('should return workflow data for active workflow', async () => {
+			await addWorkflow({ triggerNodes: [triggerNode] });
+
+			expect(activeWorkflows.isActive(workflowId)).toBe(true);
+			expect(activeWorkflows.get(workflowId)).toBeDefined();
+		});
+
+		it('should return undefined for non-active workflow', () => {
+			expect(activeWorkflows.isActive('non-existent')).toBe(false);
+			expect(activeWorkflows.get('non-existent')).toBeUndefined();
+		});
+	});
+
+	describe('allActiveWorkflows()', () => {
+		it('should return all active workflow IDs', async () => {
+			await addWorkflow({ triggerNodes: [triggerNode] });
+
+			const activeIds = activeWorkflows.allActiveWorkflows();
+
+			expect(activeIds).toEqual([workflowId]);
+		});
+	});
+
+	describe('removeAllTriggerAndPollerBasedWorkflows()', () => {
+		it('should remove all active workflows', async () => {
+			await addWorkflow({ triggerNodes: [triggerNode] });
+
+			await activeWorkflows.removeAllTriggerAndPollerBasedWorkflows();
+
+			expect(activeWorkflows.allActiveWorkflows()).toEqual([]);
+			expect(scheduledTaskManager.deregisterCrons).toHaveBeenCalledWith(workflowId);
+		});
+	});
+});
diff --git a/packages/core/src/__tests__/utils.test.ts b/packages/core/src/__tests__/utils.test.ts
new file mode 100644
index 0000000000000..a8532ed5898ed
--- /dev/null
+++ b/packages/core/src/__tests__/utils.test.ts
@@ -0,0 +1,35 @@
+import { isObjectLiteral } from '@/utils';
+
+describe('isObjectLiteral', () => {
+	test.each([
+		['empty object literal', {}, true],
+		['object with properties', { foo: 'bar', num: 123 }, true],
+		['nested object literal', { nested: { foo: 'bar' } }, true],
+		['object with symbol key', { [Symbol.for('foo')]: 'bar' }, true],
+		['null', null, false],
+		['empty array', [], false],
+		['array with values', [1, 2, 3], false],
+		['number', 42, false],
+		['string', 'string', false],
+		['boolean', true, false],
+		['undefined', undefined, false],
+		['Date object', new Date(), false],
+		['RegExp object', new RegExp(''), false],
+		['Map object', new Map(), false],
+		['Set object', new Set(), false],
+		['arrow function', () => {}, false],
+		['regular function', function () {}, false],
+		['class instance', new (class TestClass {})(), false],
+		['object with custom prototype', Object.create({ customMethod: () => {} }), true],
+		['Object.create(null)', Object.create(null), false],
+		['Buffer', Buffer.from('test'), false],
+		['Serialized Buffer', Buffer.from('test').toJSON(), true],
+		['Promise', new Promise(() => {}), false],
+	])('should return %s for %s', (_, input, expected) => {
+		expect(isObjectLiteral(input)).toBe(expected);
+	});
+
+	it('should return false for Error objects', () => {
+		expect(isObjectLiteral(new Error())).toBe(false);
+	});
+});
diff --git a/packages/core/src/decorators/__tests__/memoized.test.ts b/packages/core/src/decorators/__tests__/memoized.test.ts
new file mode 100644
index 0000000000000..053138c60cbbd
--- /dev/null
+++ b/packages/core/src/decorators/__tests__/memoized.test.ts
@@ -0,0 +1,153 @@
+import { AssertionError, ok } from 'node:assert';
+import { setFlagsFromString } from 'node:v8';
+import { runInNewContext } from 'node:vm';
+
+import { Memoized } from '../memoized';
+
+describe('Memoized Decorator', () => {
+	class TestClass {
+		private computeCount = 0;
+
+		constructor(private readonly value: number = 42) {}
+
+		@Memoized
+		get expensiveComputation() {
+			this.computeCount++;
+			return this.value * 2;
+		}
+
+		getComputeCount() {
+			return this.computeCount;
+		}
+	}
+
+	it('should only compute the value once', () => {
+		const instance = new TestClass();
+
+		// First access should compute
+		expect(instance.expensiveComputation).toBe(84);
+		expect(instance.getComputeCount()).toBe(1);
+
+		// Second access should use cached value
+		expect(instance.expensiveComputation).toBe(84);
+		expect(instance.getComputeCount()).toBe(1);
+
+		// Third access should still use cached value
+		expect(instance.expensiveComputation).toBe(84);
+		expect(instance.getComputeCount()).toBe(1);
+	});
+
+	it('should cache values independently for different instances', () => {
+		const instance1 = new TestClass(10);
+		const instance2 = new TestClass(20);
+
+		expect(instance1.expensiveComputation).toBe(20);
+		expect(instance2.expensiveComputation).toBe(40);
+
+		expect(instance1.getComputeCount()).toBe(1);
+		expect(instance2.getComputeCount()).toBe(1);
+	});
+
+	it('should throw error when used on non-getter', () => {
+		expect(() => {
+			class InvalidClass {
+				// @ts-expect-error this code will fail at compile time and at runtime
+				@Memoized
+				normalProperty = 42;
+			}
+			new InvalidClass();
+		}).toThrow(AssertionError);
+	});
+
+	it('should make cached value non-enumerable', () => {
+		const instance = new TestClass();
+		instance.expensiveComputation; // Access to trigger caching
+
+		const propertyNames = Object.keys(instance);
+		expect(propertyNames).not.toContain('expensiveComputation');
+	});
+
+	it('should not allow reconfiguring the cached value', () => {
+		const instance = new TestClass();
+		instance.expensiveComputation; // Access to trigger caching
+
+		expect(() => {
+			Object.defineProperty(instance, 'expensiveComputation', {
+				value: 999,
+				configurable: true,
+			});
+		}).toThrow();
+	});
+
+	it('should work when child class references memoized getter in parent class', () => {
+		class ParentClass {
+			protected computeCount = 0;
+
+			@Memoized
+			get parentValue() {
+				this.computeCount++;
+				return 42;
+			}
+
+			getComputeCount() {
+				return this.computeCount;
+			}
+		}
+
+		class ChildClass extends ParentClass {
+			get childValue() {
+				return this.parentValue * 2;
+			}
+		}
+
+		const child = new ChildClass();
+
+		expect(child.childValue).toBe(84);
+		expect(child.getComputeCount()).toBe(1);
+
+		expect(child.childValue).toBe(84);
+		expect(child.getComputeCount()).toBe(1);
+	});
+
+	it('should have correct property descriptor after memoization', () => {
+		const instance = new TestClass();
+
+		// Before accessing (original getter descriptor)
+		const beforeDescriptor = Object.getOwnPropertyDescriptor(
+			TestClass.prototype,
+			'expensiveComputation',
+		);
+		expect(beforeDescriptor?.configurable).toBe(true);
+		expect(beforeDescriptor?.enumerable).toBe(false);
+		expect(typeof beforeDescriptor?.get).toBe('function');
+		expect(beforeDescriptor?.set).toBeUndefined();
+
+		// After accessing (memoized value descriptor)
+		instance.expensiveComputation; // Trigger memoization
+		const afterDescriptor = Object.getOwnPropertyDescriptor(instance, 'expensiveComputation');
+		expect(afterDescriptor?.configurable).toBe(false);
+		expect(afterDescriptor?.enumerable).toBe(false);
+		expect(afterDescriptor?.writable).toBe(false);
+		expect(afterDescriptor?.value).toBe(84);
+		expect(afterDescriptor?.get).toBeUndefined();
+	});
+
+	it('should not prevent garbage collection of instances', async () => {
+		setFlagsFromString('--expose_gc');
+		const gc = runInNewContext('gc') as unknown as () => void;
+
+		let instance: TestClass | undefined = new TestClass();
+		const weakRef = new WeakRef(instance);
+		instance.expensiveComputation;
+
+		// Remove the strong reference
+		instance = undefined;
+
+		// Wait for garbage collection, forcing it if needed
+		await new Promise((resolve) => setTimeout(resolve, 10));
+		gc();
+
+		const ref = weakRef.deref();
+		ok(!ref, 'GC did not collect the instance ref');
+	});
+});
diff --git a/packages/core/src/decorators/index.ts b/packages/core/src/decorators/index.ts
new file mode 100644
index 0000000000000..2bf9174d7a498
--- /dev/null
+++ b/packages/core/src/decorators/index.ts
@@ -0,0 +1 @@
+export { Memoized } from './memoized';
diff --git a/packages/core/src/decorators/memoized.ts b/packages/core/src/decorators/memoized.ts
new file mode 100644
index 0000000000000..3ff5c5661914f
--- /dev/null
+++ b/packages/core/src/decorators/memoized.ts
@@ -0,0 +1,41 @@
+import assert from 'node:assert';
+
+/**
+ * A decorator that implements memoization for class property getters.
+ *
+ * The decorated getter will only be executed once and its value cached for subsequent access
+ *
+ * @example
+ * class Example {
+ *   @Memoized
+ *   get computedValue() {
+ *     // This will only run once and the result will be cached
+ *     return heavyComputation();
+ *   }
+ * }
+ *
+ * @throws If decorator is used on something other than a getter
+ */
+export function Memoized<T = unknown>(
+	target: object,
+	propertyKey: string | symbol,
+	descriptor?: TypedPropertyDescriptor<T>,
+): TypedPropertyDescriptor<T> {
+	const originalGetter = descriptor?.get;
+	assert(originalGetter, '@Memoized can only be used on getters');
+
+	// Replace the original getter for the first call
+	descriptor.get = function (this: typeof target.constructor): T {
+		const value = originalGetter.call(this);
+		// Add a property on the class instance to stop reading from the getter on class prototype
+		Object.defineProperty(this, propertyKey, {
+			value,
+			configurable: false,
+			enumerable: false,
+			writable: false,
+		});
+		return value;
+	};
+
+	return descriptor;
+}
diff --git a/packages/core/src/error-reporter.ts b/packages/core/src/error-reporter.ts
new file mode 100644
index 0000000000000..b6fc936daaa7a
--- /dev/null
+++ b/packages/core/src/error-reporter.ts
@@ -0,0 +1,162 @@
+import type { NodeOptions } from '@sentry/node';
+import { close } from '@sentry/node';
+import type { ErrorEvent, EventHint } from '@sentry/types';
+import { AxiosError } from 'axios';
+import { ApplicationError, LoggerProxy, type ReportingOptions } from 'n8n-workflow';
+import { createHash } from 'node:crypto';
+import { Service } from 'typedi';
+
+import type { InstanceType } from './InstanceSettings';
+
+@Service()
+export class ErrorReporter {
+	/** Hashes of error stack traces, to deduplicate error reports. */
+	private seenErrors = new Set<string>();
+
+	private report: (error: Error | string, options?: ReportingOptions) => void;
+
+	constructor() {
+		// eslint-disable-next-line @typescript-eslint/unbound-method
+		this.report = this.defaultReport;
+	}
+
+	private defaultReport(error: Error | string, options?: ReportingOptions) {
+		if (error instanceof Error) {
+			let e = error;
+
+			const { executionId } = options ?? {};
+			const context = executionId ? ` (execution ${executionId})` : '';
+
+			do {
+				const msg = [e.message + context, e.stack ? `\n${e.stack}\n` : ''].join('');
+				const meta = e instanceof ApplicationError ? e.extra : undefined;
+				LoggerProxy.error(msg, meta);
+				e = e.cause as Error;
+			} while (e);
+		}
+	}
+
+	async shutdown(timeoutInMs = 1000) {
+		await close(timeoutInMs);
+	}
+
+	async init(instanceType: InstanceType | 'task_runner', dsn: string) {
+		process.on('uncaughtException', (error) => {
+			this.error(error);
+		});
+
+		if (!dsn) return;
+
+		// Collect longer stacktraces
+		Error.stackTraceLimit = 50;
+
+		const {
+			N8N_VERSION: release,
+			ENVIRONMENT: environment,
+			DEPLOYMENT_NAME: serverName,
+		} = process.env;
+
+		const { init, captureException, setTag } = await import('@sentry/node');
+		const { requestDataIntegration, rewriteFramesIntegration } = await import('@sentry/node');
+
+		const enabledIntegrations = [
+			'InboundFilters',
+			'FunctionToString',
+			'LinkedErrors',
+			'OnUnhandledRejection',
+			'ContextLines',
+		];
+
+		init({
+			dsn,
+			release,
+			environment,
+			enableTracing: false,
+			serverName,
+			beforeBreadcrumb: () => null,
+			beforeSend: this.beforeSend.bind(this) as NodeOptions['beforeSend'],
+			integrations: (integrations) => [
+				...integrations.filter(({ name }) => enabledIntegrations.includes(name)),
+				rewriteFramesIntegration({ root: process.cwd() }),
+				requestDataIntegration({
+					include: {
+						cookies: false,
+						data: false,
+						headers: false,
+						query_string: false,
+						url: true,
+						user: false,
+					},
+				}),
+			],
+		});
+
+		setTag('server_type', instanceType);
+
+		this.report = (error, options) => captureException(error, options);
+	}
+
+	async beforeSend(event: ErrorEvent, { originalException }: EventHint) {
+		if (!originalException) return null;
+
+		if (originalException instanceof Promise) {
+			originalException = await originalException.catch((error) => error as Error);
+		}
+
+		if (originalException instanceof AxiosError) return null;
+
+		if (
+			originalException instanceof Error &&
+			originalException.name === 'QueryFailedError' &&
+			['SQLITE_FULL', 'SQLITE_IOERR'].some((errMsg) => originalException.message.includes(errMsg))
+		) {
+			return null;
+		}
+
+		if (originalException instanceof ApplicationError) {
+			const { level, extra, tags } = originalException;
+			if (level === 'warning') return null;
+			event.level = level;
+			if (extra) event.extra = { ...event.extra, ...extra };
+			if (tags) event.tags = { ...event.tags, ...tags };
+		}
+
+		if (
+			originalException instanceof Error &&
+			'cause' in originalException &&
+			originalException.cause instanceof Error &&
+			'level' in originalException.cause &&
+			originalException.cause.level === 'warning'
+		) {
+			// handle underlying errors propagating from dependencies like ai-assistant-sdk
+			return null;
+		}
+
+		if (originalException instanceof Error && originalException.stack) {
+			const eventHash = createHash('sha1').update(originalException.stack).digest('base64');
+			if (this.seenErrors.has(eventHash)) return null;
+			this.seenErrors.add(eventHash);
+		}
+
+		return event;
+	}
+
+	error(e: unknown, options?: ReportingOptions) {
+		const toReport = this.wrap(e);
+		if (toReport) this.report(toReport, options);
+	}
+
+	warn(warning: Error | string, options?: ReportingOptions) {
+		this.error(warning, { ...options, level: 'warning' });
+	}
+
+	info(msg: string, options?: ReportingOptions) {
+		this.report(msg, { ...options, level: 'info' });
+	}
+
+	private wrap(e: unknown) {
+		if (e instanceof Error) return e;
+		if (typeof e === 'string') return new ApplicationError(e);
+		return;
+	}
+}
diff --git a/packages/core/src/errors/index.ts b/packages/core/src/errors/index.ts
index c280ecb30dcba..38cd481c257dd 100644
--- a/packages/core/src/errors/index.ts
+++ b/packages/core/src/errors/index.ts
@@ -3,3 +3,5 @@ export { DisallowedFilepathError } from './disallowed-filepath.error';
 export { InvalidModeError } from './invalid-mode.error';
 export { InvalidManagerError } from './invalid-manager.error';
 export { InvalidExecutionMetadataError } from './invalid-execution-metadata.error';
+export { UnrecognizedCredentialTypeError } from './unrecognized-credential-type.error';
+export { UnrecognizedNodeTypeError } from './unrecognized-node-type.error';
diff --git a/packages/core/src/errors/unrecognized-credential-type.error.ts b/packages/core/src/errors/unrecognized-credential-type.error.ts
new file mode 100644
index 0000000000000..c60b576bca244
--- /dev/null
+++ b/packages/core/src/errors/unrecognized-credential-type.error.ts
@@ -0,0 +1,9 @@
+import { ApplicationError } from 'n8n-workflow';
+
+export class UnrecognizedCredentialTypeError extends ApplicationError {
+	severity = 'warning';
+
+	constructor(credentialType: string) {
+		super(`Unrecognized credential type: ${credentialType}`);
+	}
+}
diff --git a/packages/cli/src/errors/unrecognized-node-type.error.ts b/packages/core/src/errors/unrecognized-node-type.error.ts
similarity index 55%
rename from packages/cli/src/errors/unrecognized-node-type.error.ts
rename to packages/core/src/errors/unrecognized-node-type.error.ts
index 1ca5281de5913..6ca5e34e40d05 100644
--- a/packages/cli/src/errors/unrecognized-node-type.error.ts
+++ b/packages/core/src/errors/unrecognized-node-type.error.ts
@@ -3,7 +3,7 @@ import { ApplicationError } from 'n8n-workflow';
 export class UnrecognizedNodeTypeError extends ApplicationError {
 	severity = 'warning';
 
-	constructor(nodeType: string) {
-		super(`Unrecognized node type: ${nodeType}".`);
+	constructor(packageName: string, nodeType: string) {
+		super(`Unrecognized node type: ${packageName}.${nodeType}`);
 	}
 }
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 9c141867dee1d..bec9767ffa923 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -1,17 +1,18 @@
 import * as NodeExecuteFunctions from './NodeExecuteFunctions';
 
+export * from './decorators';
 export * from './errors';
 export * from './ActiveWorkflows';
 export * from './BinaryData/BinaryData.service';
 export * from './BinaryData/types';
 export { Cipher } from './Cipher';
-export * from './ClassLoader';
 export * from './Constants';
 export * from './Credentials';
 export * from './DirectoryLoader';
 export * from './Interfaces';
 export { InstanceSettings, InstanceType } from './InstanceSettings';
 export * from './NodeExecuteFunctions';
+export * from './RoutingNode';
 export * from './WorkflowExecute';
 export { NodeExecuteFunctions };
 export * from './data-deduplication-service';
@@ -22,3 +23,6 @@ export { isStoredMode as isValidNonDefaultMode } from './BinaryData/utils';
 export * from './ExecutionMetadata';
 export * from './node-execution-context';
 export * from './PartialExecutionUtils';
+export { ErrorReporter } from './error-reporter';
+export * from './SerializedBuffer';
+export { isObjectLiteral } from './utils';
diff --git a/packages/core/src/node-execution-context/__tests__/execute-context.test.ts b/packages/core/src/node-execution-context/__tests__/execute-context.test.ts
index 723bab24f3e47..a888a5a7ffc0b 100644
--- a/packages/core/src/node-execution-context/__tests__/execute-context.test.ts
+++ b/packages/core/src/node-execution-context/__tests__/execute-context.test.ts
@@ -14,7 +14,7 @@ import type {
 	INodeTypes,
 	ICredentialDataDecryptedObject,
 } from 'n8n-workflow';
-import { ApplicationError, ExpressionError } from 'n8n-workflow';
+import { ApplicationError, ExpressionError, NodeConnectionType } from 'n8n-workflow';
 
 import { describeCommonTests } from './shared-tests';
 import { ExecuteContext } from '../execute-context';
@@ -92,33 +92,39 @@ describe('ExecuteContext', () => {
 
 	describe('getInputData', () => {
 		const inputIndex = 0;
-		const inputName = 'main';
+		const connectionType = NodeConnectionType.Main;
 
 		afterEach(() => {
-			inputData[inputName] = [[{ json: { test: 'data' } }]];
+			inputData[connectionType] = [[{ json: { test: 'data' } }]];
 		});
 
 		it('should return the input data correctly', () => {
 			const expectedData = [{ json: { test: 'data' } }];
 
-			expect(executeContext.getInputData(inputIndex, inputName)).toEqual(expectedData);
+			expect(executeContext.getInputData(inputIndex, connectionType)).toEqual(expectedData);
 		});
 
 		it('should return an empty array if the input name does not exist', () => {
-			const inputName = 'nonExistent';
-			expect(executeContext.getInputData(inputIndex, inputName)).toEqual([]);
+			const connectionType = 'nonExistent';
+			expect(executeContext.getInputData(inputIndex, connectionType as NodeConnectionType)).toEqual(
+				[],
+			);
 		});
 
 		it('should throw an error if the input index is out of range', () => {
 			const inputIndex = 2;
 
-			expect(() => executeContext.getInputData(inputIndex, inputName)).toThrow(ApplicationError);
+			expect(() => executeContext.getInputData(inputIndex, connectionType)).toThrow(
+				ApplicationError,
+			);
 		});
 
 		it('should throw an error if the input index was not set', () => {
 			inputData.main[inputIndex] = null;
 
-			expect(() => executeContext.getInputData(inputIndex, inputName)).toThrow(ApplicationError);
+			expect(() => executeContext.getInputData(inputIndex, connectionType)).toThrow(
+				ApplicationError,
+			);
 		});
 	});
 
diff --git a/packages/core/src/node-execution-context/__tests__/execute-single-context.test.ts b/packages/core/src/node-execution-context/__tests__/execute-single-context.test.ts
index e62c2b0f4632d..6c1b9f108955c 100644
--- a/packages/core/src/node-execution-context/__tests__/execute-single-context.test.ts
+++ b/packages/core/src/node-execution-context/__tests__/execute-single-context.test.ts
@@ -14,7 +14,7 @@ import type {
 	INodeTypes,
 	ICredentialDataDecryptedObject,
 } from 'n8n-workflow';
-import { ApplicationError } from 'n8n-workflow';
+import { ApplicationError, NodeConnectionType } from 'n8n-workflow';
 
 import { describeCommonTests } from './shared-tests';
 import { ExecuteSingleContext } from '../execute-single-context';
@@ -91,29 +91,31 @@ describe('ExecuteSingleContext', () => {
 
 	describe('getInputData', () => {
 		const inputIndex = 0;
-		const inputName = 'main';
+		const connectionType = NodeConnectionType.Main;
 
 		afterEach(() => {
-			inputData[inputName] = [[{ json: { test: 'data' } }]];
+			inputData[connectionType] = [[{ json: { test: 'data' } }]];
 		});
 
 		it('should return the input data correctly', () => {
 			const expectedData = { json: { test: 'data' } };
 
-			expect(executeSingleContext.getInputData(inputIndex, inputName)).toEqual(expectedData);
+			expect(executeSingleContext.getInputData(inputIndex, connectionType)).toEqual(expectedData);
 		});
 
 		it('should return an empty object if the input name does not exist', () => {
-			const inputName = 'nonExistent';
+			const connectionType = 'nonExistent';
 			const expectedData = { json: {} };
 
-			expect(executeSingleContext.getInputData(inputIndex, inputName)).toEqual(expectedData);
+			expect(
+				executeSingleContext.getInputData(inputIndex, connectionType as NodeConnectionType),
+			).toEqual(expectedData);
 		});
 
 		it('should throw an error if the input index is out of range', () => {
 			const inputIndex = 1;
 
-			expect(() => executeSingleContext.getInputData(inputIndex, inputName)).toThrow(
+			expect(() => executeSingleContext.getInputData(inputIndex, connectionType)).toThrow(
 				ApplicationError,
 			);
 		});
@@ -121,7 +123,7 @@ describe('ExecuteSingleContext', () => {
 		it('should throw an error if the input index was not set', () => {
 			inputData.main[inputIndex] = null;
 
-			expect(() => executeSingleContext.getInputData(inputIndex, inputName)).toThrow(
+			expect(() => executeSingleContext.getInputData(inputIndex, connectionType)).toThrow(
 				ApplicationError,
 			);
 		});
@@ -129,7 +131,7 @@ describe('ExecuteSingleContext', () => {
 		it('should throw an error if the value of input with given index was not set', () => {
 			delete inputData.main[inputIndex]![itemIndex];
 
-			expect(() => executeSingleContext.getInputData(inputIndex, inputName)).toThrow(
+			expect(() => executeSingleContext.getInputData(inputIndex, connectionType)).toThrow(
 				ApplicationError,
 			);
 		});
diff --git a/packages/core/src/node-execution-context/__tests__/node-execution-context.test.ts b/packages/core/src/node-execution-context/__tests__/node-execution-context.test.ts
index 95ed62337e559..443460bb33706 100644
--- a/packages/core/src/node-execution-context/__tests__/node-execution-context.test.ts
+++ b/packages/core/src/node-execution-context/__tests__/node-execution-context.test.ts
@@ -1,11 +1,15 @@
 import { mock } from 'jest-mock-extended';
 import type {
+	Expression,
 	INode,
+	INodeType,
+	INodeTypes,
 	INodeExecutionData,
 	IWorkflowExecuteAdditionalData,
 	Workflow,
 	WorkflowExecuteMode,
 } from 'n8n-workflow';
+import { NodeConnectionType } from 'n8n-workflow';
 import { Container } from 'typedi';
 
 import { InstanceSettings } from '@/InstanceSettings';
@@ -18,23 +22,29 @@ describe('NodeExecutionContext', () => {
 	const instanceSettings = mock<InstanceSettings>({ instanceId: 'abc123' });
 	Container.set(InstanceSettings, instanceSettings);
 
+	const node = mock<INode>();
+	const nodeType = mock<INodeType>({ description: mock() });
+	const nodeTypes = mock<INodeTypes>();
+	const expression = mock<Expression>();
 	const workflow = mock<Workflow>({
 		id: '123',
 		name: 'Test Workflow',
 		active: true,
-		nodeTypes: mock(),
+		nodeTypes,
 		timezone: 'UTC',
+		expression,
 	});
-	const node = mock<INode>();
 	let additionalData = mock<IWorkflowExecuteAdditionalData>({
 		credentialsHelper: mock(),
 	});
 
 	const mode: WorkflowExecuteMode = 'manual';
-	const testContext = new TestContext(workflow, node, additionalData, mode);
+	let testContext: TestContext;
 
 	beforeEach(() => {
 		jest.clearAllMocks();
+		testContext = new TestContext(workflow, node, additionalData, mode);
+		nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
 	});
 
 	describe('getNode', () => {
@@ -79,7 +89,7 @@ describe('NodeExecutionContext', () => {
 
 			const result = testContext.getChildNodes('Test Node');
 
-			expect(result).toEqual([
+			expect(result).toMatchObject([
 				{ name: 'Child Node 1', type: 'testType1', typeVersion: 1 },
 				{ name: 'Child Node 2', type: 'testType2', typeVersion: 2 },
 			]);
@@ -98,7 +108,7 @@ describe('NodeExecutionContext', () => {
 
 			const result = testContext.getParentNodes('Test Node');
 
-			expect(result).toEqual([
+			expect(result).toMatchObject([
 				{ name: 'Parent Node 1', type: 'testType1', typeVersion: 1 },
 				{ name: 'Parent Node 2', type: 'testType2', typeVersion: 2 },
 			]);
@@ -106,9 +116,9 @@ describe('NodeExecutionContext', () => {
 	});
 
 	describe('getKnownNodeTypes', () => {
-		it('should call getKnownTypes method of workflow.nodeTypes', () => {
+		it('should call getKnownTypes method of nodeTypes', () => {
 			testContext.getKnownNodeTypes();
-			expect(workflow.nodeTypes.getKnownTypes).toHaveBeenCalled();
+			expect(nodeTypes.getKnownTypes).toHaveBeenCalled();
 		});
 	});
 
@@ -165,4 +175,164 @@ describe('NodeExecutionContext', () => {
 			expect(result).toEqual([outputData]);
 		});
 	});
+
+	describe('getNodeInputs', () => {
+		it('should return static inputs array when inputs is an array', () => {
+			nodeType.description.inputs = [NodeConnectionType.Main, NodeConnectionType.AiLanguageModel];
+
+			const result = testContext.getNodeInputs();
+
+			expect(result).toEqual([
+				{ type: NodeConnectionType.Main },
+				{ type: NodeConnectionType.AiLanguageModel },
+			]);
+		});
+
+		it('should return input objects when inputs contains configurations', () => {
+			nodeType.description.inputs = [
+				{ type: NodeConnectionType.Main },
+				{ type: NodeConnectionType.AiLanguageModel, required: true },
+			];
+
+			const result = testContext.getNodeInputs();
+
+			expect(result).toEqual([
+				{ type: NodeConnectionType.Main },
+				{ type: NodeConnectionType.AiLanguageModel, required: true },
+			]);
+		});
+
+		it('should evaluate dynamic inputs when inputs is a function', () => {
+			const inputsExpressions = '={{ ["main", "ai_languageModel"] }}';
+			nodeType.description.inputs = inputsExpressions;
+			expression.getSimpleParameterValue.mockReturnValue([
+				NodeConnectionType.Main,
+				NodeConnectionType.AiLanguageModel,
+			]);
+
+			const result = testContext.getNodeInputs();
+
+			expect(result).toEqual([
+				{ type: NodeConnectionType.Main },
+				{ type: NodeConnectionType.AiLanguageModel },
+			]);
+			expect(expression.getSimpleParameterValue).toHaveBeenCalledWith(
+				node,
+				inputsExpressions,
+				'internal',
+				{},
+			);
+		});
+	});
+
+	describe('getNodeOutputs', () => {
+		it('should return static outputs array when outputs is an array', () => {
+			nodeType.description.outputs = [NodeConnectionType.Main, NodeConnectionType.AiLanguageModel];
+
+			const result = testContext.getNodeOutputs();
+
+			expect(result).toEqual([
+				{ type: NodeConnectionType.Main },
+				{ type: NodeConnectionType.AiLanguageModel },
+			]);
+		});
+
+		it('should return output objects when outputs contains configurations', () => {
+			nodeType.description.outputs = [
+				{ type: NodeConnectionType.Main },
+				{ type: NodeConnectionType.AiLanguageModel, required: true },
+			];
+
+			const result = testContext.getNodeOutputs();
+
+			expect(result).toEqual([
+				{ type: NodeConnectionType.Main },
+				{ type: NodeConnectionType.AiLanguageModel, required: true },
+			]);
+		});
+
+		it('should evaluate dynamic outputs when outputs is a function', () => {
+			const outputsExpressions = '={{ ["main", "ai_languageModel"] }}';
+			nodeType.description.outputs = outputsExpressions;
+			expression.getSimpleParameterValue.mockReturnValue([
+				NodeConnectionType.Main,
+				NodeConnectionType.AiLanguageModel,
+			]);
+
+			const result = testContext.getNodeOutputs();
+
+			expect(result).toEqual([
+				{ type: NodeConnectionType.Main },
+				{ type: NodeConnectionType.AiLanguageModel },
+			]);
+			expect(expression.getSimpleParameterValue).toHaveBeenCalledWith(
+				node,
+				outputsExpressions,
+				'internal',
+				{},
+			);
+		});
+
+		it('should add error output when node has continueOnFail error handling', () => {
+			const nodeWithError = mock<INode>({ onError: 'continueErrorOutput' });
+			const contextWithError = new TestContext(workflow, nodeWithError, additionalData, mode);
+			nodeType.description.outputs = [NodeConnectionType.Main];
+
+			const result = contextWithError.getNodeOutputs();
+
+			expect(result).toEqual([
+				{ type: NodeConnectionType.Main, displayName: 'Success' },
+				{ type: NodeConnectionType.Main, displayName: 'Error', category: 'error' },
+			]);
+		});
+	});
+
+	describe('getConnectedNodes', () => {
+		it('should return connected nodes of given type', () => {
+			const node1 = mock<INode>({ name: 'Node 1', type: 'test', disabled: false });
+			const node2 = mock<INode>({ name: 'Node 2', type: 'test', disabled: false });
+
+			workflow.getParentNodes.mockReturnValue(['Node 1', 'Node 2']);
+			workflow.getNode.mockImplementation((name) => {
+				if (name === 'Node 1') return node1;
+				if (name === 'Node 2') return node2;
+				return null;
+			});
+
+			const result = testContext.getConnectedNodes(NodeConnectionType.Main);
+
+			expect(result).toEqual([node1, node2]);
+			expect(workflow.getParentNodes).toHaveBeenCalledWith(node.name, NodeConnectionType.Main, 1);
+		});
+
+		it('should filter out disabled nodes', () => {
+			const node1 = mock<INode>({ name: 'Node 1', type: 'test', disabled: false });
+			const node2 = mock<INode>({ name: 'Node 2', type: 'test', disabled: true });
+
+			workflow.getParentNodes.mockReturnValue(['Node 1', 'Node 2']);
+			workflow.getNode.mockImplementation((name) => {
+				if (name === 'Node 1') return node1;
+				if (name === 'Node 2') return node2;
+				return null;
+			});
+
+			const result = testContext.getConnectedNodes(NodeConnectionType.Main);
+
+			expect(result).toEqual([node1]);
+		});
+
+		it('should filter out non-existent nodes', () => {
+			const node1 = mock<INode>({ name: 'Node 1', type: 'test', disabled: false });
+
+			workflow.getParentNodes.mockReturnValue(['Node 1', 'NonExistent']);
+			workflow.getNode.mockImplementation((name) => {
+				if (name === 'Node 1') return node1;
+				return null;
+			});
+
+			const result = testContext.getConnectedNodes(NodeConnectionType.Main);
+
+			expect(result).toEqual([node1]);
+		});
+	});
 });
diff --git a/packages/core/src/node-execution-context/__tests__/supply-data-context.test.ts b/packages/core/src/node-execution-context/__tests__/supply-data-context.test.ts
index 6c5a3849dda22..99ee41c6fda3a 100644
--- a/packages/core/src/node-execution-context/__tests__/supply-data-context.test.ts
+++ b/packages/core/src/node-execution-context/__tests__/supply-data-context.test.ts
@@ -14,7 +14,7 @@ import type {
 	INodeTypes,
 	ICredentialDataDecryptedObject,
 } from 'n8n-workflow';
-import { ApplicationError } from 'n8n-workflow';
+import { ApplicationError, NodeConnectionType } from 'n8n-workflow';
 
 import { describeCommonTests } from './shared-tests';
 import { SupplyDataContext } from '../supply-data-context';
@@ -56,7 +56,8 @@ describe('SupplyDataContext', () => {
 	const mode: WorkflowExecuteMode = 'manual';
 	const runExecutionData = mock<IRunExecutionData>();
 	const connectionInputData: INodeExecutionData[] = [];
-	const inputData: ITaskDataConnections = { main: [[{ json: { test: 'data' } }]] };
+	const connectionType = NodeConnectionType.Main;
+	const inputData: ITaskDataConnections = { [connectionType]: [[{ json: { test: 'data' } }]] };
 	const executeData = mock<IExecuteData>();
 	const runIndex = 0;
 	const closeFn = jest.fn();
@@ -71,6 +72,7 @@ describe('SupplyDataContext', () => {
 		runIndex,
 		connectionInputData,
 		inputData,
+		connectionType,
 		executeData,
 		[closeFn],
 		abortSignal,
@@ -91,33 +93,38 @@ describe('SupplyDataContext', () => {
 
 	describe('getInputData', () => {
 		const inputIndex = 0;
-		const inputName = 'main';
 
 		afterEach(() => {
-			inputData[inputName] = [[{ json: { test: 'data' } }]];
+			inputData[connectionType] = [[{ json: { test: 'data' } }]];
 		});
 
 		it('should return the input data correctly', () => {
 			const expectedData = [{ json: { test: 'data' } }];
 
-			expect(supplyDataContext.getInputData(inputIndex, inputName)).toEqual(expectedData);
+			expect(supplyDataContext.getInputData(inputIndex, connectionType)).toEqual(expectedData);
 		});
 
 		it('should return an empty array if the input name does not exist', () => {
-			const inputName = 'nonExistent';
-			expect(supplyDataContext.getInputData(inputIndex, inputName)).toEqual([]);
+			const connectionType = 'nonExistent';
+			expect(
+				supplyDataContext.getInputData(inputIndex, connectionType as NodeConnectionType),
+			).toEqual([]);
 		});
 
 		it('should throw an error if the input index is out of range', () => {
 			const inputIndex = 2;
 
-			expect(() => supplyDataContext.getInputData(inputIndex, inputName)).toThrow(ApplicationError);
+			expect(() => supplyDataContext.getInputData(inputIndex, connectionType)).toThrow(
+				ApplicationError,
+			);
 		});
 
 		it('should throw an error if the input index was not set', () => {
 			inputData.main[inputIndex] = null;
 
-			expect(() => supplyDataContext.getInputData(inputIndex, inputName)).toThrow(ApplicationError);
+			expect(() => supplyDataContext.getInputData(inputIndex, connectionType)).toThrow(
+				ApplicationError,
+			);
 		});
 	});
 
diff --git a/packages/core/src/node-execution-context/base-execute-context.ts b/packages/core/src/node-execution-context/base-execute-context.ts
index 0794a263b019a..24b9e89301fca 100644
--- a/packages/core/src/node-execution-context/base-execute-context.ts
+++ b/packages/core/src/node-execution-context/base-execute-context.ts
@@ -16,13 +16,17 @@ import type {
 	ITaskMetadata,
 	ContextType,
 	IContextObject,
-	INodeInputConfiguration,
-	INodeOutputConfiguration,
 	IWorkflowDataProxyData,
 	ISourceData,
 	AiEvent,
 } from 'n8n-workflow';
-import { ApplicationError, NodeHelpers, WAIT_INDEFINITELY, WorkflowDataProxy } from 'n8n-workflow';
+import {
+	ApplicationError,
+	NodeHelpers,
+	NodeConnectionType,
+	WAIT_INDEFINITELY,
+	WorkflowDataProxy,
+} from 'n8n-workflow';
 import { Container } from 'typedi';
 
 import { BinaryDataService } from '@/BinaryData/BinaryData.service';
@@ -137,32 +141,30 @@ export class BaseExecuteContext extends NodeExecutionContext {
 		return { ...result, data };
 	}
 
-	getNodeInputs(): INodeInputConfiguration[] {
-		const nodeType = this.workflow.nodeTypes.getByNameAndVersion(
-			this.node.type,
-			this.node.typeVersion,
-		);
-		return NodeHelpers.getNodeInputs(this.workflow, this.node, nodeType.description).map((input) =>
-			typeof input === 'string' ? { type: input } : input,
-		);
-	}
+	protected getInputItems(inputIndex: number, connectionType: NodeConnectionType) {
+		const inputData = this.inputData[connectionType];
+		if (inputData.length < inputIndex) {
+			throw new ApplicationError('Could not get input with given index', {
+				extra: { inputIndex, connectionType },
+			});
+		}
 
-	getNodeOutputs(): INodeOutputConfiguration[] {
-		const nodeType = this.workflow.nodeTypes.getByNameAndVersion(
-			this.node.type,
-			this.node.typeVersion,
-		);
-		return NodeHelpers.getNodeOutputs(this.workflow, this.node, nodeType.description).map(
-			(output) => (typeof output === 'string' ? { type: output } : output),
-		);
+		const allItems = inputData[inputIndex] as INodeExecutionData[] | null | undefined;
+		if (allItems === null) {
+			throw new ApplicationError('Input index was not set', {
+				extra: { inputIndex, connectionType },
+			});
+		}
+
+		return allItems;
 	}
 
-	getInputSourceData(inputIndex = 0, inputName = 'main'): ISourceData {
+	getInputSourceData(inputIndex = 0, connectionType = NodeConnectionType.Main): ISourceData {
 		if (this.executeData?.source === null) {
 			// Should never happen as n8n sets it automatically
 			throw new ApplicationError('Source data is missing');
 		}
-		return this.executeData.source[inputName][inputIndex]!;
+		return this.executeData.source[connectionType][inputIndex]!;
 	}
 
 	getWorkflowDataProxy(itemIndex: number): IWorkflowDataProxyData {
diff --git a/packages/core/src/node-execution-context/execute-context.ts b/packages/core/src/node-execution-context/execute-context.ts
index c587fb2168614..f3e32608f3395 100644
--- a/packages/core/src/node-execution-context/execute-context.ts
+++ b/packages/core/src/node-execution-context/execute-context.ts
@@ -1,7 +1,7 @@
 import type {
+	AINodeConnectionType,
 	CallbackManager,
 	CloseFunction,
-	ExecutionBaseError,
 	IExecuteData,
 	IExecuteFunctions,
 	IExecuteResponsePromiseData,
@@ -10,23 +10,24 @@ import type {
 	INodeExecutionData,
 	IRunExecutionData,
 	ITaskDataConnections,
-	ITaskMetadata,
 	IWorkflowExecuteAdditionalData,
-	NodeConnectionType,
+	Result,
 	Workflow,
 	WorkflowExecuteMode,
 } from 'n8n-workflow';
-import { ApplicationError, createDeferredPromise } from 'n8n-workflow';
+import {
+	ApplicationError,
+	createDeferredPromise,
+	createEnvProviderState,
+	NodeConnectionType,
+} from 'n8n-workflow';
 
-import { createAgentStartJob } from '@/Agent';
 // eslint-disable-next-line import/no-cycle
 import {
 	returnJsonArray,
 	copyInputItems,
 	normalizeItems,
 	constructExecutionMetaData,
-	getInputConnectionData,
-	addExecutionDataFunctions,
 	assertBinaryData,
 	getBinaryDataBuffer,
 	copyBinaryFile,
@@ -35,9 +36,11 @@ import {
 	getSSHTunnelFunctions,
 	getFileSystemHelperFunctions,
 	getCheckProcessedHelperFunctions,
+	detectBinaryEncoding,
 } from '@/NodeExecuteFunctions';
 
 import { BaseExecuteContext } from './base-execute-context';
+import { getInputConnectionData } from './utils/getInputConnectionData';
 
 export class ExecuteContext extends BaseExecuteContext implements IExecuteFunctions {
 	readonly helpers: IExecuteFunctions['helpers'];
@@ -46,8 +49,6 @@ export class ExecuteContext extends BaseExecuteContext implements IExecuteFuncti
 
 	readonly getNodeParameter: IExecuteFunctions['getNodeParameter'];
 
-	readonly startJob: IExecuteFunctions['startJob'];
-
 	constructor(
 		workflow: Workflow,
 		node: INode,
@@ -96,6 +97,7 @@ export class ExecuteContext extends BaseExecuteContext implements IExecuteFuncti
 				assertBinaryData(inputData, node, itemIndex, propertyName, 0),
 			getBinaryDataBuffer: async (itemIndex, propertyName) =>
 				await getBinaryDataBuffer(inputData, itemIndex, propertyName, 0),
+			detectBinaryEncoding: (buffer: Buffer) => detectBinaryEncoding(buffer),
 		};
 
 		this.nodeHelpers = {
@@ -122,23 +124,37 @@ export class ExecuteContext extends BaseExecuteContext implements IExecuteFuncti
 				fallbackValue,
 				options,
 			)) as IExecuteFunctions['getNodeParameter'];
+	}
 
-		this.startJob = createAgentStartJob(
+	async startJob<T = unknown, E = unknown>(
+		jobType: string,
+		settings: unknown,
+		itemIndex: number,
+	): Promise<Result<T, E>> {
+		return await this.additionalData.startAgentJob<T, E>(
 			this.additionalData,
+			jobType,
+			settings,
+			this,
 			this.inputData,
 			this.node,
 			this.workflow,
 			this.runExecutionData,
 			this.runIndex,
+			itemIndex,
 			this.node.name,
 			this.connectionInputData,
 			{},
 			this.mode,
+			createEnvProviderState(),
 			this.executeData,
 		);
 	}
 
-	async getInputConnectionData(inputName: NodeConnectionType, itemIndex: number): Promise<unknown> {
+	async getInputConnectionData(
+		connectionType: AINodeConnectionType,
+		itemIndex: number,
+	): Promise<unknown> {
 		return await getInputConnectionData.call(
 			this,
 			this.workflow,
@@ -150,33 +166,18 @@ export class ExecuteContext extends BaseExecuteContext implements IExecuteFuncti
 			this.executeData,
 			this.mode,
 			this.closeFunctions,
-			inputName,
+			connectionType,
 			itemIndex,
 			this.abortSignal,
 		);
 	}
 
-	getInputData(inputIndex = 0, inputName = 'main') {
-		if (!this.inputData.hasOwnProperty(inputName)) {
+	getInputData(inputIndex = 0, connectionType = NodeConnectionType.Main) {
+		if (!this.inputData.hasOwnProperty(connectionType)) {
 			// Return empty array because else it would throw error when nothing is connected to input
 			return [];
 		}
-
-		const inputData = this.inputData[inputName];
-		// TODO: Check if nodeType has input with that index defined
-		if (inputData.length < inputIndex) {
-			throw new ApplicationError('Could not get input with given index', {
-				extra: { inputIndex, inputName },
-			});
-		}
-
-		if (inputData[inputIndex] === null) {
-			throw new ApplicationError('Value of input was not set', {
-				extra: { inputIndex, inputName },
-			});
-		}
-
-		return inputData[inputIndex];
+		return super.getInputItems(inputIndex, connectionType) ?? [];
 	}
 
 	logNodeOutput(...args: unknown[]): void {
@@ -194,60 +195,14 @@ export class ExecuteContext extends BaseExecuteContext implements IExecuteFuncti
 		await this.additionalData.hooks?.executeHookFunctions('sendResponse', [response]);
 	}
 
-	addInputData(
-		connectionType: NodeConnectionType,
-		data: INodeExecutionData[][] | ExecutionBaseError,
-	): { index: number } {
-		const nodeName = this.node.name;
-		let currentNodeRunIndex = 0;
-		if (this.runExecutionData.resultData.runData.hasOwnProperty(nodeName)) {
-			currentNodeRunIndex = this.runExecutionData.resultData.runData[nodeName].length;
-		}
-
-		void addExecutionDataFunctions(
-			'input',
-			nodeName,
-			data,
-			this.runExecutionData,
-			connectionType,
-			this.additionalData,
-			nodeName,
-			this.runIndex,
-			currentNodeRunIndex,
-		).catch((error) => {
-			this.logger.warn(
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-				`There was a problem logging input data of node "${nodeName}": ${error.message}`,
-			);
-		});
-
-		return { index: currentNodeRunIndex };
+	/** @deprecated use ISupplyDataFunctions.addInputData */
+	addInputData(): { index: number } {
+		throw new ApplicationError('addInputData should not be called on IExecuteFunctions');
 	}
 
-	addOutputData(
-		connectionType: NodeConnectionType,
-		currentNodeRunIndex: number,
-		data: INodeExecutionData[][] | ExecutionBaseError,
-		metadata?: ITaskMetadata,
-	): void {
-		const nodeName = this.node.name;
-		addExecutionDataFunctions(
-			'output',
-			nodeName,
-			data,
-			this.runExecutionData,
-			connectionType,
-			this.additionalData,
-			nodeName,
-			this.runIndex,
-			currentNodeRunIndex,
-			metadata,
-		).catch((error) => {
-			this.logger.warn(
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-				`There was a problem logging output data of node "${nodeName}": ${error.message}`,
-			);
-		});
+	/** @deprecated use ISupplyDataFunctions.addOutputData */
+	addOutputData(): void {
+		throw new ApplicationError('addOutputData should not be called on IExecuteFunctions');
 	}
 
 	getParentCallbackManager(): CallbackManager | undefined {
diff --git a/packages/core/src/node-execution-context/execute-single-context.ts b/packages/core/src/node-execution-context/execute-single-context.ts
index 91c7fcf683030..af837a12c52ec 100644
--- a/packages/core/src/node-execution-context/execute-single-context.ts
+++ b/packages/core/src/node-execution-context/execute-single-context.ts
@@ -11,11 +11,12 @@ import type {
 	ITaskDataConnections,
 	IExecuteData,
 } from 'n8n-workflow';
-import { ApplicationError, createDeferredPromise } from 'n8n-workflow';
+import { ApplicationError, createDeferredPromise, NodeConnectionType } from 'n8n-workflow';
 
 // eslint-disable-next-line import/no-cycle
 import {
 	assertBinaryData,
+	detectBinaryEncoding,
 	getBinaryDataBuffer,
 	getBinaryHelperFunctions,
 	getRequestHelperFunctions,
@@ -69,6 +70,7 @@ export class ExecuteSingleContext extends BaseExecuteContext implements IExecute
 				assertBinaryData(inputData, node, itemIndex, propertyName, inputIndex),
 			getBinaryDataBuffer: async (propertyName, inputIndex = 0) =>
 				await getBinaryDataBuffer(inputData, itemIndex, propertyName, inputIndex),
+			detectBinaryEncoding: (buffer) => detectBinaryEncoding(buffer),
 		};
 	}
 
@@ -76,31 +78,18 @@ export class ExecuteSingleContext extends BaseExecuteContext implements IExecute
 		return super.evaluateExpression(expression, itemIndex);
 	}
 
-	getInputData(inputIndex = 0, inputName = 'main') {
-		if (!this.inputData.hasOwnProperty(inputName)) {
+	getInputData(inputIndex = 0, connectionType = NodeConnectionType.Main) {
+		if (!this.inputData.hasOwnProperty(connectionType)) {
 			// Return empty array because else it would throw error when nothing is connected to input
 			return { json: {} };
 		}
 
-		// TODO: Check if nodeType has input with that index defined
-		if (this.inputData[inputName].length < inputIndex) {
-			throw new ApplicationError('Could not get input index', {
-				extra: { inputIndex, inputName },
-			});
-		}
-
-		const allItems = this.inputData[inputName][inputIndex];
-
-		if (allItems === null || allItems === undefined) {
-			throw new ApplicationError('Input index was not set', {
-				extra: { inputIndex, inputName },
-			});
-		}
+		const allItems = super.getInputItems(inputIndex, connectionType);
 
-		const data = allItems[this.itemIndex];
-		if (data === null || data === undefined) {
+		const data = allItems?.[this.itemIndex];
+		if (data === undefined) {
 			throw new ApplicationError('Value of input with given index was not set', {
-				extra: { inputIndex, inputName, itemIndex: this.itemIndex },
+				extra: { inputIndex, connectionType, itemIndex: this.itemIndex },
 			});
 		}
 
diff --git a/packages/core/src/node-execution-context/index.ts b/packages/core/src/node-execution-context/index.ts
index 00c90266db98a..c3bcebbd44b6b 100644
--- a/packages/core/src/node-execution-context/index.ts
+++ b/packages/core/src/node-execution-context/index.ts
@@ -3,9 +3,11 @@ export { ExecuteContext } from './execute-context';
 export { ExecuteSingleContext } from './execute-single-context';
 export { HookContext } from './hook-context';
 export { LoadOptionsContext } from './load-options-context';
+export { LocalLoadOptionsContext } from './local-load-options-context';
 export { PollContext } from './poll-context';
+// eslint-disable-next-line import/no-cycle
 export { SupplyDataContext } from './supply-data-context';
 export { TriggerContext } from './trigger-context';
 export { WebhookContext } from './webhook-context';
 
-export { getAdditionalKeys } from './utils';
+export { getAdditionalKeys } from './utils/getAdditionalKeys';
diff --git a/packages/core/src/node-execution-context/local-load-options-context.ts b/packages/core/src/node-execution-context/local-load-options-context.ts
new file mode 100644
index 0000000000000..39456ff966808
--- /dev/null
+++ b/packages/core/src/node-execution-context/local-load-options-context.ts
@@ -0,0 +1,70 @@
+import lodash from 'lodash';
+import { ApplicationError, Workflow } from 'n8n-workflow';
+import type {
+	INodeParameterResourceLocator,
+	IWorkflowExecuteAdditionalData,
+	NodeParameterValueType,
+	ILocalLoadOptionsFunctions,
+	IWorkflowLoader,
+	IWorkflowNodeContext,
+	INodeTypes,
+} from 'n8n-workflow';
+
+import { LoadWorkflowNodeContext } from './workflow-node-context';
+
+export class LocalLoadOptionsContext implements ILocalLoadOptionsFunctions {
+	constructor(
+		private nodeTypes: INodeTypes,
+		private additionalData: IWorkflowExecuteAdditionalData,
+		private path: string,
+		private workflowLoader: IWorkflowLoader,
+	) {}
+
+	async getWorkflowNodeContext(nodeType: string): Promise<IWorkflowNodeContext | null> {
+		const { value: workflowId } = this.getCurrentNodeParameter(
+			'workflowId',
+		) as INodeParameterResourceLocator;
+
+		if (typeof workflowId !== 'string' || !workflowId) {
+			throw new ApplicationError(`No workflowId parameter defined on node of type "${nodeType}"!`);
+		}
+
+		const dbWorkflow = await this.workflowLoader.get(workflowId);
+
+		const selectedWorkflowNode = dbWorkflow.nodes.find((node) => node.type === nodeType);
+
+		if (selectedWorkflowNode) {
+			const selectedSingleNodeWorkflow = new Workflow({
+				nodes: [selectedWorkflowNode],
+				connections: {},
+				active: false,
+				nodeTypes: this.nodeTypes,
+			});
+
+			const workflowAdditionalData = {
+				...this.additionalData,
+				currentNodeParameters: selectedWorkflowNode.parameters,
+			};
+
+			return new LoadWorkflowNodeContext(
+				selectedSingleNodeWorkflow,
+				selectedWorkflowNode,
+				workflowAdditionalData,
+			);
+		}
+
+		return null;
+	}
+
+	getCurrentNodeParameter(parameterPath: string): NodeParameterValueType | object | undefined {
+		const nodeParameters = this.additionalData.currentNodeParameters;
+
+		if (parameterPath.startsWith('&')) {
+			parameterPath = `${this.path.split('.').slice(1, -1).join('.')}.${parameterPath.slice(1)}`;
+		}
+
+		const returnData = lodash.get(nodeParameters, parameterPath);
+
+		return returnData;
+	}
+}
diff --git a/packages/core/src/node-execution-context/node-execution-context.ts b/packages/core/src/node-execution-context/node-execution-context.ts
index c4bb0739fbc4a..8477fe7856992 100644
--- a/packages/core/src/node-execution-context/node-execution-context.ts
+++ b/packages/core/src/node-execution-context/node-execution-context.ts
@@ -9,8 +9,11 @@ import type {
 	INodeCredentialDescription,
 	INodeCredentialsDetails,
 	INodeExecutionData,
+	INodeInputConfiguration,
+	INodeOutputConfiguration,
 	IRunExecutionData,
 	IWorkflowExecuteAdditionalData,
+	NodeConnectionType,
 	NodeParameterValueType,
 	NodeTypeAndVersion,
 	Workflow,
@@ -27,15 +30,14 @@ import {
 import { Container } from 'typedi';
 
 import { HTTP_REQUEST_NODE_TYPE, HTTP_REQUEST_TOOL_NODE_TYPE } from '@/Constants';
+import { Memoized } from '@/decorators';
 import { extractValue } from '@/ExtractValue';
 import { InstanceSettings } from '@/InstanceSettings';
 
-import {
-	cleanupParameterData,
-	ensureType,
-	getAdditionalKeys,
-	validateValueAgainstSchema,
-} from './utils';
+import { cleanupParameterData } from './utils/cleanupParameterData';
+import { ensureType } from './utils/ensureType';
+import { getAdditionalKeys } from './utils/getAdditionalKeys';
+import { validateValueAgainstSchema } from './utils/validateValueAgainstSchema';
 
 export abstract class NodeExecutionContext implements Omit<FunctionsBase, 'getCredentials'> {
 	protected readonly instanceSettings = Container.get(InstanceSettings);
@@ -86,6 +88,7 @@ export abstract class NodeExecutionContext implements Omit<FunctionsBase, 'getCr
 				name: node.name,
 				type: node.type,
 				typeVersion: node.typeVersion,
+				disabled: node.disabled ?? false,
 			});
 		}
 		return output;
@@ -101,11 +104,48 @@ export abstract class NodeExecutionContext implements Omit<FunctionsBase, 'getCr
 				name: node.name,
 				type: node.type,
 				typeVersion: node.typeVersion,
+				disabled: node.disabled ?? false,
 			});
 		}
 		return output;
 	}
 
+	@Memoized
+	get nodeType() {
+		const { type, typeVersion } = this.node;
+		return this.workflow.nodeTypes.getByNameAndVersion(type, typeVersion);
+	}
+
+	@Memoized
+	get nodeInputs() {
+		return NodeHelpers.getNodeInputs(this.workflow, this.node, this.nodeType.description).map(
+			(input) => (typeof input === 'string' ? { type: input } : input),
+		);
+	}
+
+	getNodeInputs(): INodeInputConfiguration[] {
+		return this.nodeInputs;
+	}
+
+	@Memoized
+	get nodeOutputs() {
+		return NodeHelpers.getNodeOutputs(this.workflow, this.node, this.nodeType.description).map(
+			(output) => (typeof output === 'string' ? { type: output } : output),
+		);
+	}
+
+	getConnectedNodes(connectionType: NodeConnectionType): INode[] {
+		return this.workflow
+			.getParentNodes(this.node.name, connectionType, 1)
+			.map((nodeName) => this.workflow.getNode(nodeName))
+			.filter((node) => !!node)
+			.filter((node) => node.disabled !== true);
+	}
+
+	getNodeOutputs(): INodeOutputConfiguration[] {
+		return this.nodeOutputs;
+	}
+
 	getKnownNodeTypes() {
 		return this.workflow.nodeTypes.getKnownTypes();
 	}
@@ -258,6 +298,7 @@ export abstract class NodeExecutionContext implements Omit<FunctionsBase, 'getCr
 		return decryptedDataObject as T;
 	}
 
+	@Memoized
 	protected get additionalKeys() {
 		return getAdditionalKeys(this.additionalData, this.mode, this.runExecutionData);
 	}
diff --git a/packages/core/src/node-execution-context/supply-data-context.ts b/packages/core/src/node-execution-context/supply-data-context.ts
index bab9d111089e9..be1f63b56c366 100644
--- a/packages/core/src/node-execution-context/supply-data-context.ts
+++ b/packages/core/src/node-execution-context/supply-data-context.ts
@@ -1,11 +1,15 @@
+import get from 'lodash/get';
 import type {
+	AINodeConnectionType,
 	CloseFunction,
+	ExecutionBaseError,
 	IExecuteData,
 	IGetNodeParameterOptions,
 	INode,
 	INodeExecutionData,
 	IRunExecutionData,
 	ISupplyDataFunctions,
+	ITaskData,
 	ITaskDataConnections,
 	ITaskMetadata,
 	IWorkflowExecuteAdditionalData,
@@ -13,13 +17,14 @@ import type {
 	Workflow,
 	WorkflowExecuteMode,
 } from 'n8n-workflow';
-import { ApplicationError, createDeferredPromise } from 'n8n-workflow';
+import { createDeferredPromise } from 'n8n-workflow';
 
 // eslint-disable-next-line import/no-cycle
 import {
 	assertBinaryData,
 	constructExecutionMetaData,
 	copyInputItems,
+	detectBinaryEncoding,
 	getBinaryDataBuffer,
 	getBinaryHelperFunctions,
 	getCheckProcessedHelperFunctions,
@@ -28,11 +33,10 @@ import {
 	getSSHTunnelFunctions,
 	normalizeItems,
 	returnJsonArray,
-	getInputConnectionData,
-	addExecutionDataFunctions,
 } from '@/NodeExecuteFunctions';
 
 import { BaseExecuteContext } from './base-execute-context';
+import { getInputConnectionData } from './utils/getInputConnectionData';
 
 export class SupplyDataContext extends BaseExecuteContext implements ISupplyDataFunctions {
 	readonly helpers: ISupplyDataFunctions['helpers'];
@@ -48,6 +52,7 @@ export class SupplyDataContext extends BaseExecuteContext implements ISupplyData
 		runIndex: number,
 		connectionInputData: INodeExecutionData[],
 		inputData: ITaskDataConnections,
+		private readonly connectionType: NodeConnectionType,
 		executeData: IExecuteData,
 		private readonly closeFunctions: CloseFunction[],
 		abortSignal?: AbortSignal,
@@ -83,6 +88,7 @@ export class SupplyDataContext extends BaseExecuteContext implements ISupplyData
 				assertBinaryData(inputData, node, itemIndex, propertyName, 0),
 			getBinaryDataBuffer: async (itemIndex, propertyName) =>
 				await getBinaryDataBuffer(inputData, itemIndex, propertyName, 0),
+			detectBinaryEncoding: (buffer: Buffer) => detectBinaryEncoding(buffer),
 
 			returnJsonArray,
 			normalizeItems,
@@ -104,7 +110,10 @@ export class SupplyDataContext extends BaseExecuteContext implements ISupplyData
 			)) as ISupplyDataFunctions['getNodeParameter'];
 	}
 
-	async getInputConnectionData(inputName: NodeConnectionType, itemIndex: number): Promise<unknown> {
+	async getInputConnectionData(
+		connectionType: AINodeConnectionType,
+		itemIndex: number,
+	): Promise<unknown> {
 		return await getInputConnectionData.call(
 			this,
 			this.workflow,
@@ -116,36 +125,23 @@ export class SupplyDataContext extends BaseExecuteContext implements ISupplyData
 			this.executeData,
 			this.mode,
 			this.closeFunctions,
-			inputName,
+			connectionType,
 			itemIndex,
 			this.abortSignal,
 		);
 	}
 
-	getInputData(inputIndex = 0, inputName = 'main') {
-		if (!this.inputData.hasOwnProperty(inputName)) {
+	getInputData(inputIndex = 0, connectionType = this.connectionType) {
+		if (!this.inputData.hasOwnProperty(connectionType)) {
 			// Return empty array because else it would throw error when nothing is connected to input
 			return [];
 		}
-
-		// TODO: Check if nodeType has input with that index defined
-		if (this.inputData[inputName].length < inputIndex) {
-			throw new ApplicationError('Could not get input with given index', {
-				extra: { inputIndex, inputName },
-			});
-		}
-
-		if (this.inputData[inputName][inputIndex] === null) {
-			throw new ApplicationError('Value of input was not set', {
-				extra: { inputIndex, inputName },
-			});
-		}
-
-		return this.inputData[inputName][inputIndex];
+		return super.getInputItems(inputIndex, connectionType) ?? [];
 	}
 
+	/** @deprecated create a context object with inputData for every runIndex */
 	addInputData(
-		connectionType: NodeConnectionType,
+		connectionType: AINodeConnectionType,
 		data: INodeExecutionData[][],
 	): { index: number } {
 		const nodeName = this.node.name;
@@ -154,15 +150,11 @@ export class SupplyDataContext extends BaseExecuteContext implements ISupplyData
 			currentNodeRunIndex = this.runExecutionData.resultData.runData[nodeName].length;
 		}
 
-		addExecutionDataFunctions(
+		this.addExecutionDataFunctions(
 			'input',
-			nodeName,
 			data,
-			this.runExecutionData,
 			connectionType,
-			this.additionalData,
 			nodeName,
-			this.runIndex,
 			currentNodeRunIndex,
 		).catch((error) => {
 			this.logger.warn(
@@ -176,22 +168,19 @@ export class SupplyDataContext extends BaseExecuteContext implements ISupplyData
 		return { index: currentNodeRunIndex };
 	}
 
+	/** @deprecated Switch to WorkflowExecute to store output on runExecutionData.resultData.runData */
 	addOutputData(
-		connectionType: NodeConnectionType,
+		connectionType: AINodeConnectionType,
 		currentNodeRunIndex: number,
-		data: INodeExecutionData[][],
+		data: INodeExecutionData[][] | ExecutionBaseError,
 		metadata?: ITaskMetadata,
 	): void {
 		const nodeName = this.node.name;
-		addExecutionDataFunctions(
+		this.addExecutionDataFunctions(
 			'output',
-			nodeName,
 			data,
-			this.runExecutionData,
 			connectionType,
-			this.additionalData,
 			nodeName,
-			this.runIndex,
 			currentNodeRunIndex,
 			metadata,
 		).catch((error) => {
@@ -203,4 +192,102 @@ export class SupplyDataContext extends BaseExecuteContext implements ISupplyData
 			);
 		});
 	}
+
+	async addExecutionDataFunctions(
+		type: 'input' | 'output',
+		data: INodeExecutionData[][] | ExecutionBaseError,
+		connectionType: AINodeConnectionType,
+		sourceNodeName: string,
+		currentNodeRunIndex: number,
+		metadata?: ITaskMetadata,
+	): Promise<void> {
+		const {
+			additionalData,
+			runExecutionData,
+			runIndex: sourceNodeRunIndex,
+			node: { name: nodeName },
+		} = this;
+
+		let taskData: ITaskData | undefined;
+		if (type === 'input') {
+			taskData = {
+				startTime: new Date().getTime(),
+				executionTime: 0,
+				executionStatus: 'running',
+				source: [null],
+			};
+		} else {
+			// At the moment we expect that there is always an input sent before the output
+			taskData = get(
+				runExecutionData,
+				['resultData', 'runData', nodeName, currentNodeRunIndex],
+				undefined,
+			);
+			if (taskData === undefined) {
+				return;
+			}
+			taskData.metadata = metadata;
+		}
+		taskData = taskData!;
+
+		if (data instanceof Error) {
+			taskData.executionStatus = 'error';
+			taskData.error = data;
+		} else {
+			if (type === 'output') {
+				taskData.executionStatus = 'success';
+			}
+			taskData.data = {
+				[connectionType]: data,
+			} as ITaskDataConnections;
+		}
+
+		if (type === 'input') {
+			if (!(data instanceof Error)) {
+				this.inputData[connectionType] = data;
+				// TODO: remove inputOverride
+				taskData.inputOverride = {
+					[connectionType]: data,
+				} as ITaskDataConnections;
+			}
+
+			if (!runExecutionData.resultData.runData.hasOwnProperty(nodeName)) {
+				runExecutionData.resultData.runData[nodeName] = [];
+			}
+
+			runExecutionData.resultData.runData[nodeName][currentNodeRunIndex] = taskData;
+			await additionalData.hooks?.executeHookFunctions('nodeExecuteBefore', [nodeName]);
+		} else {
+			// Outputs
+			taskData.executionTime = new Date().getTime() - taskData.startTime;
+
+			await additionalData.hooks?.executeHookFunctions('nodeExecuteAfter', [
+				nodeName,
+				taskData,
+				this.runExecutionData,
+			]);
+
+			if (get(runExecutionData, 'executionData.metadata', undefined) === undefined) {
+				runExecutionData.executionData!.metadata = {};
+			}
+
+			let sourceTaskData = runExecutionData.executionData?.metadata?.[sourceNodeName];
+
+			if (!sourceTaskData) {
+				runExecutionData.executionData!.metadata[sourceNodeName] = [];
+				sourceTaskData = runExecutionData.executionData!.metadata[sourceNodeName];
+			}
+
+			if (!sourceTaskData[sourceNodeRunIndex]) {
+				sourceTaskData[sourceNodeRunIndex] = {
+					subRun: [],
+				};
+			}
+
+			sourceTaskData[sourceNodeRunIndex].subRun!.push({
+				node: nodeName,
+				runIndex: currentNodeRunIndex,
+			});
+		}
+	}
 }
diff --git a/packages/core/src/node-execution-context/utils.ts b/packages/core/src/node-execution-context/utils.ts
deleted file mode 100644
index a09147d543b23..0000000000000
--- a/packages/core/src/node-execution-context/utils.ts
+++ /dev/null
@@ -1,423 +0,0 @@
-import { DateTime } from 'luxon';
-import type {
-	EnsureTypeOptions,
-	FieldType,
-	IDataObject,
-	INode,
-	INodeParameters,
-	INodeProperties,
-	INodePropertyCollection,
-	INodePropertyOptions,
-	INodeType,
-	IRunExecutionData,
-	IWorkflowDataProxyAdditionalKeys,
-	IWorkflowExecuteAdditionalData,
-	NodeParameterValueType,
-	WorkflowExecuteMode,
-} from 'n8n-workflow';
-import {
-	ExpressionError,
-	isResourceMapperValue,
-	LoggerProxy,
-	NodeHelpers,
-	validateFieldType,
-} from 'n8n-workflow';
-
-import { PLACEHOLDER_EMPTY_EXECUTION_ID } from '@/Constants';
-import {
-	setWorkflowExecutionMetadata,
-	setAllWorkflowExecutionMetadata,
-	getWorkflowExecutionMetadata,
-	getAllWorkflowExecutionMetadata,
-} from '@/ExecutionMetadata';
-import type { ExtendedValidationResult } from '@/Interfaces';
-import { getSecretsProxy } from '@/Secrets';
-
-/**
- * Clean up parameter data to make sure that only valid data gets returned
- * INFO: Currently only converts Luxon Dates as we know for sure it will not be breaking
- */
-export function cleanupParameterData(inputData: NodeParameterValueType): void {
-	if (typeof inputData !== 'object' || inputData === null) {
-		return;
-	}
-
-	if (Array.isArray(inputData)) {
-		inputData.forEach((value) => cleanupParameterData(value as NodeParameterValueType));
-		return;
-	}
-
-	if (typeof inputData === 'object') {
-		Object.keys(inputData).forEach((key) => {
-			const value = (inputData as INodeParameters)[key];
-			if (typeof value === 'object') {
-				if (DateTime.isDateTime(value)) {
-					// Is a special luxon date so convert to string
-					(inputData as INodeParameters)[key] = value.toString();
-				} else {
-					cleanupParameterData(value);
-				}
-			}
-		});
-	}
-}
-
-const validateResourceMapperValue = (
-	parameterName: string,
-	paramValues: { [key: string]: unknown },
-	node: INode,
-	skipRequiredCheck = false,
-): ExtendedValidationResult => {
-	const result: ExtendedValidationResult = { valid: true, newValue: paramValues };
-	const paramNameParts = parameterName.split('.');
-	if (paramNameParts.length !== 2) {
-		return result;
-	}
-	const resourceMapperParamName = paramNameParts[0];
-	const resourceMapperField = node.parameters[resourceMapperParamName];
-	if (!resourceMapperField || !isResourceMapperValue(resourceMapperField)) {
-		return result;
-	}
-	const schema = resourceMapperField.schema;
-	const paramValueNames = Object.keys(paramValues);
-	for (let i = 0; i < paramValueNames.length; i++) {
-		const key = paramValueNames[i];
-		const resolvedValue = paramValues[key];
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
-		const schemaEntry = schema.find((s) => s.id === key);
-
-		if (
-			!skipRequiredCheck &&
-			schemaEntry?.required === true &&
-			schemaEntry.type !== 'boolean' &&
-			!resolvedValue
-		) {
-			return {
-				valid: false,
-				errorMessage: `The value "${String(key)}" is required but not set`,
-				fieldName: key,
-			};
-		}
-
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-		if (schemaEntry?.type) {
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-			const validationResult = validateFieldType(key, resolvedValue, schemaEntry.type, {
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
-				valueOptions: schemaEntry.options,
-			});
-			if (!validationResult.valid) {
-				return { ...validationResult, fieldName: key };
-			} else {
-				// If it's valid, set the casted value
-				paramValues[key] = validationResult.newValue;
-			}
-		}
-	}
-	return result;
-};
-
-const validateCollection = (
-	node: INode,
-	runIndex: number,
-	itemIndex: number,
-	propertyDescription: INodeProperties,
-	parameterPath: string[],
-	validationResult: ExtendedValidationResult,
-): ExtendedValidationResult => {
-	let nestedDescriptions: INodeProperties[] | undefined;
-
-	if (propertyDescription.type === 'fixedCollection') {
-		nestedDescriptions = (propertyDescription.options as INodePropertyCollection[]).find(
-			(entry) => entry.name === parameterPath[1],
-		)?.values;
-	}
-
-	if (propertyDescription.type === 'collection') {
-		nestedDescriptions = propertyDescription.options as INodeProperties[];
-	}
-
-	if (!nestedDescriptions) {
-		return validationResult;
-	}
-
-	const validationMap: {
-		[key: string]: { type: FieldType; displayName: string; options?: INodePropertyOptions[] };
-	} = {};
-
-	for (const prop of nestedDescriptions) {
-		if (!prop.validateType || prop.ignoreValidationDuringExecution) continue;
-
-		validationMap[prop.name] = {
-			type: prop.validateType,
-			displayName: prop.displayName,
-			options:
-				prop.validateType === 'options' ? (prop.options as INodePropertyOptions[]) : undefined,
-		};
-	}
-
-	if (!Object.keys(validationMap).length) {
-		return validationResult;
-	}
-
-	if (validationResult.valid) {
-		for (const value of Array.isArray(validationResult.newValue)
-			? (validationResult.newValue as IDataObject[])
-			: [validationResult.newValue as IDataObject]) {
-			for (const key of Object.keys(value)) {
-				if (!validationMap[key]) continue;
-
-				const fieldValidationResult = validateFieldType(key, value[key], validationMap[key].type, {
-					valueOptions: validationMap[key].options,
-				});
-
-				if (!fieldValidationResult.valid) {
-					throw new ExpressionError(
-						`Invalid input for field '${validationMap[key].displayName}' inside '${propertyDescription.displayName}' in [item ${itemIndex}]`,
-						{
-							description: fieldValidationResult.errorMessage,
-							runIndex,
-							itemIndex,
-							nodeCause: node.name,
-						},
-					);
-				}
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-				value[key] = fieldValidationResult.newValue;
-			}
-		}
-	}
-
-	return validationResult;
-};
-
-export const validateValueAgainstSchema = (
-	node: INode,
-	nodeType: INodeType,
-	parameterValue: string | number | boolean | object | null | undefined,
-	parameterName: string,
-	runIndex: number,
-	itemIndex: number,
-) => {
-	const parameterPath = parameterName.split('.');
-
-	const propertyDescription = nodeType.description.properties.find(
-		(prop) =>
-			parameterPath[0] === prop.name && NodeHelpers.displayParameter(node.parameters, prop, node),
-	);
-
-	if (!propertyDescription) {
-		return parameterValue;
-	}
-
-	let validationResult: ExtendedValidationResult = { valid: true, newValue: parameterValue };
-
-	if (
-		parameterPath.length === 1 &&
-		propertyDescription.validateType &&
-		!propertyDescription.ignoreValidationDuringExecution
-	) {
-		validationResult = validateFieldType(
-			parameterName,
-			parameterValue,
-			propertyDescription.validateType,
-		);
-	} else if (
-		propertyDescription.type === 'resourceMapper' &&
-		parameterPath[1] === 'value' &&
-		typeof parameterValue === 'object'
-	) {
-		validationResult = validateResourceMapperValue(
-			parameterName,
-			parameterValue as { [key: string]: unknown },
-			node,
-			propertyDescription.typeOptions?.resourceMapper?.mode !== 'add',
-		);
-	} else if (['fixedCollection', 'collection'].includes(propertyDescription.type)) {
-		validationResult = validateCollection(
-			node,
-			runIndex,
-			itemIndex,
-			propertyDescription,
-			parameterPath,
-			validationResult,
-		);
-	}
-
-	if (!validationResult.valid) {
-		throw new ExpressionError(
-			`Invalid input for '${
-				validationResult.fieldName
-					? String(validationResult.fieldName)
-					: propertyDescription.displayName
-			}' [item ${itemIndex}]`,
-			{
-				description: validationResult.errorMessage,
-				runIndex,
-				itemIndex,
-				nodeCause: node.name,
-			},
-		);
-	}
-	// eslint-disable-next-line @typescript-eslint/no-unsafe-return
-	return validationResult.newValue;
-};
-
-export function ensureType(
-	toType: EnsureTypeOptions,
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	parameterValue: any,
-	parameterName: string,
-	errorOptions?: { itemIndex?: number; runIndex?: number; nodeCause?: string },
-): string | number | boolean | object {
-	// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-	let returnData = parameterValue;
-
-	if (returnData === null) {
-		throw new ExpressionError(`Parameter '${parameterName}' must not be null`, errorOptions);
-	}
-
-	if (returnData === undefined) {
-		throw new ExpressionError(
-			`Parameter '${parameterName}' could not be 'undefined'`,
-			errorOptions,
-		);
-	}
-
-	if (['object', 'array', 'json'].includes(toType)) {
-		if (typeof returnData !== 'object') {
-			// if value is not an object and is string try to parse it, else throw an error
-			if (typeof returnData === 'string' && returnData.length) {
-				try {
-					// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-					const parsedValue = JSON.parse(returnData);
-					// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-					returnData = parsedValue;
-				} catch (error) {
-					throw new ExpressionError(`Parameter '${parameterName}' could not be parsed`, {
-						...errorOptions,
-						// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
-						description: error.message,
-					});
-				}
-			} else {
-				throw new ExpressionError(
-					`Parameter '${parameterName}' must be an ${toType}, but we got '${String(parameterValue)}'`,
-					errorOptions,
-				);
-			}
-		} else if (toType === 'json') {
-			// value is an object, make sure it is valid JSON
-			try {
-				JSON.stringify(returnData);
-			} catch (error) {
-				throw new ExpressionError(`Parameter '${parameterName}' is not valid JSON`, {
-					...errorOptions,
-					// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
-					description: error.message,
-				});
-			}
-		}
-
-		if (toType === 'array' && !Array.isArray(returnData)) {
-			// value is not an array, but has to be
-			throw new ExpressionError(
-				`Parameter '${parameterName}' must be an array, but we got object`,
-				errorOptions,
-			);
-		}
-	}
-
-	try {
-		if (toType === 'string') {
-			if (typeof returnData === 'object') {
-				returnData = JSON.stringify(returnData);
-			} else {
-				returnData = String(returnData);
-			}
-		}
-
-		if (toType === 'number') {
-			returnData = Number(returnData);
-			if (Number.isNaN(returnData)) {
-				throw new ExpressionError(
-					`Parameter '${parameterName}' must be a number, but we got '${parameterValue}'`,
-					errorOptions,
-				);
-			}
-		}
-
-		if (toType === 'boolean') {
-			returnData = Boolean(returnData);
-		}
-	} catch (error) {
-		if (error instanceof ExpressionError) throw error;
-
-		throw new ExpressionError(`Parameter '${parameterName}' could not be converted to ${toType}`, {
-			...errorOptions,
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
-			description: error.message,
-		});
-	}
-
-	// eslint-disable-next-line @typescript-eslint/no-unsafe-return
-	return returnData;
-}
-
-/** Returns the additional keys for Expressions and Function-Nodes */
-export function getAdditionalKeys(
-	additionalData: IWorkflowExecuteAdditionalData,
-	mode: WorkflowExecuteMode,
-	runExecutionData: IRunExecutionData | null,
-	options?: { secretsEnabled?: boolean },
-): IWorkflowDataProxyAdditionalKeys {
-	const executionId = additionalData.executionId ?? PLACEHOLDER_EMPTY_EXECUTION_ID;
-	const resumeUrl = `${additionalData.webhookWaitingBaseUrl}/${executionId}`;
-	const resumeFormUrl = `${additionalData.formWaitingBaseUrl}/${executionId}`;
-	return {
-		$execution: {
-			id: executionId,
-			mode: mode === 'manual' ? 'test' : 'production',
-			resumeUrl,
-			resumeFormUrl,
-			customData: runExecutionData
-				? {
-						set(key: string, value: string): void {
-							try {
-								setWorkflowExecutionMetadata(runExecutionData, key, value);
-							} catch (e) {
-								if (mode === 'manual') {
-									throw e;
-								}
-								// eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
-								LoggerProxy.debug(e.message);
-							}
-						},
-						setAll(obj: Record<string, string>): void {
-							try {
-								setAllWorkflowExecutionMetadata(runExecutionData, obj);
-							} catch (e) {
-								if (mode === 'manual') {
-									throw e;
-								}
-								// eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
-								LoggerProxy.debug(e.message);
-							}
-						},
-						get(key: string): string {
-							return getWorkflowExecutionMetadata(runExecutionData, key);
-						},
-						getAll(): Record<string, string> {
-							return getAllWorkflowExecutionMetadata(runExecutionData);
-						},
-					}
-				: undefined,
-		},
-		$vars: additionalData.variables,
-		$secrets: options?.secretsEnabled ? getSecretsProxy(additionalData) : undefined,
-
-		// deprecated
-		$executionId: executionId,
-		$resumeWebhookUrl: resumeUrl,
-	};
-}
diff --git a/packages/core/src/node-execution-context/utils/__tests__/cleanupParameterData.test.ts b/packages/core/src/node-execution-context/utils/__tests__/cleanupParameterData.test.ts
new file mode 100644
index 0000000000000..47913669b6b82
--- /dev/null
+++ b/packages/core/src/node-execution-context/utils/__tests__/cleanupParameterData.test.ts
@@ -0,0 +1,38 @@
+import toPlainObject from 'lodash/toPlainObject';
+import { DateTime } from 'luxon';
+import type { NodeParameterValue } from 'n8n-workflow';
+
+import { cleanupParameterData } from '../cleanupParameterData';
+
+describe('cleanupParameterData', () => {
+	it('should stringify Luxon dates in-place', () => {
+		const input = { x: 1, y: DateTime.now() as unknown as NodeParameterValue };
+		expect(typeof input.y).toBe('object');
+		cleanupParameterData(input);
+		expect(typeof input.y).toBe('string');
+	});
+
+	it('should stringify plain Luxon dates in-place', () => {
+		const input = {
+			x: 1,
+			y: toPlainObject(DateTime.now()),
+		};
+		expect(typeof input.y).toBe('object');
+		cleanupParameterData(input);
+		expect(typeof input.y).toBe('string');
+	});
+
+	it('should handle objects with nameless constructors', () => {
+		const input = { x: 1, y: { constructor: {} } as NodeParameterValue };
+		expect(typeof input.y).toBe('object');
+		cleanupParameterData(input);
+		expect(typeof input.y).toBe('object');
+	});
+
+	it('should handle objects without a constructor', () => {
+		const input = { x: 1, y: { constructor: undefined } as unknown as NodeParameterValue };
+		expect(typeof input.y).toBe('object');
+		cleanupParameterData(input);
+		expect(typeof input.y).toBe('object');
+	});
+});
diff --git a/packages/core/src/node-execution-context/utils/__tests__/ensureType.test.ts b/packages/core/src/node-execution-context/utils/__tests__/ensureType.test.ts
new file mode 100644
index 0000000000000..1637d988c96b5
--- /dev/null
+++ b/packages/core/src/node-execution-context/utils/__tests__/ensureType.test.ts
@@ -0,0 +1,80 @@
+import { ExpressionError } from 'n8n-workflow';
+
+import { ensureType } from '../ensureType';
+
+describe('ensureType', () => {
+	it('throws error for null value', () => {
+		expect(() => ensureType('string', null, 'myParam')).toThrowError(
+			new ExpressionError("Parameter 'myParam' must not be null"),
+		);
+	});
+
+	it('throws error for undefined value', () => {
+		expect(() => ensureType('string', undefined, 'myParam')).toThrowError(
+			new ExpressionError("Parameter 'myParam' could not be 'undefined'"),
+		);
+	});
+
+	it('returns string value without modification', () => {
+		const value = 'hello';
+		const expectedValue = value;
+		const result = ensureType('string', value, 'myParam');
+		expect(result).toBe(expectedValue);
+	});
+
+	it('returns number value without modification', () => {
+		const value = 42;
+		const expectedValue = value;
+		const result = ensureType('number', value, 'myParam');
+		expect(result).toBe(expectedValue);
+	});
+
+	it('returns boolean value without modification', () => {
+		const value = true;
+		const expectedValue = value;
+		const result = ensureType('boolean', value, 'myParam');
+		expect(result).toBe(expectedValue);
+	});
+
+	it('converts object to string if toType is string', () => {
+		const value = { name: 'John' };
+		const expectedValue = JSON.stringify(value);
+		const result = ensureType('string', value, 'myParam');
+		expect(result).toBe(expectedValue);
+	});
+
+	it('converts string to number if toType is number', () => {
+		const value = '10';
+		const expectedValue = 10;
+		const result = ensureType('number', value, 'myParam');
+		expect(result).toBe(expectedValue);
+	});
+
+	it('throws error for invalid conversion to number', () => {
+		const value = 'invalid';
+		expect(() => ensureType('number', value, 'myParam')).toThrowError(
+			new ExpressionError("Parameter 'myParam' must be a number, but we got 'invalid'"),
+		);
+	});
+
+	it('parses valid JSON string to object if toType is object', () => {
+		const value = '{"name": "Alice"}';
+		const expectedValue = JSON.parse(value);
+		const result = ensureType('object', value, 'myParam');
+		expect(result).toEqual(expectedValue);
+	});
+
+	it('throws error for invalid JSON string to object conversion', () => {
+		const value = 'invalid_json';
+		expect(() => ensureType('object', value, 'myParam')).toThrowError(
+			new ExpressionError("Parameter 'myParam' could not be parsed"),
+		);
+	});
+
+	it('throws error for non-array value if toType is array', () => {
+		const value = { name: 'Alice' };
+		expect(() => ensureType('array', value, 'myParam')).toThrowError(
+			new ExpressionError("Parameter 'myParam' must be an array, but we got object"),
+		);
+	});
+});
diff --git a/packages/core/src/node-execution-context/utils/__tests__/getAdditionalKeys.test.ts b/packages/core/src/node-execution-context/utils/__tests__/getAdditionalKeys.test.ts
new file mode 100644
index 0000000000000..6ac1fbdc071fc
--- /dev/null
+++ b/packages/core/src/node-execution-context/utils/__tests__/getAdditionalKeys.test.ts
@@ -0,0 +1,146 @@
+import { mock } from 'jest-mock-extended';
+import { LoggerProxy } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IRunExecutionData,
+	IWorkflowExecuteAdditionalData,
+	SecretsHelpersBase,
+} from 'n8n-workflow';
+
+import { PLACEHOLDER_EMPTY_EXECUTION_ID } from '@/Constants';
+
+import { getAdditionalKeys } from '../getAdditionalKeys';
+
+describe('getAdditionalKeys', () => {
+	const secretsHelpers = mock<SecretsHelpersBase>();
+	const additionalData = mock<IWorkflowExecuteAdditionalData>({
+		executionId: '123',
+		webhookWaitingBaseUrl: 'https://webhook.test',
+		formWaitingBaseUrl: 'https://form.test',
+		variables: { testVar: 'value' },
+		secretsHelpers,
+	});
+
+	const runExecutionData = mock<IRunExecutionData>({
+		resultData: {
+			runData: {},
+			metadata: {},
+		},
+	});
+
+	beforeAll(() => {
+		LoggerProxy.init(mock());
+		secretsHelpers.hasProvider.mockReturnValue(true);
+		secretsHelpers.hasSecret.mockReturnValue(true);
+		secretsHelpers.getSecret.mockReturnValue('secret-value');
+		secretsHelpers.listSecrets.mockReturnValue(['secret1']);
+		secretsHelpers.listProviders.mockReturnValue(['provider1']);
+	});
+
+	it('should use placeholder execution ID when none provided', () => {
+		const noIdData = { ...additionalData, executionId: undefined };
+		const result = getAdditionalKeys(noIdData, 'manual', null);
+
+		expect(result.$execution?.id).toBe(PLACEHOLDER_EMPTY_EXECUTION_ID);
+	});
+
+	it('should return production mode when not manual', () => {
+		const result = getAdditionalKeys(additionalData, 'internal', null);
+
+		expect(result.$execution?.mode).toBe('production');
+	});
+
+	it('should include customData methods when runExecutionData is provided', () => {
+		const result = getAdditionalKeys(additionalData, 'manual', runExecutionData);
+
+		expect(result.$execution?.customData).toBeDefined();
+		expect(typeof result.$execution?.customData?.set).toBe('function');
+		expect(typeof result.$execution?.customData?.setAll).toBe('function');
+		expect(typeof result.$execution?.customData?.get).toBe('function');
+		expect(typeof result.$execution?.customData?.getAll).toBe('function');
+	});
+
+	it('should handle customData operations correctly', () => {
+		const result = getAdditionalKeys(additionalData, 'manual', runExecutionData);
+		const customData = result.$execution?.customData;
+
+		customData?.set('testKey', 'testValue');
+		expect(customData?.get('testKey')).toBe('testValue');
+
+		customData?.setAll({ key1: 'value1', key2: 'value2' });
+		const allData = customData?.getAll();
+		expect(allData).toEqual({
+			testKey: 'testValue',
+			key1: 'value1',
+			key2: 'value2',
+		});
+	});
+
+	it('should include secrets when enabled', () => {
+		const result = getAdditionalKeys(additionalData, 'manual', null, { secretsEnabled: true });
+
+		expect(result.$secrets).toBeDefined();
+		expect((result.$secrets?.provider1 as IDataObject).secret1).toEqual('secret-value');
+	});
+
+	it('should not include secrets when disabled', () => {
+		const result = getAdditionalKeys(additionalData, 'manual', null, { secretsEnabled: false });
+
+		expect(result.$secrets).toBeUndefined();
+	});
+
+	it('should throw errors in manual mode', () => {
+		const result = getAdditionalKeys(additionalData, 'manual', runExecutionData);
+
+		expect(() => {
+			result.$execution?.customData?.set('invalid*key', 'value');
+		}).toThrow();
+	});
+
+	it('should correctly set resume URLs', () => {
+		const result = getAdditionalKeys(additionalData, 'manual', null);
+
+		expect(result.$execution?.resumeUrl).toBe('https://webhook.test/123');
+		expect(result.$execution?.resumeFormUrl).toBe('https://form.test/123');
+		expect(result.$resumeWebhookUrl).toBe('https://webhook.test/123'); // Test deprecated property
+	});
+
+	it('should return test mode when manual', () => {
+		const result = getAdditionalKeys(additionalData, 'manual', null);
+
+		expect(result.$execution?.mode).toBe('test');
+	});
+
+	it('should return variables from additionalData', () => {
+		const result = getAdditionalKeys(additionalData, 'manual', null);
+		expect(result.$vars?.testVar).toEqual('value');
+	});
+
+	it('should handle errors in non-manual mode without throwing', () => {
+		const result = getAdditionalKeys(additionalData, 'internal', runExecutionData);
+		const customData = result.$execution?.customData;
+
+		expect(() => {
+			customData?.set('invalid*key', 'value');
+		}).not.toThrow();
+	});
+
+	it('should return undefined customData when runExecutionData is null', () => {
+		const result = getAdditionalKeys(additionalData, 'manual', null);
+
+		expect(result.$execution?.customData).toBeUndefined();
+	});
+
+	it('should respect metadata KV limit', () => {
+		const result = getAdditionalKeys(additionalData, 'manual', runExecutionData);
+		const customData = result.$execution?.customData;
+
+		// Add 11 key-value pairs (exceeding the limit of 10)
+		for (let i = 0; i < 11; i++) {
+			customData?.set(`key${i}`, `value${i}`);
+		}
+
+		const allData = customData?.getAll() ?? {};
+		expect(Object.keys(allData)).toHaveLength(10);
+	});
+});
diff --git a/packages/core/src/node-execution-context/utils/__tests__/getInputConnectionData.test.ts b/packages/core/src/node-execution-context/utils/__tests__/getInputConnectionData.test.ts
new file mode 100644
index 0000000000000..4e634a196e70b
--- /dev/null
+++ b/packages/core/src/node-execution-context/utils/__tests__/getInputConnectionData.test.ts
@@ -0,0 +1,366 @@
+import type { Tool } from '@langchain/core/tools';
+import { mock } from 'jest-mock-extended';
+import type {
+	INode,
+	ITaskDataConnections,
+	IRunExecutionData,
+	INodeExecutionData,
+	IExecuteData,
+	IWorkflowExecuteAdditionalData,
+	Workflow,
+	INodeType,
+	INodeTypes,
+} from 'n8n-workflow';
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+
+import { ExecuteContext } from '../../execute-context';
+
+describe('getInputConnectionData', () => {
+	const agentNode = mock<INode>({
+		name: 'Test Agent',
+		type: 'test.agent',
+		parameters: {},
+	});
+	const agentNodeType = mock<INodeType>({
+		description: {
+			inputs: [],
+		},
+	});
+	const nodeTypes = mock<INodeTypes>();
+	const workflow = mock<Workflow>({
+		id: 'test-workflow',
+		active: false,
+		nodeTypes,
+	});
+	const runExecutionData = mock<IRunExecutionData>({
+		resultData: { runData: {} },
+	});
+	const connectionInputData = [] as INodeExecutionData[];
+	const inputData = {} as ITaskDataConnections;
+	const executeData = {} as IExecuteData;
+
+	const hooks = mock<Required<IWorkflowExecuteAdditionalData['hooks']>>();
+	const additionalData = mock<IWorkflowExecuteAdditionalData>({ hooks });
+
+	let executeContext: ExecuteContext;
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+
+		executeContext = new ExecuteContext(
+			workflow,
+			agentNode,
+			additionalData,
+			'internal',
+			runExecutionData,
+			0,
+			connectionInputData,
+			inputData,
+			executeData,
+			[],
+		);
+
+		jest.spyOn(executeContext, 'getNode').mockReturnValue(agentNode);
+		nodeTypes.getByNameAndVersion
+			.calledWith(agentNode.type, expect.anything())
+			.mockReturnValue(agentNodeType);
+	});
+
+	describe.each([
+		NodeConnectionType.AiAgent,
+		NodeConnectionType.AiChain,
+		NodeConnectionType.AiDocument,
+		NodeConnectionType.AiEmbedding,
+		NodeConnectionType.AiLanguageModel,
+		NodeConnectionType.AiMemory,
+		NodeConnectionType.AiOutputParser,
+		NodeConnectionType.AiRetriever,
+		NodeConnectionType.AiTextSplitter,
+		NodeConnectionType.AiVectorStore,
+	] as const)('%s', (connectionType) => {
+		const response = mock();
+		const node = mock<INode>({
+			name: 'First Node',
+			type: 'test.type',
+			disabled: false,
+		});
+		const secondNode = mock<INode>({ name: 'Second Node', disabled: false });
+		const supplyData = jest.fn().mockResolvedValue({ response });
+		const nodeType = mock<INodeType>({ supplyData });
+
+		beforeEach(() => {
+			nodeTypes.getByNameAndVersion
+				.calledWith(node.type, expect.anything())
+				.mockReturnValue(nodeType);
+			workflow.getParentNodes
+				.calledWith(agentNode.name, connectionType)
+				.mockReturnValue([node.name]);
+			workflow.getNode.calledWith(node.name).mockReturnValue(node);
+			workflow.getNode.calledWith(secondNode.name).mockReturnValue(secondNode);
+		});
+
+		it('should throw when no inputs are defined', async () => {
+			agentNodeType.description.inputs = [];
+
+			await expect(executeContext.getInputConnectionData(connectionType, 0)).rejects.toThrow(
+				'Node does not have input of type',
+			);
+			expect(supplyData).not.toHaveBeenCalled();
+		});
+
+		it('should return undefined when no nodes are connected and input is not required', async () => {
+			agentNodeType.description.inputs = [
+				{
+					type: connectionType,
+					maxConnections: 1,
+					required: false,
+				},
+			];
+			workflow.getParentNodes.mockReturnValueOnce([]);
+
+			const result = await executeContext.getInputConnectionData(connectionType, 0);
+			expect(result).toBeUndefined();
+			expect(supplyData).not.toHaveBeenCalled();
+		});
+
+		it('should throw when too many nodes are connected', async () => {
+			agentNodeType.description.inputs = [
+				{
+					type: connectionType,
+					maxConnections: 1,
+					required: true,
+				},
+			];
+			workflow.getParentNodes.mockReturnValueOnce([node.name, secondNode.name]);
+
+			await expect(executeContext.getInputConnectionData(connectionType, 0)).rejects.toThrow(
+				`Only 1 ${connectionType} sub-nodes are/is allowed to be connected`,
+			);
+			expect(supplyData).not.toHaveBeenCalled();
+		});
+
+		it('should throw when required node is not connected', async () => {
+			agentNodeType.description.inputs = [
+				{
+					type: connectionType,
+					required: true,
+				},
+			];
+			workflow.getParentNodes.mockReturnValueOnce([]);
+
+			await expect(executeContext.getInputConnectionData(connectionType, 0)).rejects.toThrow(
+				'must be connected and enabled',
+			);
+			expect(supplyData).not.toHaveBeenCalled();
+		});
+
+		it('should handle disabled nodes', async () => {
+			agentNodeType.description.inputs = [
+				{
+					type: connectionType,
+					required: true,
+				},
+			];
+
+			const disabledNode = mock<INode>({
+				name: 'Disabled Node',
+				type: 'test.type',
+				disabled: true,
+			});
+			workflow.getParentNodes.mockReturnValueOnce([disabledNode.name]);
+			workflow.getNode.calledWith(disabledNode.name).mockReturnValue(disabledNode);
+
+			await expect(executeContext.getInputConnectionData(connectionType, 0)).rejects.toThrow(
+				'must be connected and enabled',
+			);
+			expect(supplyData).not.toHaveBeenCalled();
+		});
+
+		it('should handle node execution errors', async () => {
+			agentNodeType.description.inputs = [
+				{
+					type: connectionType,
+					required: true,
+				},
+			];
+
+			supplyData.mockRejectedValueOnce(new Error('supplyData error'));
+
+			await expect(executeContext.getInputConnectionData(connectionType, 0)).rejects.toThrow(
+				`Error in sub-node ${node.name}`,
+			);
+			expect(supplyData).toHaveBeenCalled();
+		});
+
+		it('should propagate configuration errors', async () => {
+			agentNodeType.description.inputs = [
+				{
+					type: connectionType,
+					required: true,
+				},
+			];
+
+			const configError = new NodeOperationError(node, 'Config Error in node', {
+				functionality: 'configuration-node',
+			});
+			supplyData.mockRejectedValueOnce(configError);
+
+			await expect(executeContext.getInputConnectionData(connectionType, 0)).rejects.toThrow(
+				configError.message,
+			);
+			expect(nodeType.supplyData).toHaveBeenCalled();
+		});
+
+		it('should handle close functions', async () => {
+			agentNodeType.description.inputs = [
+				{
+					type: connectionType,
+					maxConnections: 1,
+					required: true,
+				},
+			];
+
+			const closeFunction = jest.fn();
+			supplyData.mockResolvedValueOnce({ response, closeFunction });
+
+			const result = await executeContext.getInputConnectionData(connectionType, 0);
+			expect(result).toBe(response);
+			expect(supplyData).toHaveBeenCalled();
+			// @ts-expect-error private property
+			expect(executeContext.closeFunctions).toContain(closeFunction);
+		});
+	});
+
+	describe(NodeConnectionType.AiTool, () => {
+		const mockTool = mock<Tool>();
+		const toolNode = mock<INode>({
+			name: 'Test Tool',
+			type: 'test.tool',
+			disabled: false,
+		});
+		const supplyData = jest.fn().mockResolvedValue({ response: mockTool });
+		const toolNodeType = mock<INodeType>({ supplyData });
+
+		const secondToolNode = mock<INode>({ name: 'test.secondTool', disabled: false });
+		const secondMockTool = mock<Tool>();
+		const secondToolNodeType = mock<INodeType>({
+			supplyData: jest.fn().mockResolvedValue({ response: secondMockTool }),
+		});
+
+		beforeEach(() => {
+			nodeTypes.getByNameAndVersion
+				.calledWith(toolNode.type, expect.anything())
+				.mockReturnValue(toolNodeType);
+			workflow.getParentNodes
+				.calledWith(agentNode.name, NodeConnectionType.AiTool)
+				.mockReturnValue([toolNode.name]);
+			workflow.getNode.calledWith(toolNode.name).mockReturnValue(toolNode);
+			workflow.getNode.calledWith(secondToolNode.name).mockReturnValue(secondToolNode);
+		});
+
+		it('should return empty array when no tools are connected and input is not required', async () => {
+			agentNodeType.description.inputs = [
+				{
+					type: NodeConnectionType.AiTool,
+					required: false,
+				},
+			];
+			workflow.getParentNodes.mockReturnValueOnce([]);
+
+			const result = await executeContext.getInputConnectionData(NodeConnectionType.AiTool, 0);
+			expect(result).toEqual([]);
+			expect(supplyData).not.toHaveBeenCalled();
+		});
+
+		it('should throw when required tool node is not connected', async () => {
+			agentNodeType.description.inputs = [
+				{
+					type: NodeConnectionType.AiTool,
+					required: true,
+				},
+			];
+			workflow.getParentNodes.mockReturnValueOnce([]);
+
+			await expect(
+				executeContext.getInputConnectionData(NodeConnectionType.AiTool, 0),
+			).rejects.toThrow('must be connected and enabled');
+			expect(supplyData).not.toHaveBeenCalled();
+		});
+
+		it('should handle disabled tool nodes', async () => {
+			const disabledToolNode = mock<INode>({
+				name: 'Disabled Tool',
+				type: 'test.tool',
+				disabled: true,
+			});
+
+			agentNodeType.description.inputs = [
+				{
+					type: NodeConnectionType.AiTool,
+					required: true,
+				},
+			];
+
+			workflow.getParentNodes
+				.calledWith(agentNode.name, NodeConnectionType.AiTool)
+				.mockReturnValue([disabledToolNode.name]);
+			workflow.getNode.calledWith(disabledToolNode.name).mockReturnValue(disabledToolNode);
+
+			await expect(
+				executeContext.getInputConnectionData(NodeConnectionType.AiTool, 0),
+			).rejects.toThrow('must be connected and enabled');
+			expect(supplyData).not.toHaveBeenCalled();
+		});
+
+		it('should handle multiple connected tools', async () => {
+			agentNodeType.description.inputs = [
+				{
+					type: NodeConnectionType.AiTool,
+					required: true,
+				},
+			];
+
+			nodeTypes.getByNameAndVersion
+				.calledWith(secondToolNode.type, expect.anything())
+				.mockReturnValue(secondToolNodeType);
+
+			workflow.getParentNodes
+				.calledWith(agentNode.name, NodeConnectionType.AiTool)
+				.mockReturnValue([toolNode.name, secondToolNode.name]);
+
+			const result = await executeContext.getInputConnectionData(NodeConnectionType.AiTool, 0);
+			expect(result).toEqual([mockTool, secondMockTool]);
+			expect(supplyData).toHaveBeenCalled();
+			expect(secondToolNodeType.supplyData).toHaveBeenCalled();
+		});
+
+		it('should handle tool execution errors', async () => {
+			supplyData.mockRejectedValueOnce(new Error('Tool execution error'));
+
+			agentNodeType.description.inputs = [
+				{
+					type: NodeConnectionType.AiTool,
+					required: true,
+				},
+			];
+
+			await expect(
+				executeContext.getInputConnectionData(NodeConnectionType.AiTool, 0),
+			).rejects.toThrow(`Error in sub-node ${toolNode.name}`);
+			expect(supplyData).toHaveBeenCalled();
+		});
+
+		it('should return the tool when there are no issues', async () => {
+			agentNodeType.description.inputs = [
+				{
+					type: NodeConnectionType.AiTool,
+					required: true,
+				},
+			];
+
+			const result = await executeContext.getInputConnectionData(NodeConnectionType.AiTool, 0);
+			expect(result).toEqual([mockTool]);
+			expect(supplyData).toHaveBeenCalled();
+		});
+	});
+});
diff --git a/packages/core/src/node-execution-context/__tests__/utils.test.ts b/packages/core/src/node-execution-context/utils/__tests__/validateValueAgainstSchema.test.ts
similarity index 59%
rename from packages/core/src/node-execution-context/__tests__/utils.test.ts
rename to packages/core/src/node-execution-context/utils/__tests__/validateValueAgainstSchema.test.ts
index 1871af4c0db66..e09299a4572f6 100644
--- a/packages/core/src/node-execution-context/__tests__/utils.test.ts
+++ b/packages/core/src/node-execution-context/utils/__tests__/validateValueAgainstSchema.test.ts
@@ -1,119 +1,6 @@
-import toPlainObject from 'lodash/toPlainObject';
-import { DateTime } from 'luxon';
-import type { IDataObject, INode, INodeType, NodeParameterValue } from 'n8n-workflow';
-import { ExpressionError } from 'n8n-workflow';
+import type { IDataObject, INode, INodeType } from 'n8n-workflow';
 
-import { cleanupParameterData, ensureType, validateValueAgainstSchema } from '../utils';
-
-describe('cleanupParameterData', () => {
-	it('should stringify Luxon dates in-place', () => {
-		const input = { x: 1, y: DateTime.now() as unknown as NodeParameterValue };
-		expect(typeof input.y).toBe('object');
-		cleanupParameterData(input);
-		expect(typeof input.y).toBe('string');
-	});
-
-	it('should stringify plain Luxon dates in-place', () => {
-		const input = {
-			x: 1,
-			y: toPlainObject(DateTime.now()),
-		};
-		expect(typeof input.y).toBe('object');
-		cleanupParameterData(input);
-		expect(typeof input.y).toBe('string');
-	});
-
-	it('should handle objects with nameless constructors', () => {
-		const input = { x: 1, y: { constructor: {} } as NodeParameterValue };
-		expect(typeof input.y).toBe('object');
-		cleanupParameterData(input);
-		expect(typeof input.y).toBe('object');
-	});
-
-	it('should handle objects without a constructor', () => {
-		const input = { x: 1, y: { constructor: undefined } as unknown as NodeParameterValue };
-		expect(typeof input.y).toBe('object');
-		cleanupParameterData(input);
-		expect(typeof input.y).toBe('object');
-	});
-});
-
-describe('ensureType', () => {
-	it('throws error for null value', () => {
-		expect(() => ensureType('string', null, 'myParam')).toThrowError(
-			new ExpressionError("Parameter 'myParam' must not be null"),
-		);
-	});
-
-	it('throws error for undefined value', () => {
-		expect(() => ensureType('string', undefined, 'myParam')).toThrowError(
-			new ExpressionError("Parameter 'myParam' could not be 'undefined'"),
-		);
-	});
-
-	it('returns string value without modification', () => {
-		const value = 'hello';
-		const expectedValue = value;
-		const result = ensureType('string', value, 'myParam');
-		expect(result).toBe(expectedValue);
-	});
-
-	it('returns number value without modification', () => {
-		const value = 42;
-		const expectedValue = value;
-		const result = ensureType('number', value, 'myParam');
-		expect(result).toBe(expectedValue);
-	});
-
-	it('returns boolean value without modification', () => {
-		const value = true;
-		const expectedValue = value;
-		const result = ensureType('boolean', value, 'myParam');
-		expect(result).toBe(expectedValue);
-	});
-
-	it('converts object to string if toType is string', () => {
-		const value = { name: 'John' };
-		const expectedValue = JSON.stringify(value);
-		const result = ensureType('string', value, 'myParam');
-		expect(result).toBe(expectedValue);
-	});
-
-	it('converts string to number if toType is number', () => {
-		const value = '10';
-		const expectedValue = 10;
-		const result = ensureType('number', value, 'myParam');
-		expect(result).toBe(expectedValue);
-	});
-
-	it('throws error for invalid conversion to number', () => {
-		const value = 'invalid';
-		expect(() => ensureType('number', value, 'myParam')).toThrowError(
-			new ExpressionError("Parameter 'myParam' must be a number, but we got 'invalid'"),
-		);
-	});
-
-	it('parses valid JSON string to object if toType is object', () => {
-		const value = '{"name": "Alice"}';
-		const expectedValue = JSON.parse(value);
-		const result = ensureType('object', value, 'myParam');
-		expect(result).toEqual(expectedValue);
-	});
-
-	it('throws error for invalid JSON string to object conversion', () => {
-		const value = 'invalid_json';
-		expect(() => ensureType('object', value, 'myParam')).toThrowError(
-			new ExpressionError("Parameter 'myParam' could not be parsed"),
-		);
-	});
-
-	it('throws error for non-array value if toType is array', () => {
-		const value = { name: 'Alice' };
-		expect(() => ensureType('array', value, 'myParam')).toThrowError(
-			new ExpressionError("Parameter 'myParam' must be an array, but we got object"),
-		);
-	});
-});
+import { validateValueAgainstSchema } from '../validateValueAgainstSchema';
 
 describe('validateValueAgainstSchema', () => {
 	test('should validate fixedCollection values parameter', () => {
diff --git a/packages/core/src/node-execution-context/utils/cleanupParameterData.ts b/packages/core/src/node-execution-context/utils/cleanupParameterData.ts
new file mode 100644
index 0000000000000..59f27874ffd26
--- /dev/null
+++ b/packages/core/src/node-execution-context/utils/cleanupParameterData.ts
@@ -0,0 +1,31 @@
+import { DateTime } from 'luxon';
+import type { INodeParameters, NodeParameterValueType } from 'n8n-workflow';
+
+/**
+ * Clean up parameter data to make sure that only valid data gets returned
+ * INFO: Currently only converts Luxon Dates as we know for sure it will not be breaking
+ */
+export function cleanupParameterData(inputData: NodeParameterValueType): void {
+	if (typeof inputData !== 'object' || inputData === null) {
+		return;
+	}
+
+	if (Array.isArray(inputData)) {
+		inputData.forEach((value) => cleanupParameterData(value as NodeParameterValueType));
+		return;
+	}
+
+	if (typeof inputData === 'object') {
+		Object.keys(inputData).forEach((key) => {
+			const value = (inputData as INodeParameters)[key];
+			if (typeof value === 'object') {
+				if (DateTime.isDateTime(value)) {
+					// Is a special luxon date so convert to string
+					(inputData as INodeParameters)[key] = value.toString();
+				} else {
+					cleanupParameterData(value);
+				}
+			}
+		});
+	}
+}
diff --git a/packages/core/src/node-execution-context/utils/ensureType.ts b/packages/core/src/node-execution-context/utils/ensureType.ts
new file mode 100644
index 0000000000000..4869c73ba47dc
--- /dev/null
+++ b/packages/core/src/node-execution-context/utils/ensureType.ts
@@ -0,0 +1,103 @@
+import type { EnsureTypeOptions } from 'n8n-workflow';
+import { ExpressionError } from 'n8n-workflow';
+
+export function ensureType(
+	toType: EnsureTypeOptions,
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	parameterValue: any,
+	parameterName: string,
+	errorOptions?: { itemIndex?: number; runIndex?: number; nodeCause?: string },
+): string | number | boolean | object {
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+	let returnData = parameterValue;
+
+	if (returnData === null) {
+		throw new ExpressionError(`Parameter '${parameterName}' must not be null`, errorOptions);
+	}
+
+	if (returnData === undefined) {
+		throw new ExpressionError(
+			`Parameter '${parameterName}' could not be 'undefined'`,
+			errorOptions,
+		);
+	}
+
+	if (['object', 'array', 'json'].includes(toType)) {
+		if (typeof returnData !== 'object') {
+			// if value is not an object and is string try to parse it, else throw an error
+			if (typeof returnData === 'string' && returnData.length) {
+				try {
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+					const parsedValue = JSON.parse(returnData);
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+					returnData = parsedValue;
+				} catch (error) {
+					throw new ExpressionError(`Parameter '${parameterName}' could not be parsed`, {
+						...errorOptions,
+						// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
+						description: error.message,
+					});
+				}
+			} else {
+				throw new ExpressionError(
+					`Parameter '${parameterName}' must be an ${toType}, but we got '${String(parameterValue)}'`,
+					errorOptions,
+				);
+			}
+		} else if (toType === 'json') {
+			// value is an object, make sure it is valid JSON
+			try {
+				JSON.stringify(returnData);
+			} catch (error) {
+				throw new ExpressionError(`Parameter '${parameterName}' is not valid JSON`, {
+					...errorOptions,
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
+					description: error.message,
+				});
+			}
+		}
+
+		if (toType === 'array' && !Array.isArray(returnData)) {
+			// value is not an array, but has to be
+			throw new ExpressionError(
+				`Parameter '${parameterName}' must be an array, but we got object`,
+				errorOptions,
+			);
+		}
+	}
+
+	try {
+		if (toType === 'string') {
+			if (typeof returnData === 'object') {
+				returnData = JSON.stringify(returnData);
+			} else {
+				returnData = String(returnData);
+			}
+		}
+
+		if (toType === 'number') {
+			returnData = Number(returnData);
+			if (Number.isNaN(returnData)) {
+				throw new ExpressionError(
+					`Parameter '${parameterName}' must be a number, but we got '${parameterValue}'`,
+					errorOptions,
+				);
+			}
+		}
+
+		if (toType === 'boolean') {
+			returnData = Boolean(returnData);
+		}
+	} catch (error) {
+		if (error instanceof ExpressionError) throw error;
+
+		throw new ExpressionError(`Parameter '${parameterName}' could not be converted to ${toType}`, {
+			...errorOptions,
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
+			description: error.message,
+		});
+	}
+
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+	return returnData;
+}
diff --git a/packages/core/src/node-execution-context/utils/getAdditionalKeys.ts b/packages/core/src/node-execution-context/utils/getAdditionalKeys.ts
new file mode 100644
index 0000000000000..28bf3b89f6bc0
--- /dev/null
+++ b/packages/core/src/node-execution-context/utils/getAdditionalKeys.ts
@@ -0,0 +1,74 @@
+import type {
+	IRunExecutionData,
+	IWorkflowDataProxyAdditionalKeys,
+	IWorkflowExecuteAdditionalData,
+	WorkflowExecuteMode,
+} from 'n8n-workflow';
+import { LoggerProxy } from 'n8n-workflow';
+
+import { PLACEHOLDER_EMPTY_EXECUTION_ID } from '@/Constants';
+import {
+	setWorkflowExecutionMetadata,
+	setAllWorkflowExecutionMetadata,
+	getWorkflowExecutionMetadata,
+	getAllWorkflowExecutionMetadata,
+} from '@/ExecutionMetadata';
+import { getSecretsProxy } from '@/Secrets';
+
+/** Returns the additional keys for Expressions and Function-Nodes */
+export function getAdditionalKeys(
+	additionalData: IWorkflowExecuteAdditionalData,
+	mode: WorkflowExecuteMode,
+	runExecutionData: IRunExecutionData | null,
+	options?: { secretsEnabled?: boolean },
+): IWorkflowDataProxyAdditionalKeys {
+	const executionId = additionalData.executionId ?? PLACEHOLDER_EMPTY_EXECUTION_ID;
+	const resumeUrl = `${additionalData.webhookWaitingBaseUrl}/${executionId}`;
+	const resumeFormUrl = `${additionalData.formWaitingBaseUrl}/${executionId}`;
+	return {
+		$execution: {
+			id: executionId,
+			mode: mode === 'manual' ? 'test' : 'production',
+			resumeUrl,
+			resumeFormUrl,
+			customData: runExecutionData
+				? {
+						set(key: string, value: string): void {
+							try {
+								setWorkflowExecutionMetadata(runExecutionData, key, value);
+							} catch (e) {
+								if (mode === 'manual') {
+									throw e;
+								}
+								// eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
+								LoggerProxy.debug(e.message);
+							}
+						},
+						setAll(obj: Record<string, string>): void {
+							try {
+								setAllWorkflowExecutionMetadata(runExecutionData, obj);
+							} catch (e) {
+								if (mode === 'manual') {
+									throw e;
+								}
+								// eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
+								LoggerProxy.debug(e.message);
+							}
+						},
+						get(key: string): string {
+							return getWorkflowExecutionMetadata(runExecutionData, key);
+						},
+						getAll(): Record<string, string> {
+							return getAllWorkflowExecutionMetadata(runExecutionData);
+						},
+					}
+				: undefined,
+		},
+		$vars: additionalData.variables,
+		$secrets: options?.secretsEnabled ? getSecretsProxy(additionalData) : undefined,
+
+		// deprecated
+		$executionId: executionId,
+		$resumeWebhookUrl: resumeUrl,
+	};
+}
diff --git a/packages/core/src/node-execution-context/utils/getInputConnectionData.ts b/packages/core/src/node-execution-context/utils/getInputConnectionData.ts
new file mode 100644
index 0000000000000..231f672d65c4b
--- /dev/null
+++ b/packages/core/src/node-execution-context/utils/getInputConnectionData.ts
@@ -0,0 +1,184 @@
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+import type {
+	CloseFunction,
+	IExecuteData,
+	IExecuteFunctions,
+	INodeExecutionData,
+	IRunExecutionData,
+	ITaskDataConnections,
+	IWorkflowExecuteAdditionalData,
+	Workflow,
+	WorkflowExecuteMode,
+	SupplyData,
+	AINodeConnectionType,
+} from 'n8n-workflow';
+import {
+	NodeConnectionType,
+	NodeOperationError,
+	ExecutionBaseError,
+	ApplicationError,
+} from 'n8n-workflow';
+
+import { createNodeAsTool } from '@/CreateNodeAsTool';
+// eslint-disable-next-line import/no-cycle
+import { SupplyDataContext } from '@/node-execution-context';
+import type { ExecuteContext, WebhookContext } from '@/node-execution-context';
+
+export async function getInputConnectionData(
+	this: ExecuteContext | WebhookContext | SupplyDataContext,
+	workflow: Workflow,
+	runExecutionData: IRunExecutionData,
+	parentRunIndex: number,
+	connectionInputData: INodeExecutionData[],
+	parentInputData: ITaskDataConnections,
+	additionalData: IWorkflowExecuteAdditionalData,
+	executeData: IExecuteData,
+	mode: WorkflowExecuteMode,
+	closeFunctions: CloseFunction[],
+	connectionType: AINodeConnectionType,
+	itemIndex: number,
+	abortSignal?: AbortSignal,
+): Promise<unknown> {
+	const parentNode = this.getNode();
+
+	const inputConfiguration = this.nodeInputs.find((input) => input.type === connectionType);
+	if (inputConfiguration === undefined) {
+		throw new ApplicationError('Node does not have input of type', {
+			extra: { nodeName: parentNode.name, connectionType },
+		});
+	}
+
+	const connectedNodes = this.getConnectedNodes(connectionType);
+	if (connectedNodes.length === 0) {
+		if (inputConfiguration.required) {
+			throw new NodeOperationError(
+				parentNode,
+				`A ${inputConfiguration?.displayName ?? connectionType} sub-node must be connected and enabled`,
+			);
+		}
+		return inputConfiguration.maxConnections === 1 ? undefined : [];
+	}
+
+	if (
+		inputConfiguration.maxConnections !== undefined &&
+		connectedNodes.length > inputConfiguration.maxConnections
+	) {
+		throw new NodeOperationError(
+			parentNode,
+			`Only ${inputConfiguration.maxConnections} ${connectionType} sub-nodes are/is allowed to be connected`,
+		);
+	}
+
+	const nodes: SupplyData[] = [];
+	for (const connectedNode of connectedNodes) {
+		const connectedNodeType = workflow.nodeTypes.getByNameAndVersion(
+			connectedNode.type,
+			connectedNode.typeVersion,
+		);
+		const contextFactory = (runIndex: number, inputData: ITaskDataConnections) =>
+			new SupplyDataContext(
+				workflow,
+				connectedNode,
+				additionalData,
+				mode,
+				runExecutionData,
+				runIndex,
+				connectionInputData,
+				inputData,
+				connectionType,
+				executeData,
+				closeFunctions,
+				abortSignal,
+			);
+
+		if (!connectedNodeType.supplyData) {
+			if (connectedNodeType.description.outputs.includes(NodeConnectionType.AiTool)) {
+				/**
+				 * This keeps track of how many times this specific AI tool node has been invoked.
+				 * It is incremented on every invocation of the tool to keep the output of each invocation separate from each other.
+				 */
+				let toolRunIndex = 0;
+				const supplyData = createNodeAsTool({
+					node: connectedNode,
+					nodeType: connectedNodeType,
+					handleToolInvocation: async (toolArgs) => {
+						const runIndex = toolRunIndex++;
+						const context = contextFactory(runIndex, {});
+						context.addInputData(NodeConnectionType.AiTool, [[{ json: toolArgs }]]);
+
+						try {
+							// Execute the sub-node with the proxied context
+							const result = await connectedNodeType.execute?.call(
+								context as unknown as IExecuteFunctions,
+							);
+
+							// Process and map the results
+							const mappedResults = result?.[0]?.flatMap((item) => item.json);
+
+							// Add output data to the context
+							context.addOutputData(NodeConnectionType.AiTool, runIndex, [
+								[{ json: { response: mappedResults } }],
+							]);
+
+							// Return the stringified results
+							return JSON.stringify(mappedResults);
+						} catch (error) {
+							const nodeError = new NodeOperationError(connectedNode, error as Error);
+							context.addOutputData(NodeConnectionType.AiTool, runIndex, nodeError);
+							return 'Error during node execution: ' + nodeError.description;
+						}
+					},
+				});
+				nodes.push(supplyData);
+			} else {
+				throw new ApplicationError('Node does not have a `supplyData` method defined', {
+					extra: { nodeName: connectedNode.name },
+				});
+			}
+		} else {
+			const context = contextFactory(parentRunIndex, parentInputData);
+			try {
+				const supplyData = await connectedNodeType.supplyData.call(context, itemIndex);
+				if (supplyData.closeFunction) {
+					closeFunctions.push(supplyData.closeFunction);
+				}
+				nodes.push(supplyData);
+			} catch (error) {
+				// Propagate errors from sub-nodes
+				if (error instanceof ExecutionBaseError) {
+					if (error.functionality === 'configuration-node') throw error;
+				} else {
+					error = new NodeOperationError(connectedNode, error, {
+						itemIndex,
+					});
+				}
+
+				let currentNodeRunIndex = 0;
+				if (runExecutionData.resultData.runData.hasOwnProperty(parentNode.name)) {
+					currentNodeRunIndex = runExecutionData.resultData.runData[parentNode.name].length;
+				}
+
+				// Display the error on the node which is causing it
+				await context.addExecutionDataFunctions(
+					'input',
+					error,
+					connectionType,
+					parentNode.name,
+					currentNodeRunIndex,
+				);
+
+				// Display on the calling node which node has the error
+				throw new NodeOperationError(connectedNode, `Error in sub-node ${connectedNode.name}`, {
+					itemIndex,
+					functionality: 'configuration-node',
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
+					description: error.message,
+				});
+			}
+		}
+	}
+
+	return inputConfiguration.maxConnections === 1
+		? (nodes || [])[0]?.response
+		: nodes.map((node) => node.response);
+}
diff --git a/packages/core/src/node-execution-context/utils/validateValueAgainstSchema.ts b/packages/core/src/node-execution-context/utils/validateValueAgainstSchema.ts
new file mode 100644
index 0000000000000..adac8c3a782aa
--- /dev/null
+++ b/packages/core/src/node-execution-context/utils/validateValueAgainstSchema.ts
@@ -0,0 +1,222 @@
+import type {
+	FieldType,
+	IDataObject,
+	INode,
+	INodeProperties,
+	INodePropertyCollection,
+	INodePropertyOptions,
+	INodeType,
+} from 'n8n-workflow';
+import {
+	ExpressionError,
+	isResourceMapperValue,
+	NodeHelpers,
+	validateFieldType,
+} from 'n8n-workflow';
+
+import type { ExtendedValidationResult } from '@/Interfaces';
+
+const validateResourceMapperValue = (
+	parameterName: string,
+	paramValues: { [key: string]: unknown },
+	node: INode,
+	skipRequiredCheck = false,
+): ExtendedValidationResult => {
+	const result: ExtendedValidationResult = { valid: true, newValue: paramValues };
+	const paramNameParts = parameterName.split('.');
+	if (paramNameParts.length !== 2) {
+		return result;
+	}
+	const resourceMapperParamName = paramNameParts[0];
+	const resourceMapperField = node.parameters[resourceMapperParamName];
+	if (!resourceMapperField || !isResourceMapperValue(resourceMapperField)) {
+		return result;
+	}
+	const schema = resourceMapperField.schema;
+	const paramValueNames = Object.keys(paramValues);
+	for (let i = 0; i < paramValueNames.length; i++) {
+		const key = paramValueNames[i];
+		const resolvedValue = paramValues[key];
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
+		const schemaEntry = schema.find((s) => s.id === key);
+
+		if (
+			!skipRequiredCheck &&
+			schemaEntry?.required === true &&
+			schemaEntry.type !== 'boolean' &&
+			!resolvedValue
+		) {
+			return {
+				valid: false,
+				errorMessage: `The value "${String(key)}" is required but not set`,
+				fieldName: key,
+			};
+		}
+
+		if (schemaEntry?.type) {
+			const validationResult = validateFieldType(key, resolvedValue, schemaEntry.type, {
+				valueOptions: schemaEntry.options,
+				strict: !resourceMapperField.attemptToConvertTypes,
+				parseStrings: !!resourceMapperField.convertFieldsToString,
+			});
+
+			if (!validationResult.valid) {
+				if (!resourceMapperField.ignoreTypeMismatchErrors) {
+					return { ...validationResult, fieldName: key };
+				} else {
+					paramValues[key] = resolvedValue;
+				}
+			} else {
+				// If it's valid, set the casted value
+				paramValues[key] = validationResult.newValue;
+			}
+		}
+	}
+	return result;
+};
+
+const validateCollection = (
+	node: INode,
+	runIndex: number,
+	itemIndex: number,
+	propertyDescription: INodeProperties,
+	parameterPath: string[],
+	validationResult: ExtendedValidationResult,
+): ExtendedValidationResult => {
+	let nestedDescriptions: INodeProperties[] | undefined;
+
+	if (propertyDescription.type === 'fixedCollection') {
+		nestedDescriptions = (propertyDescription.options as INodePropertyCollection[]).find(
+			(entry) => entry.name === parameterPath[1],
+		)?.values;
+	}
+
+	if (propertyDescription.type === 'collection') {
+		nestedDescriptions = propertyDescription.options as INodeProperties[];
+	}
+
+	if (!nestedDescriptions) {
+		return validationResult;
+	}
+
+	const validationMap: {
+		[key: string]: { type: FieldType; displayName: string; options?: INodePropertyOptions[] };
+	} = {};
+
+	for (const prop of nestedDescriptions) {
+		if (!prop.validateType || prop.ignoreValidationDuringExecution) continue;
+
+		validationMap[prop.name] = {
+			type: prop.validateType,
+			displayName: prop.displayName,
+			options:
+				prop.validateType === 'options' ? (prop.options as INodePropertyOptions[]) : undefined,
+		};
+	}
+
+	if (!Object.keys(validationMap).length) {
+		return validationResult;
+	}
+
+	if (validationResult.valid) {
+		for (const value of Array.isArray(validationResult.newValue)
+			? (validationResult.newValue as IDataObject[])
+			: [validationResult.newValue as IDataObject]) {
+			for (const key of Object.keys(value)) {
+				if (!validationMap[key]) continue;
+
+				const fieldValidationResult = validateFieldType(key, value[key], validationMap[key].type, {
+					valueOptions: validationMap[key].options,
+				});
+
+				if (!fieldValidationResult.valid) {
+					throw new ExpressionError(
+						`Invalid input for field '${validationMap[key].displayName}' inside '${propertyDescription.displayName}' in [item ${itemIndex}]`,
+						{
+							description: fieldValidationResult.errorMessage,
+							runIndex,
+							itemIndex,
+							nodeCause: node.name,
+						},
+					);
+				}
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+				value[key] = fieldValidationResult.newValue;
+			}
+		}
+	}
+
+	return validationResult;
+};
+
+export const validateValueAgainstSchema = (
+	node: INode,
+	nodeType: INodeType,
+	parameterValue: string | number | boolean | object | null | undefined,
+	parameterName: string,
+	runIndex: number,
+	itemIndex: number,
+) => {
+	const parameterPath = parameterName.split('.');
+
+	const propertyDescription = nodeType.description.properties.find(
+		(prop) =>
+			parameterPath[0] === prop.name && NodeHelpers.displayParameter(node.parameters, prop, node),
+	);
+
+	if (!propertyDescription) {
+		return parameterValue;
+	}
+
+	let validationResult: ExtendedValidationResult = { valid: true, newValue: parameterValue };
+
+	if (
+		parameterPath.length === 1 &&
+		propertyDescription.validateType &&
+		!propertyDescription.ignoreValidationDuringExecution
+	) {
+		validationResult = validateFieldType(
+			parameterName,
+			parameterValue,
+			propertyDescription.validateType,
+		);
+	} else if (
+		propertyDescription.type === 'resourceMapper' &&
+		parameterPath[1] === 'value' &&
+		typeof parameterValue === 'object'
+	) {
+		validationResult = validateResourceMapperValue(
+			parameterName,
+			parameterValue as { [key: string]: unknown },
+			node,
+			propertyDescription.typeOptions?.resourceMapper?.mode !== 'add',
+		);
+	} else if (['fixedCollection', 'collection'].includes(propertyDescription.type)) {
+		validationResult = validateCollection(
+			node,
+			runIndex,
+			itemIndex,
+			propertyDescription,
+			parameterPath,
+			validationResult,
+		);
+	}
+
+	if (!validationResult.valid) {
+		throw new ExpressionError(
+			`Invalid input for '${
+				validationResult.fieldName
+					? String(validationResult.fieldName)
+					: propertyDescription.displayName
+			}' [item ${itemIndex}]`,
+			{
+				description: validationResult.errorMessage,
+				runIndex,
+				itemIndex,
+				nodeCause: node.name,
+			},
+		);
+	}
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+	return validationResult.newValue;
+};
diff --git a/packages/core/src/node-execution-context/webhook-context.ts b/packages/core/src/node-execution-context/webhook-context.ts
index e1dae9c1debfe..9d131a41038a2 100644
--- a/packages/core/src/node-execution-context/webhook-context.ts
+++ b/packages/core/src/node-execution-context/webhook-context.ts
@@ -1,5 +1,6 @@
 import type { Request, Response } from 'express';
 import type {
+	AINodeConnectionType,
 	CloseFunction,
 	ICredentialDataDecryptedObject,
 	IDataObject,
@@ -11,7 +12,6 @@ import type {
 	IWebhookData,
 	IWebhookFunctions,
 	IWorkflowExecuteAdditionalData,
-	NodeConnectionType,
 	WebhookType,
 	Workflow,
 	WorkflowExecuteMode,
@@ -22,13 +22,13 @@ import { ApplicationError, createDeferredPromise } from 'n8n-workflow';
 import {
 	copyBinaryFile,
 	getBinaryHelperFunctions,
-	getInputConnectionData,
 	getNodeWebhookUrl,
 	getRequestHelperFunctions,
 	returnJsonArray,
 } from '@/NodeExecuteFunctions';
 
 import { NodeExecutionContext } from './node-execution-context';
+import { getInputConnectionData } from './utils/getInputConnectionData';
 
 export class WebhookContext extends NodeExecutionContext implements IWebhookFunctions {
 	readonly helpers: IWebhookFunctions['helpers'];
@@ -138,7 +138,10 @@ export class WebhookContext extends NodeExecutionContext implements IWebhookFunc
 		return this.webhookData.webhookDescription.name;
 	}
 
-	async getInputConnectionData(inputName: NodeConnectionType, itemIndex: number): Promise<unknown> {
+	async getInputConnectionData(
+		connectionType: AINodeConnectionType,
+		itemIndex: number,
+	): Promise<unknown> {
 		// To be able to use expressions like "$json.sessionId" set the
 		// body data the webhook received to what is normally used for
 		// incoming node data.
@@ -170,7 +173,7 @@ export class WebhookContext extends NodeExecutionContext implements IWebhookFunc
 			executeData,
 			this.mode,
 			this.closeFunctions,
-			inputName,
+			connectionType,
 			itemIndex,
 		);
 	}
diff --git a/packages/core/src/node-execution-context/workflow-node-context.ts b/packages/core/src/node-execution-context/workflow-node-context.ts
new file mode 100644
index 0000000000000..18de159e4b0a6
--- /dev/null
+++ b/packages/core/src/node-execution-context/workflow-node-context.ts
@@ -0,0 +1,36 @@
+import type {
+	IGetNodeParameterOptions,
+	INode,
+	IWorkflowExecuteAdditionalData,
+	Workflow,
+	IWorkflowNodeContext,
+} from 'n8n-workflow';
+
+import { NodeExecutionContext } from './node-execution-context';
+
+export class LoadWorkflowNodeContext extends NodeExecutionContext implements IWorkflowNodeContext {
+	// Note that this differs from and does not shadow the function with the
+	// same name in `NodeExecutionContext`, as it has the `itemIndex` parameter
+	readonly getNodeParameter: IWorkflowNodeContext['getNodeParameter'];
+
+	constructor(workflow: Workflow, node: INode, additionalData: IWorkflowExecuteAdditionalData) {
+		super(workflow, node, additionalData, 'internal');
+		{
+			// We need to cast due to the overloaded IWorkflowNodeContext::getNodeParameter function
+			// Which would require us to replicate all overload return types, as TypeScript offers
+			// no convenient solution to refer to a set of overloads.
+			this.getNodeParameter = ((
+				parameterName: string,
+				itemIndex: number,
+				fallbackValue?: unknown,
+				options?: IGetNodeParameterOptions,
+			) =>
+				this._getNodeParameter(
+					parameterName,
+					itemIndex,
+					fallbackValue,
+					options,
+				)) as IWorkflowNodeContext['getNodeParameter'];
+		}
+	}
+}
diff --git a/packages/core/src/utils.ts b/packages/core/src/utils.ts
new file mode 100644
index 0000000000000..c0d29c83dc1ba
--- /dev/null
+++ b/packages/core/src/utils.ts
@@ -0,0 +1,18 @@
+type ObjectLiteral = { [key: string | symbol]: unknown };
+
+/**
+ * Checks if the provided value is a plain object literal (not null, not an array, not a class instance, and not a primitive).
+ * This function serves as a type guard.
+ *
+ * @param candidate - The value to check
+ * @returns {boolean} True if the value is an object literal, false otherwise
+ */
+export function isObjectLiteral(candidate: unknown): candidate is ObjectLiteral {
+	return (
+		typeof candidate === 'object' &&
+		candidate !== null &&
+		!Array.isArray(candidate) &&
+		// eslint-disable-next-line @typescript-eslint/ban-types
+		(Object.getPrototypeOf(candidate) as Object)?.constructor?.name === 'Object'
+	);
+}
diff --git a/packages/core/test/ClassLoader.test.ts b/packages/core/test/ClassLoader.test.ts
new file mode 100644
index 0000000000000..95275726625bf
--- /dev/null
+++ b/packages/core/test/ClassLoader.test.ts
@@ -0,0 +1,52 @@
+import vm from 'vm';
+
+import { loadClassInIsolation } from '@/ClassLoader';
+
+describe('ClassLoader', () => {
+	const filePath = '/path/to/TestClass.js';
+	const className = 'TestClass';
+
+	class TestClass {
+		getValue(): string {
+			return 'test value';
+		}
+	}
+
+	jest.spyOn(vm, 'createContext').mockReturnValue({});
+
+	const runInContext = jest.fn().mockImplementation(() => new TestClass());
+	const scriptSpy = jest.spyOn(vm, 'Script').mockImplementation(function (this: vm.Script) {
+		this.runInContext = runInContext;
+		return this;
+	});
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('should create script with correct require statement', () => {
+		const instance = loadClassInIsolation<TestClass>(filePath, className);
+
+		expect(scriptSpy).toHaveBeenCalledWith(`new (require('${filePath}').${className})()`);
+		expect(instance.getValue()).toBe('test value');
+	});
+
+	it('should handle Windows-style paths', () => {
+		const originalPlatform = process.platform;
+		Object.defineProperty(process, 'platform', { value: 'win32' });
+
+		loadClassInIsolation('/path\\to\\TestClass.js', 'TestClass');
+
+		expect(scriptSpy).toHaveBeenCalledWith(`new (require('${filePath}').${className})()`);
+
+		Object.defineProperty(process, 'platform', { value: originalPlatform });
+	});
+
+	it('should throw error when script execution fails', () => {
+		runInContext.mockImplementationOnce(() => {
+			throw new Error('Script execution failed');
+		});
+
+		expect(() => loadClassInIsolation(filePath, className)).toThrow('Script execution failed');
+	});
+});
diff --git a/packages/core/test/CreateNodeAsTool.test.ts b/packages/core/test/CreateNodeAsTool.test.ts
index 5c485b983718f..fdc14269e11de 100644
--- a/packages/core/test/CreateNodeAsTool.test.ts
+++ b/packages/core/test/CreateNodeAsTool.test.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions, INodeParameters, INodeType } from 'n8n-workflow';
-import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import { mock } from 'jest-mock-extended';
+import type { INodeType, ISupplyDataFunctions, INode } from 'n8n-workflow';
 import { z } from 'zod';
 
 import { createNodeAsTool } from '@/CreateNodeAsTool';
@@ -14,28 +14,29 @@ jest.mock('@langchain/core/tools', () => ({
 }));
 
 describe('createNodeAsTool', () => {
-	let mockCtx: IExecuteFunctions;
-	let mockNode: INodeType;
-	let mockNodeParameters: INodeParameters;
+	const context = mock<ISupplyDataFunctions>({
+		getNodeParameter: jest.fn(),
+		addInputData: jest.fn(),
+		addOutputData: jest.fn(),
+		getNode: jest.fn(),
+	});
+	const handleToolInvocation = jest.fn();
+	const nodeType = mock<INodeType>({
+		description: {
+			name: 'TestNode',
+			description: 'Test node description',
+		},
+	});
+	const node = mock<INode>({ name: 'Test_Node' });
+	const options = { node, nodeType, handleToolInvocation };
 
 	beforeEach(() => {
-		// Setup mock objects
-		mockCtx = {
-			getNodeParameter: jest.fn(),
-			addInputData: jest.fn().mockReturnValue({ index: 0 }),
-			addOutputData: jest.fn(),
-			getNode: jest.fn().mockReturnValue({ name: 'Test_Node' }),
-		} as unknown as IExecuteFunctions;
-
-		mockNode = {
-			description: {
-				name: 'TestNode',
-				description: 'Test node description',
-			},
-			execute: jest.fn().mockResolvedValue([[{ json: { result: 'test' } }]]),
-		} as unknown as INodeType;
+		jest.clearAllMocks();
+		(context.addInputData as jest.Mock).mockReturnValue({ index: 0 });
+		(context.getNode as jest.Mock).mockReturnValue(node);
+		(nodeType.execute as jest.Mock).mockResolvedValue([[{ json: { result: 'test' } }]]);
 
-		mockNodeParameters = {
+		node.parameters = {
 			param1: "={{$fromAI('param1', 'Test parameter', 'string') }}",
 			param2: 'static value',
 			nestedParam: {
@@ -45,13 +46,11 @@ describe('createNodeAsTool', () => {
 			resource: 'testResource',
 			operation: 'testOperation',
 		};
-
-		jest.clearAllMocks();
 	});
 
 	describe('Tool Creation and Basic Properties', () => {
 		it('should create a DynamicStructuredTool with correct properties', () => {
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool).toBeDefined();
 			expect(tool.name).toBe('Test_Node');
@@ -62,10 +61,10 @@ describe('createNodeAsTool', () => {
 		});
 
 		it('should use toolDescription if provided', () => {
-			mockNodeParameters.descriptionType = 'manual';
-			mockNodeParameters.toolDescription = 'Custom tool description';
+			node.parameters.descriptionType = 'manual';
+			node.parameters.toolDescription = 'Custom tool description';
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.description).toBe('Custom tool description');
 		});
@@ -73,7 +72,7 @@ describe('createNodeAsTool', () => {
 
 	describe('Schema Creation and Parameter Handling', () => {
 		it('should create a schema based on fromAI arguments in nodeParameters', () => {
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema).toBeDefined();
 			expect(tool.schema.shape).toHaveProperty('param1');
@@ -82,14 +81,14 @@ describe('createNodeAsTool', () => {
 		});
 
 		it('should handle fromAI arguments correctly', () => {
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.param1).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape.subparam).toBeInstanceOf(z.ZodString);
 		});
 
 		it('should handle default values correctly', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				paramWithDefault:
 					"={{ $fromAI('paramWithDefault', 'Parameter with default', 'string', 'default value') }}",
 				numberWithDefault:
@@ -98,7 +97,7 @@ describe('createNodeAsTool', () => {
 					"={{ $fromAI('booleanWithDefault', 'Boolean with default', 'boolean', true) }}",
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.paramWithDefault.description).toBe('Parameter with default');
 			expect(tool.schema.shape.numberWithDefault.description).toBe('Number with default');
@@ -106,7 +105,7 @@ describe('createNodeAsTool', () => {
 		});
 
 		it('should handle nested parameters correctly', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				topLevel: "={{ $fromAI('topLevel', 'Top level parameter', 'string') }}",
 				nested: {
 					level1: "={{ $fromAI('level1', 'Nested level 1', 'string') }}",
@@ -116,7 +115,7 @@ describe('createNodeAsTool', () => {
 				},
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.topLevel).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape.level1).toBeInstanceOf(z.ZodString);
@@ -124,14 +123,14 @@ describe('createNodeAsTool', () => {
 		});
 
 		it('should handle array parameters correctly', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				arrayParam: [
 					"={{ $fromAI('item1', 'First item', 'string') }}",
 					"={{ $fromAI('item2', 'Second item', 'number') }}",
 				],
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.item1).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape.item2).toBeInstanceOf(z.ZodNumber);
@@ -140,45 +139,37 @@ describe('createNodeAsTool', () => {
 
 	describe('Error Handling and Edge Cases', () => {
 		it('should handle error during node execution', async () => {
-			mockNode.execute = jest.fn().mockRejectedValue(new Error('Execution failed'));
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			nodeType.execute = jest.fn().mockRejectedValue(new Error('Execution failed'));
+			const tool = createNodeAsTool(options).response;
+			handleToolInvocation.mockReturnValue('Error during node execution: some random issue.');
 
 			const result = await tool.func({ param1: 'test value' });
 
 			expect(result).toContain('Error during node execution:');
-			expect(mockCtx.addOutputData).toHaveBeenCalledWith(
-				NodeConnectionType.AiTool,
-				0,
-				expect.any(NodeOperationError),
-			);
 		});
 
 		it('should throw an error for invalid parameter names', () => {
-			mockNodeParameters.invalidParam = "$fromAI('invalid param', 'Invalid parameter', 'string')";
+			node.parameters.invalidParam = "$fromAI('invalid param', 'Invalid parameter', 'string')";
 
-			expect(() => createNodeAsTool(mockCtx, mockNode, mockNodeParameters)).toThrow(
-				'Parameter key `invalid param` is invalid',
-			);
+			expect(() => createNodeAsTool(options)).toThrow('Parameter key `invalid param` is invalid');
 		});
 
 		it('should throw an error for $fromAI calls with unsupported types', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				invalidTypeParam:
 					"={{ $fromAI('invalidType', 'Param with unsupported type', 'unsupportedType') }}",
 			};
 
-			expect(() => createNodeAsTool(mockCtx, mockNode, mockNodeParameters)).toThrow(
-				'Invalid type: unsupportedType',
-			);
+			expect(() => createNodeAsTool(options)).toThrow('Invalid type: unsupportedType');
 		});
 
 		it('should handle empty parameters and parameters with no fromAI calls', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				param1: 'static value 1',
 				param2: 'static value 2',
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape).toEqual({});
 		});
@@ -186,13 +177,13 @@ describe('createNodeAsTool', () => {
 
 	describe('Parameter Name and Description Handling', () => {
 		it('should accept parameter names with underscores and hyphens', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				validName1:
 					"={{ $fromAI('param_name-1', 'Valid name with underscore and hyphen', 'string') }}",
 				validName2: "={{ $fromAI('param_name_2', 'Another valid name', 'number') }}",
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape['param_name-1']).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape['param_name-1'].description).toBe(
@@ -204,22 +195,20 @@ describe('createNodeAsTool', () => {
 		});
 
 		it('should throw an error for parameter names with invalid special characters', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				invalidNameParam:
 					"={{ $fromAI('param@name!', 'Invalid name with special characters', 'string') }}",
 			};
 
-			expect(() => createNodeAsTool(mockCtx, mockNode, mockNodeParameters)).toThrow(
-				'Parameter key `param@name!` is invalid',
-			);
+			expect(() => createNodeAsTool(options)).toThrow('Parameter key `param@name!` is invalid');
 		});
 
 		it('should throw an error for empty parameter name', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				invalidNameParam: "={{ $fromAI('', 'Invalid name with special characters', 'string') }}",
 			};
 
-			expect(() => createNodeAsTool(mockCtx, mockNode, mockNodeParameters)).toThrow(
+			expect(() => createNodeAsTool(options)).toThrow(
 				'You must specify a key when using $fromAI()',
 			);
 		});
@@ -227,50 +216,51 @@ describe('createNodeAsTool', () => {
 		it('should handle parameter names with exact and exceeding character limits', () => {
 			const longName = 'a'.repeat(64);
 			const tooLongName = 'a'.repeat(65);
-			mockNodeParameters = {
+			node.parameters = {
 				longNameParam: `={{ $fromAI('${longName}', 'Param with 64 character name', 'string') }}`,
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape[longName]).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape[longName].description).toBe('Param with 64 character name');
 
-			expect(() =>
-				createNodeAsTool(mockCtx, mockNode, {
-					tooLongNameParam: `={{ $fromAI('${tooLongName}', 'Param with 65 character name', 'string') }}`,
-				}),
-			).toThrow(`Parameter key \`${tooLongName}\` is invalid`);
+			node.parameters = {
+				tooLongNameParam: `={{ $fromAI('${tooLongName}', 'Param with 65 character name', 'string') }}`,
+			};
+			expect(() => createNodeAsTool(options)).toThrow(
+				`Parameter key \`${tooLongName}\` is invalid`,
+			);
 		});
 
 		it('should handle $fromAI calls with empty description', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				emptyDescriptionParam: "={{ $fromAI('emptyDescription', '', 'number') }}",
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.emptyDescription).toBeInstanceOf(z.ZodNumber);
 			expect(tool.schema.shape.emptyDescription.description).toBeUndefined();
 		});
 
 		it('should throw an error for calls with the same parameter but different descriptions', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				duplicateParam1: "={{ $fromAI('duplicate', 'First duplicate', 'string') }}",
 				duplicateParam2: "={{ $fromAI('duplicate', 'Second duplicate', 'number') }}",
 			};
 
-			expect(() => createNodeAsTool(mockCtx, mockNode, mockNodeParameters)).toThrow(
+			expect(() => createNodeAsTool(options)).toThrow(
 				"Duplicate key 'duplicate' found with different description or type",
 			);
 		});
 		it('should throw an error for calls with the same parameter but different types', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				duplicateParam1: "={{ $fromAI('duplicate', 'First duplicate', 'string') }}",
 				duplicateParam2: "={{ $fromAI('duplicate', 'First duplicate', 'number') }}",
 			};
 
-			expect(() => createNodeAsTool(mockCtx, mockNode, mockNodeParameters)).toThrow(
+			expect(() => createNodeAsTool(options)).toThrow(
 				"Duplicate key 'duplicate' found with different description or type",
 			);
 		});
@@ -278,7 +268,7 @@ describe('createNodeAsTool', () => {
 
 	describe('Complex Parsing Scenarios', () => {
 		it('should correctly parse $fromAI calls with varying spaces, capitalization, and within template literals', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				varyingSpacing1: "={{$fromAI('param1','Description1','string')}}",
 				varyingSpacing2: "={{  $fromAI (  'param2' , 'Description2' , 'number' )  }}",
 				varyingSpacing3: "={{ $FROMai('param3', 'Description3', 'boolean') }}",
@@ -288,7 +278,7 @@ describe('createNodeAsTool', () => {
 					"={{ `Value is: ${$fromAI('templatedParam', 'Templated param description', 'string')}` }}",
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.param1).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape.param1.description).toBe('Description1');
@@ -307,12 +297,12 @@ describe('createNodeAsTool', () => {
 		});
 
 		it('should correctly parse multiple $fromAI calls interleaved with regular text', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				interleavedParams:
 					"={{ 'Start ' + $fromAI('param1', 'First param', 'string') + ' Middle ' + $fromAI('param2', 'Second param', 'number') + ' End' }}",
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.param1).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape.param1.description).toBe('First param');
@@ -322,12 +312,12 @@ describe('createNodeAsTool', () => {
 		});
 
 		it('should correctly parse $fromAI calls with complex JSON default values', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				complexJsonDefault:
 					'={{ $fromAI(\'complexJson\', \'Param with complex JSON default\', \'json\', \'{"nested": {"key": "value"}, "array": [1, 2, 3]}\') }}',
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.complexJson._def.innerType).toBeInstanceOf(z.ZodRecord);
 			expect(tool.schema.shape.complexJson.description).toBe('Param with complex JSON default');
@@ -338,7 +328,7 @@ describe('createNodeAsTool', () => {
 		});
 
 		it('should ignore $fromAI calls embedded in non-string node parameters', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				numberParam: 42,
 				booleanParam: false,
 				objectParam: {
@@ -355,7 +345,7 @@ describe('createNodeAsTool', () => {
 				],
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.innerParam).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape.innerParam.description).toBe('Inner param');
@@ -373,48 +363,48 @@ describe('createNodeAsTool', () => {
 
 	describe('Escaping and Special Characters', () => {
 		it('should handle escaped single quotes in parameter names and descriptions', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				escapedQuotesParam:
 					"={{ $fromAI('paramName', 'Description with \\'escaped\\' quotes', 'string') }}",
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.paramName).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape.paramName.description).toBe("Description with 'escaped' quotes");
 		});
 
 		it('should handle escaped double quotes in parameter names and descriptions', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				escapedQuotesParam:
 					'={{ $fromAI("paramName", "Description with \\"escaped\\" quotes", "string") }}',
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.paramName).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape.paramName.description).toBe('Description with "escaped" quotes');
 		});
 
 		it('should handle escaped backslashes in parameter names and descriptions', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				escapedBackslashesParam:
 					"={{ $fromAI('paramName', 'Description with \\\\ backslashes', 'string') }}",
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.paramName).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape.paramName.description).toBe('Description with \\ backslashes');
 		});
 
 		it('should handle mixed escaped characters in parameter names and descriptions', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				mixedEscapesParam:
 					'={{ $fromAI(`paramName`, \'Description with \\\'mixed" characters\', "number") }}',
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.paramName).toBeInstanceOf(z.ZodNumber);
 			expect(tool.schema.shape.paramName.description).toBe('Description with \'mixed" characters');
@@ -423,12 +413,12 @@ describe('createNodeAsTool', () => {
 
 	describe('Edge Cases and Limitations', () => {
 		it('should ignore excess arguments in $fromAI calls beyond the fourth argument', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				excessArgsParam:
 					"={{ $fromAI('excessArgs', 'Param with excess arguments', 'string', 'default', 'extraArg1', 'extraArg2') }}",
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.excessArgs._def.innerType).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape.excessArgs.description).toBe('Param with excess arguments');
@@ -436,12 +426,12 @@ describe('createNodeAsTool', () => {
 		});
 
 		it('should correctly parse $fromAI calls with nested parentheses', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				nestedParenthesesParam:
 					"={{ $fromAI('paramWithNested', 'Description with ((nested)) parentheses', 'string') }}",
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.paramWithNested).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape.paramWithNested.description).toBe(
@@ -451,24 +441,24 @@ describe('createNodeAsTool', () => {
 
 		it('should handle $fromAI calls with very long descriptions', () => {
 			const longDescription = 'A'.repeat(1000);
-			mockNodeParameters = {
+			node.parameters = {
 				longParam: `={{ $fromAI('longParam', '${longDescription}', 'string') }}`,
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.longParam).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape.longParam.description).toBe(longDescription);
 		});
 
 		it('should handle $fromAI calls with only some parameters', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				partialParam1: "={{ $fromAI('partial1') }}",
 				partialParam2: "={{ $fromAI('partial2', 'Description only') }}",
 				partialParam3: "={{ $fromAI('partial3', '', 'number') }}",
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.partial1).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape.partial2).toBeInstanceOf(z.ZodString);
@@ -478,11 +468,11 @@ describe('createNodeAsTool', () => {
 
 	describe('Unicode and Internationalization', () => {
 		it('should handle $fromAI calls with unicode characters', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				unicodeParam: "={{ $fromAI('unicodeParam', '🌈 Unicode parameter 你好', 'string') }}",
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.unicodeParam).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape.unicodeParam.description).toBe('🌈 Unicode parameter 你好');
diff --git a/packages/core/test/DirectoryLoader.test.ts b/packages/core/test/DirectoryLoader.test.ts
new file mode 100644
index 0000000000000..01a8c8d34a3e9
--- /dev/null
+++ b/packages/core/test/DirectoryLoader.test.ts
@@ -0,0 +1,781 @@
+import { mock } from 'jest-mock-extended';
+import type {
+	ICredentialType,
+	INodeType,
+	INodeTypeDescription,
+	IVersionedNodeType,
+} from 'n8n-workflow';
+import { deepCopy } from 'n8n-workflow';
+import fs from 'node:fs';
+import fsPromises from 'node:fs/promises';
+
+jest.mock('node:fs');
+jest.mock('node:fs/promises');
+const mockFs = mock<typeof fs>();
+const mockFsPromises = mock<typeof fsPromises>();
+fs.readFileSync = mockFs.readFileSync;
+fsPromises.readFile = mockFsPromises.readFile;
+
+jest.mock('fast-glob', () => async (pattern: string) => {
+	return pattern.endsWith('.node.js')
+		? ['dist/Node1/Node1.node.js', 'dist/Node2/Node2.node.js']
+		: ['dist/Credential1.js'];
+});
+
+import * as classLoader from '@/ClassLoader';
+import {
+	CustomDirectoryLoader,
+	PackageDirectoryLoader,
+	LazyPackageDirectoryLoader,
+} from '@/DirectoryLoader';
+
+describe('DirectoryLoader', () => {
+	const directory = '/not/a/real/path';
+	const packageJson = JSON.stringify({
+		name: 'n8n-nodes-testing',
+		n8n: {
+			credentials: ['dist/Credential1.js'],
+			nodes: ['dist/Node1/Node1.node.js', 'dist/Node2/Node2.node.js'],
+		},
+	});
+
+	const createNode = (name: string, credential?: string) =>
+		mock<INodeType>({
+			description: {
+				name,
+				version: 1,
+				icon: `file:${name}.svg`,
+				iconUrl: undefined,
+				credentials: credential ? [{ name: credential }] : [],
+				properties: [],
+			},
+		});
+
+	const createCredential = (name: string) =>
+		mock<ICredentialType>({
+			name,
+			icon: `file:${name}.svg`,
+			iconUrl: undefined,
+			extends: undefined,
+			properties: [],
+		});
+
+	let mockCredential1: ICredentialType, mockNode1: INodeType, mockNode2: INodeType;
+
+	beforeEach(() => {
+		mockCredential1 = createCredential('credential1');
+		mockNode1 = createNode('node1', 'credential1');
+		mockNode2 = createNode('node2');
+		jest.clearAllMocks();
+	});
+
+	//@ts-expect-error overwrite a readonly property
+	classLoader.loadClassInIsolation = jest.fn((_: string, className: string) => {
+		if (className === 'Node1') return mockNode1;
+		if (className === 'Node2') return mockNode2;
+		if (className === 'Credential1') return mockCredential1;
+		throw new Error(`${className} is invalid`);
+	});
+
+	describe('CustomDirectoryLoader', () => {
+		it('should load custom nodes and credentials', async () => {
+			const loader = new CustomDirectoryLoader(directory);
+			expect(loader.packageName).toEqual('CUSTOM');
+
+			await loader.loadAll();
+
+			expect(loader.isLazyLoaded).toBe(false);
+			expect(mockFsPromises.readFile).not.toHaveBeenCalled();
+			expect(classLoader.loadClassInIsolation).toHaveBeenCalledTimes(3);
+
+			expect(loader.nodesByCredential).toEqual({ credential1: ['node1'] });
+			expect(loader.credentialTypes).toEqual({
+				credential1: { sourcePath: 'dist/Credential1.js', type: mockCredential1 },
+			});
+			expect(loader.nodeTypes).toEqual({
+				node1: { sourcePath: 'dist/Node1/Node1.node.js', type: mockNode1 },
+				node2: { sourcePath: 'dist/Node2/Node2.node.js', type: mockNode2 },
+			});
+			expect(mockCredential1.iconUrl).toBe('icons/CUSTOM/dist/credential1.svg');
+			expect(mockNode1.description.iconUrl).toBe('icons/CUSTOM/dist/Node1/node1.svg');
+			expect(mockNode2.description.iconUrl).toBe('icons/CUSTOM/dist/Node2/node2.svg');
+
+			expect(mockFs.readFileSync).not.toHaveBeenCalled();
+		});
+	});
+
+	describe('PackageDirectoryLoader', () => {
+		it('should load nodes and credentials from an installed package', async () => {
+			mockFs.readFileSync.calledWith(`${directory}/package.json`).mockReturnValue(packageJson);
+
+			const loader = new PackageDirectoryLoader(directory);
+			expect(loader.packageName).toEqual('n8n-nodes-testing');
+
+			await loader.loadAll();
+
+			expect(loader.isLazyLoaded).toBe(false);
+			expect(mockFsPromises.readFile).not.toHaveBeenCalled();
+			expect(classLoader.loadClassInIsolation).toHaveBeenCalledTimes(3);
+
+			expect(loader.nodesByCredential).toEqual({ credential1: ['node1'] });
+			expect(loader.credentialTypes).toEqual({
+				credential1: { sourcePath: 'dist/Credential1.js', type: mockCredential1 },
+			});
+			expect(loader.nodeTypes).toEqual({
+				node1: { sourcePath: 'dist/Node1/Node1.node.js', type: mockNode1 },
+				node2: { sourcePath: 'dist/Node2/Node2.node.js', type: mockNode2 },
+			});
+			expect(mockCredential1.iconUrl).toBe('icons/n8n-nodes-testing/dist/credential1.svg');
+			expect(mockNode1.description.iconUrl).toBe('icons/n8n-nodes-testing/dist/Node1/node1.svg');
+			expect(mockNode2.description.iconUrl).toBe('icons/n8n-nodes-testing/dist/Node2/node2.svg');
+		});
+
+		it('should throw error when package.json is missing', async () => {
+			mockFs.readFileSync.mockImplementationOnce(() => {
+				throw new Error('ENOENT');
+			});
+
+			expect(() => new PackageDirectoryLoader(directory)).toThrow();
+		});
+
+		it('should throw error when package.json is invalid', async () => {
+			mockFs.readFileSync.calledWith(`${directory}/package.json`).mockReturnValue('invalid json');
+
+			expect(() => new PackageDirectoryLoader(directory)).toThrow('Failed to parse JSON');
+		});
+
+		it('should do nothing if package.json has no n8n field', async () => {
+			mockFs.readFileSync.calledWith(`${directory}/package.json`).mockReturnValue(
+				JSON.stringify({
+					name: 'n8n-nodes-testing',
+				}),
+			);
+
+			const loader = new PackageDirectoryLoader(directory);
+			await loader.loadAll();
+
+			expect(loader.nodeTypes).toEqual({});
+			expect(loader.credentialTypes).toEqual({});
+			expect(classLoader.loadClassInIsolation).not.toHaveBeenCalled();
+		});
+
+		it('should hide httpRequestNode property when credential has supported nodes', async () => {
+			mockFs.readFileSync.calledWith(`${directory}/package.json`).mockReturnValue(packageJson);
+			mockCredential1.httpRequestNode = mock<ICredentialType['httpRequestNode']>({ hidden: false });
+
+			const loader = new PackageDirectoryLoader(directory);
+			await loader.loadAll();
+
+			expect(mockCredential1.httpRequestNode?.hidden).toBe(true);
+		});
+
+		it('should not modify httpRequestNode when credential has no supported nodes', async () => {
+			mockFs.readFileSync.calledWith(`${directory}/package.json`).mockReturnValue(packageJson);
+			mockCredential1.httpRequestNode = mock<ICredentialType['httpRequestNode']>({ hidden: false });
+			mockNode1.description.credentials = [];
+
+			const loader = new PackageDirectoryLoader(directory);
+			await loader.loadAll();
+
+			expect(mockCredential1.httpRequestNode?.hidden).toBe(false);
+		});
+
+		it('should inherit iconUrl from supported node when credential has no icon', async () => {
+			mockFs.readFileSync.calledWith(`${directory}/package.json`).mockReturnValue(packageJson);
+			mockCredential1.icon = undefined;
+
+			const loader = new PackageDirectoryLoader(directory);
+			await loader.loadAll();
+
+			expect(mockCredential1.supportedNodes).toEqual(['node1']);
+			expect(mockCredential1.iconUrl).toBe(mockNode1.description.iconUrl);
+		});
+	});
+
+	describe('LazyPackageDirectoryLoader', () => {
+		it('should skip loading nodes and credentials from a lazy-loadable package', async () => {
+			mockFs.readFileSync.calledWith(`${directory}/package.json`).mockReturnValue(packageJson);
+			mockFsPromises.readFile.mockResolvedValue('[]');
+
+			const loader = new LazyPackageDirectoryLoader(directory);
+			expect(loader.packageName).toEqual('n8n-nodes-testing');
+
+			await loader.loadAll();
+
+			expect(loader.isLazyLoaded).toBe(true);
+			expect(mockFsPromises.readFile).toHaveBeenCalledTimes(4);
+			expect(classLoader.loadClassInIsolation).not.toHaveBeenCalled();
+		});
+
+		it('should fall back to non-lazy loading if any json file fails to parse', async () => {
+			mockFs.readFileSync.calledWith(`${directory}/package.json`).mockReturnValue(packageJson);
+			mockFsPromises.readFile.mockRejectedValue(new Error('Failed to read file'));
+
+			const loader = new LazyPackageDirectoryLoader(directory);
+			await loader.loadAll();
+
+			expect(loader.isLazyLoaded).toBe(false);
+			expect(mockFsPromises.readFile).toHaveBeenCalled();
+			expect(classLoader.loadClassInIsolation).toHaveBeenCalledTimes(3);
+		});
+
+		it('should only load included nodes when includeNodes is set', async () => {
+			mockFs.readFileSync.calledWith(`${directory}/package.json`).mockReturnValue(packageJson);
+
+			mockFsPromises.readFile.mockImplementation(async (path) => {
+				if (typeof path !== 'string') throw new Error('Invalid path');
+
+				if (path.endsWith('known/nodes.json')) {
+					return JSON.stringify({
+						node1: { className: 'Node1', sourcePath: 'dist/Node1/Node1.node.js' },
+						node2: { className: 'Node2', sourcePath: 'dist/Node2/Node2.node.js' },
+					});
+				}
+				if (path.endsWith('known/credentials.json')) {
+					return JSON.stringify({});
+				}
+				if (path.endsWith('types/nodes.json')) {
+					return JSON.stringify([
+						{ name: 'n8n-nodes-testing.node1' },
+						{ name: 'n8n-nodes-testing.node2' },
+					]);
+				}
+				if (path.endsWith('types/credentials.json')) {
+					return JSON.stringify([]);
+				}
+				throw new Error('File not found');
+			});
+
+			const loader = new LazyPackageDirectoryLoader(directory, [], ['n8n-nodes-testing.node1']);
+			await loader.loadAll();
+
+			expect(loader.isLazyLoaded).toBe(true);
+			expect(loader.known.nodes).toEqual({
+				node1: { className: 'Node1', sourcePath: 'dist/Node1/Node1.node.js' },
+			});
+			expect(loader.types.nodes).toHaveLength(1);
+			expect(loader.types.nodes[0].name).toBe('n8n-nodes-testing.node1');
+			expect(classLoader.loadClassInIsolation).not.toHaveBeenCalled();
+		});
+
+		it('should load no nodes when includeNodes does not match any nodes', async () => {
+			mockFs.readFileSync.calledWith(`${directory}/package.json`).mockReturnValue(packageJson);
+
+			mockFsPromises.readFile.mockImplementation(async (path) => {
+				if (typeof path !== 'string') throw new Error('Invalid path');
+
+				if (path.endsWith('known/nodes.json')) {
+					return JSON.stringify({
+						node1: { className: 'Node1', sourcePath: 'dist/Node1/Node1.node.js' },
+						node2: { className: 'Node2', sourcePath: 'dist/Node2/Node2.node.js' },
+					});
+				}
+				if (path.endsWith('known/credentials.json')) {
+					return JSON.stringify({});
+				}
+				if (path.endsWith('types/nodes.json')) {
+					return JSON.stringify([
+						{ name: 'n8n-nodes-testing.node1' },
+						{ name: 'n8n-nodes-testing.node2' },
+					]);
+				}
+				if (path.endsWith('types/credentials.json')) {
+					return JSON.stringify([]);
+				}
+				throw new Error('File not found');
+			});
+
+			const loader = new LazyPackageDirectoryLoader(
+				directory,
+				[],
+				['n8n-nodes-testing.nonexistent'],
+			);
+			await loader.loadAll();
+
+			expect(loader.isLazyLoaded).toBe(true);
+			expect(loader.known.nodes).toEqual({});
+			expect(loader.types.nodes).toHaveLength(0);
+			expect(classLoader.loadClassInIsolation).not.toHaveBeenCalled();
+		});
+
+		it('should exclude specified nodes when excludeNodes is set', async () => {
+			mockFs.readFileSync.calledWith(`${directory}/package.json`).mockReturnValue(packageJson);
+
+			mockFsPromises.readFile.mockImplementation(async (path) => {
+				if (typeof path !== 'string') throw new Error('Invalid path');
+
+				if (path.endsWith('known/nodes.json')) {
+					return JSON.stringify({
+						node1: { className: 'Node1', sourcePath: 'dist/Node1/Node1.node.js' },
+						node2: { className: 'Node2', sourcePath: 'dist/Node2/Node2.node.js' },
+					});
+				}
+				if (path.endsWith('known/credentials.json')) {
+					return JSON.stringify({});
+				}
+				if (path.endsWith('types/nodes.json')) {
+					return JSON.stringify([
+						{ name: 'n8n-nodes-testing.node1' },
+						{ name: 'n8n-nodes-testing.node2' },
+					]);
+				}
+				if (path.endsWith('types/credentials.json')) {
+					return JSON.stringify([]);
+				}
+				throw new Error('File not found');
+			});
+
+			const loader = new LazyPackageDirectoryLoader(directory, ['n8n-nodes-testing.node1']);
+			await loader.loadAll();
+
+			expect(loader.isLazyLoaded).toBe(true);
+			expect(loader.known.nodes).toEqual({
+				node2: { className: 'Node2', sourcePath: 'dist/Node2/Node2.node.js' },
+			});
+			expect(loader.types.nodes).toHaveLength(1);
+			expect(loader.types.nodes[0].name).toBe('n8n-nodes-testing.node2');
+			expect(classLoader.loadClassInIsolation).not.toHaveBeenCalled();
+		});
+	});
+
+	describe('reset()', () => {
+		it('should reset all properties to their initial state', async () => {
+			mockFs.readFileSync.calledWith(`${directory}/package.json`).mockReturnValue(packageJson);
+
+			const loader = new PackageDirectoryLoader(directory);
+			await loader.loadAll();
+
+			// Verify loader has loaded data
+			expect(loader.nodeTypes).not.toEqual({});
+			expect(loader.credentialTypes).not.toEqual({});
+			expect(loader.types.nodes.length).toBeGreaterThan(0);
+			expect(loader.types.credentials.length).toBeGreaterThan(0);
+			expect(loader.loadedNodes.length).toBeGreaterThan(0);
+			expect(Object.keys(loader.known.nodes).length).toBeGreaterThan(0);
+			expect(Object.keys(loader.known.credentials).length).toBeGreaterThan(0);
+
+			// Reset the loader
+			loader.reset();
+
+			// Verify all properties are reset
+			expect(loader.nodeTypes).toEqual({});
+			expect(loader.credentialTypes).toEqual({});
+			expect(loader.types.nodes).toEqual([]);
+			expect(loader.types.credentials).toEqual([]);
+			expect(loader.loadedNodes).toEqual([]);
+			expect(loader.known.nodes).toEqual({});
+			expect(loader.known.credentials).toEqual({});
+		});
+	});
+
+	describe('getVersionedNodeTypeAll', () => {
+		it('should return array with single node for non-versioned node', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const node = createNode('node1');
+
+			const result = loader.getVersionedNodeTypeAll(node);
+
+			expect(result).toHaveLength(1);
+			expect(result[0]).toBe(node);
+		});
+
+		it('should return all versions of a versioned node', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const nodeV1 = createNode('test');
+			const nodeV2 = createNode('test');
+			nodeV1.description.version = 1;
+			nodeV2.description.version = 2;
+
+			const versionedNode = mock<IVersionedNodeType>({
+				description: { name: 'test', codex: {} },
+				currentVersion: 2,
+				nodeVersions: {
+					1: nodeV1,
+					2: nodeV2,
+				},
+			});
+
+			const result = loader.getVersionedNodeTypeAll(versionedNode);
+
+			expect(result).toHaveLength(2);
+			expect(result).toEqual([nodeV2, nodeV1]);
+			expect(result[0].description.name).toBe('test');
+			expect(result[1].description.name).toBe('test');
+		});
+	});
+
+	describe('getCredentialsForNode', () => {
+		it('should return empty array if node has no credentials', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const node = createNode('node1');
+
+			const result = loader.getCredentialsForNode(node);
+
+			expect(Array.isArray(result)).toBe(true);
+			expect(result.length).toEqual(0);
+		});
+
+		it('should return credentials for non-versioned node', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const node = createNode('node1', 'testCred');
+
+			const result = loader.getCredentialsForNode(node);
+
+			expect(result).toHaveLength(1);
+			expect(result[0].name).toBe('testCred');
+		});
+
+		it('should return unique credentials from all versions of a versioned node', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const nodeV1 = createNode('test', 'cred1');
+			const nodeV2 = createNode('test', 'cred2');
+
+			const versionedNode = mock<IVersionedNodeType>({
+				description: { name: 'test' },
+				currentVersion: 2,
+				nodeVersions: {
+					1: nodeV1,
+					2: nodeV2,
+				},
+			});
+
+			const result = loader.getCredentialsForNode(versionedNode);
+
+			expect(result).toHaveLength(2);
+			expect(result[0].name).toBe('cred1');
+			expect(result[1].name).toBe('cred2');
+		});
+
+		it('should remove duplicate credentials from different versions', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const nodeV1 = createNode('test', 'cred1');
+			const nodeV2 = createNode('test', 'cred1'); // Same credential
+
+			const versionedNode = mock<IVersionedNodeType>({
+				description: { name: 'test' },
+				currentVersion: 2,
+				nodeVersions: {
+					1: nodeV1,
+					2: nodeV2,
+				},
+			});
+
+			const result = loader.getCredentialsForNode(versionedNode);
+
+			expect(result).toHaveLength(1);
+			expect(result[0].name).toBe('cred1');
+		});
+	});
+
+	describe('loadCredentialFromFile', () => {
+		it('should load credential and store it correctly', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const filePath = 'dist/Credential1.js';
+
+			loader.loadCredentialFromFile(filePath);
+
+			expect(loader.credentialTypes).toEqual({
+				credential1: {
+					type: mockCredential1,
+					sourcePath: filePath,
+				},
+			});
+
+			expect(loader.known.credentials).toEqual({
+				credential1: {
+					className: mockCredential1.constructor.name,
+					sourcePath: filePath,
+					extends: undefined,
+					supportedNodes: undefined,
+				},
+			});
+
+			expect(loader.types.credentials).toEqual([mockCredential1]);
+		});
+
+		it('should update credential icon paths', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const filePath = 'dist/Credential1.js';
+
+			const credWithIcon = createCredential('credentialWithIcon');
+			credWithIcon.icon = {
+				light: 'file:light.svg',
+				dark: 'file:dark.svg',
+			};
+
+			jest.spyOn(classLoader, 'loadClassInIsolation').mockReturnValueOnce(credWithIcon);
+
+			loader.loadCredentialFromFile(filePath);
+
+			expect(credWithIcon.iconUrl).toEqual({
+				light: 'icons/CUSTOM/dist/light.svg',
+				dark: 'icons/CUSTOM/dist/dark.svg',
+			});
+			expect(credWithIcon.icon).toBeUndefined();
+		});
+
+		it('should add toJSON method to credential type', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const filePath = 'dist/Credential1.js';
+
+			const credWithAuth = createCredential('credWithAuth');
+			credWithAuth.authenticate = jest.fn();
+
+			jest.spyOn(classLoader, 'loadClassInIsolation').mockReturnValueOnce(credWithAuth);
+
+			loader.loadCredentialFromFile(filePath);
+
+			const serialized = deepCopy(credWithAuth);
+			expect(serialized.authenticate).toEqual({});
+		});
+
+		it('should store credential extends and supported nodes info', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const filePath = 'dist/Credential1.js';
+
+			const extendingCred = createCredential('extendingCred');
+			extendingCred.extends = ['baseCredential'];
+
+			jest.spyOn(classLoader, 'loadClassInIsolation').mockReturnValueOnce(extendingCred);
+
+			// Set up nodesByCredential before loading
+			loader.nodesByCredential.extendingCred = ['node1', 'node2'];
+
+			loader.loadCredentialFromFile(filePath);
+
+			expect(loader.known.credentials.extendingCred).toEqual({
+				className: extendingCred.constructor.name,
+				sourcePath: filePath,
+				extends: ['baseCredential'],
+				supportedNodes: ['node1', 'node2'],
+			});
+		});
+
+		it('should throw error if credential class cannot be loaded', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const filePath = 'dist/InvalidCred.js';
+
+			jest.spyOn(classLoader, 'loadClassInIsolation').mockImplementationOnce(() => {
+				throw new TypeError('Class not found');
+			});
+
+			expect(() => loader.loadCredentialFromFile(filePath)).toThrow('Class could not be found');
+		});
+	});
+
+	describe('getCredential', () => {
+		it('should return existing loaded credential type', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const filePath = 'dist/Credential1.js';
+
+			loader.loadCredentialFromFile(filePath);
+
+			const result = loader.getCredential('credential1');
+			expect(result).toEqual({
+				type: mockCredential1,
+				sourcePath: filePath,
+			});
+		});
+
+		it('should load credential from known credentials if not already loaded', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const filePath = 'dist/Credential1.js';
+
+			// Setup known credentials without loading
+			loader.known.credentials.credential1 = {
+				className: 'Credential1',
+				sourcePath: filePath,
+			};
+
+			const result = loader.getCredential('credential1');
+
+			expect(result).toEqual({
+				type: mockCredential1,
+				sourcePath: filePath,
+			});
+			expect(classLoader.loadClassInIsolation).toHaveBeenCalledWith(
+				expect.stringContaining(filePath),
+				'Credential1',
+			);
+		});
+
+		it('should throw UnrecognizedCredentialTypeError if credential type is not found', () => {
+			const loader = new CustomDirectoryLoader(directory);
+
+			expect(() => loader.getCredential('nonexistent')).toThrow(
+				'Unrecognized credential type: nonexistent',
+			);
+		});
+	});
+
+	describe('loadNodeFromFile', () => {
+		it('should load node and store it correctly', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const filePath = 'dist/Node1/Node1.node.js';
+
+			loader.loadNodeFromFile(filePath);
+
+			expect(loader.nodeTypes).toEqual({
+				node1: {
+					type: mockNode1,
+					sourcePath: filePath,
+				},
+			});
+
+			expect(loader.known.nodes).toEqual({
+				node1: {
+					className: mockNode1.constructor.name,
+					sourcePath: filePath,
+				},
+			});
+
+			expect(loader.types.nodes).toEqual([mockNode1.description]);
+			expect(loader.loadedNodes).toEqual([{ name: 'node1', version: 1 }]);
+		});
+
+		it('should update node icon paths', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const filePath = 'dist/Node1/Node1.node.js';
+
+			const nodeWithIcon = createNode('nodeWithIcon');
+			nodeWithIcon.description.icon = {
+				light: 'file:light.svg',
+				dark: 'file:dark.svg',
+			};
+
+			jest.spyOn(classLoader, 'loadClassInIsolation').mockReturnValueOnce(nodeWithIcon);
+
+			loader.loadNodeFromFile(filePath);
+
+			expect(nodeWithIcon.description.iconUrl).toEqual({
+				light: 'icons/CUSTOM/dist/Node1/light.svg',
+				dark: 'icons/CUSTOM/dist/Node1/dark.svg',
+			});
+			expect(nodeWithIcon.description.icon).toBeUndefined();
+		});
+
+		it('should skip node if included in excludeNodes', () => {
+			const loader = new CustomDirectoryLoader(directory, ['CUSTOM.node1']);
+			const filePath = 'dist/Node1/Node1.node.js';
+
+			loader.loadNodeFromFile(filePath);
+
+			expect(loader.nodeTypes).toEqual({});
+			expect(loader.known.nodes).toEqual({});
+			expect(loader.types.nodes).toEqual([]);
+			expect(loader.loadedNodes).toEqual([]);
+		});
+
+		it('should skip node if not in includeNodes', () => {
+			const loader = new CustomDirectoryLoader(directory, [], ['CUSTOM.other']);
+			const filePath = 'dist/Node1/Node1.node.js';
+
+			loader.loadNodeFromFile(filePath);
+
+			expect(loader.nodeTypes).toEqual({});
+			expect(loader.known.nodes).toEqual({});
+			expect(loader.types.nodes).toEqual([]);
+			expect(loader.loadedNodes).toEqual([]);
+		});
+
+		it('should handle versioned nodes correctly', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const filePath = 'dist/Node1/Node1.node.js';
+
+			const nodeV1 = createNode('test');
+			const nodeV2 = createNode('test');
+			nodeV1.description.version = 1;
+			nodeV2.description.version = 2;
+
+			const versionedNode = mock<IVersionedNodeType>({
+				description: { name: 'test', codex: {}, iconUrl: undefined, icon: undefined },
+				currentVersion: 2,
+				nodeVersions: {
+					1: nodeV1,
+					2: nodeV2,
+				},
+			});
+
+			jest.spyOn(classLoader, 'loadClassInIsolation').mockReturnValueOnce(versionedNode);
+
+			loader.loadNodeFromFile(filePath);
+
+			expect(loader.loadedNodes).toEqual([{ name: 'test', version: 2 }]);
+
+			const nodes = loader.types.nodes as INodeTypeDescription[];
+			expect(nodes).toHaveLength(2);
+			expect(nodes[0]?.version).toBe(2);
+			expect(nodes[1]?.version).toBe(1);
+		});
+
+		it('should store credential associations correctly', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const filePath = 'dist/Node1/Node1.node.js';
+
+			const nodeWithCreds = createNode('testNode', 'testCred');
+			jest.spyOn(classLoader, 'loadClassInIsolation').mockReturnValueOnce(nodeWithCreds);
+
+			loader.loadNodeFromFile(filePath);
+
+			expect(loader.nodesByCredential).toEqual({
+				testCred: ['testNode'],
+			});
+		});
+
+		it('should throw error if node class cannot be loaded', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const filePath = 'dist/InvalidNode/InvalidNode.node.js';
+
+			jest.spyOn(classLoader, 'loadClassInIsolation').mockImplementationOnce(() => {
+				throw new TypeError('Class not found');
+			});
+
+			expect(() => loader.loadNodeFromFile(filePath)).toThrow('Class could not be found');
+		});
+	});
+
+	describe('getNode', () => {
+		it('should return existing loaded node type', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const filePath = 'dist/Node1/Node1.node.js';
+
+			loader.loadNodeFromFile(filePath);
+
+			const result = loader.getNode('node1');
+			expect(result).toEqual({
+				type: mockNode1,
+				sourcePath: filePath,
+			});
+		});
+
+		it('should load node from known nodes if not already loaded', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const filePath = 'dist/Node1/Node1.node.js';
+
+			// Setup known nodes without loading
+			loader.known.nodes.node1 = {
+				className: 'Node1',
+				sourcePath: filePath,
+			};
+
+			const result = loader.getNode('node1');
+
+			expect(result).toEqual({
+				type: mockNode1,
+				sourcePath: filePath,
+			});
+			expect(classLoader.loadClassInIsolation).toHaveBeenCalledWith(
+				expect.stringContaining(filePath),
+				'Node1',
+			);
+		});
+
+		it('should throw UnrecognizedNodeTypeError if node type is not found', () => {
+			const loader = new CustomDirectoryLoader(directory);
+
+			expect(() => loader.getNode('nonexistent')).toThrow(
+				'Unrecognized node type: CUSTOM.nonexistent',
+			);
+		});
+	});
+});
diff --git a/packages/core/test/InstanceSettings.test.ts b/packages/core/test/InstanceSettings.test.ts
index 22f8fadff8e99..b6a9cf63c4db4 100644
--- a/packages/core/test/InstanceSettings.test.ts
+++ b/packages/core/test/InstanceSettings.test.ts
@@ -1,16 +1,18 @@
-import fs from 'fs';
+import { mock } from 'jest-mock-extended';
+jest.mock('node:fs', () => mock<typeof fs>());
+import * as fs from 'node:fs';
 
-import { InstanceSettings } from '../src/InstanceSettings';
-import { InstanceSettingsConfig } from '../src/InstanceSettingsConfig';
+import { InstanceSettings } from '@/InstanceSettings';
+import { InstanceSettingsConfig } from '@/InstanceSettingsConfig';
 
 describe('InstanceSettings', () => {
-	process.env.N8N_USER_FOLDER = '/test';
+	const userFolder = '/test';
+	process.env.N8N_USER_FOLDER = userFolder;
+	const settingsFile = `${userFolder}/.n8n/config`;
 
-	const existSpy = jest.spyOn(fs, 'existsSync');
-	const statSpy = jest.spyOn(fs, 'statSync');
-	const chmodSpy = jest.spyOn(fs, 'chmodSync');
+	const mockFs = mock(fs);
 
-	const createSettingsInstance = (opts?: Partial<InstanceSettingsConfig>) =>
+	const createInstanceSettings = (opts?: Partial<InstanceSettingsConfig>) =>
 		new InstanceSettings({
 			...new InstanceSettingsConfig(),
 			...opts,
@@ -18,18 +20,17 @@ describe('InstanceSettings', () => {
 
 	beforeEach(() => {
 		jest.resetAllMocks();
-		statSpy.mockReturnValue({ mode: 0o600 } as fs.Stats);
+		mockFs.statSync.mockReturnValue({ mode: 0o600 } as fs.Stats);
 	});
 
 	describe('If the settings file exists', () => {
-		const readSpy = jest.spyOn(fs, 'readFileSync');
 		beforeEach(() => {
-			existSpy.mockReturnValue(true);
+			mockFs.existsSync.mockReturnValue(true);
 		});
 
 		it('should load settings from the file', () => {
-			readSpy.mockReturnValue(JSON.stringify({ encryptionKey: 'test_key' }));
-			const settings = createSettingsInstance();
+			mockFs.readFileSync.mockReturnValue(JSON.stringify({ encryptionKey: 'test_key' }));
+			const settings = createInstanceSettings();
 			expect(settings.encryptionKey).toEqual('test_key');
 			expect(settings.instanceId).toEqual(
 				'6ce26c63596f0cc4323563c529acfca0cccb0e57f6533d79a60a42c9ff862ae7',
@@ -37,71 +38,69 @@ describe('InstanceSettings', () => {
 		});
 
 		it('should throw error if settings file is not valid JSON', () => {
-			readSpy.mockReturnValue('{"encryptionKey":"test_key"');
-			expect(() => createSettingsInstance()).toThrowError();
+			mockFs.readFileSync.mockReturnValue('{"encryptionKey":"test_key"');
+			expect(() => createInstanceSettings()).toThrowError();
 		});
 
 		it('should throw if the env and file keys do not match', () => {
-			readSpy.mockReturnValue(JSON.stringify({ encryptionKey: 'key_1' }));
+			mockFs.readFileSync.mockReturnValue(JSON.stringify({ encryptionKey: 'key_1' }));
 			process.env.N8N_ENCRYPTION_KEY = 'key_2';
-			expect(() => createSettingsInstance()).toThrowError();
+			expect(() => createInstanceSettings()).toThrowError();
 		});
 
 		it('should check if the settings file has the correct permissions', () => {
 			process.env.N8N_ENCRYPTION_KEY = 'test_key';
-			readSpy.mockReturnValueOnce(JSON.stringify({ encryptionKey: 'test_key' }));
-			statSpy.mockReturnValueOnce({ mode: 0o600 } as fs.Stats);
-			const settings = createSettingsInstance();
+			mockFs.readFileSync.mockReturnValueOnce(JSON.stringify({ encryptionKey: 'test_key' }));
+			mockFs.statSync.mockReturnValueOnce({ mode: 0o600 } as fs.Stats);
+			const settings = createInstanceSettings();
 			expect(settings.encryptionKey).toEqual('test_key');
 			expect(settings.instanceId).toEqual(
 				'6ce26c63596f0cc4323563c529acfca0cccb0e57f6533d79a60a42c9ff862ae7',
 			);
-			expect(statSpy).toHaveBeenCalledWith('/test/.n8n/config');
+			expect(mockFs.statSync).toHaveBeenCalledWith('/test/.n8n/config');
 		});
 
 		it('should check the permissions but not fix them if settings file has incorrect permissions by default', () => {
-			readSpy.mockReturnValueOnce(JSON.stringify({ encryptionKey: 'test_key' }));
-			statSpy.mockReturnValueOnce({ mode: 0o644 } as fs.Stats);
-			createSettingsInstance();
-			expect(statSpy).toHaveBeenCalledWith('/test/.n8n/config');
-			expect(chmodSpy).not.toHaveBeenCalled();
+			mockFs.readFileSync.mockReturnValueOnce(JSON.stringify({ encryptionKey: 'test_key' }));
+			mockFs.statSync.mockReturnValueOnce({ mode: 0o644 } as fs.Stats);
+			createInstanceSettings();
+			expect(mockFs.statSync).toHaveBeenCalledWith('/test/.n8n/config');
+			expect(mockFs.chmodSync).not.toHaveBeenCalled();
 		});
 
 		it("should not check the permissions if 'N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS' is false", () => {
 			process.env.N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS = 'false';
-			readSpy.mockReturnValueOnce(JSON.stringify({ encryptionKey: 'test_key' }));
-			createSettingsInstance();
-			expect(statSpy).not.toHaveBeenCalled();
-			expect(chmodSpy).not.toHaveBeenCalled();
+			mockFs.readFileSync.mockReturnValueOnce(JSON.stringify({ encryptionKey: 'test_key' }));
+			createInstanceSettings();
+			expect(mockFs.statSync).not.toHaveBeenCalled();
+			expect(mockFs.chmodSync).not.toHaveBeenCalled();
 		});
 
 		it("should fix the permissions of the settings file if 'N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS' is true", () => {
 			process.env.N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS = 'true';
-			readSpy.mockReturnValueOnce(JSON.stringify({ encryptionKey: 'test_key' }));
-			statSpy.mockReturnValueOnce({ mode: 0o644 } as fs.Stats);
-			createSettingsInstance({
+			mockFs.readFileSync.mockReturnValueOnce(JSON.stringify({ encryptionKey: 'test_key' }));
+			mockFs.statSync.mockReturnValueOnce({ mode: 0o644 } as fs.Stats);
+			createInstanceSettings({
 				enforceSettingsFilePermissions: true,
 			});
-			expect(statSpy).toHaveBeenCalledWith('/test/.n8n/config');
-			expect(chmodSpy).toHaveBeenCalledWith('/test/.n8n/config', 0o600);
+			expect(mockFs.statSync).toHaveBeenCalledWith('/test/.n8n/config');
+			expect(mockFs.chmodSync).toHaveBeenCalledWith('/test/.n8n/config', 0o600);
 		});
 	});
 
 	describe('If the settings file does not exist', () => {
-		const mkdirSpy = jest.spyOn(fs, 'mkdirSync');
-		const writeFileSpy = jest.spyOn(fs, 'writeFileSync');
 		beforeEach(() => {
-			existSpy.mockReturnValue(false);
-			mkdirSpy.mockReturnValue('');
-			writeFileSpy.mockReturnValue();
+			mockFs.existsSync.mockReturnValue(false);
+			mockFs.mkdirSync.mockReturnValue('');
+			mockFs.writeFileSync.mockReturnValue();
 		});
 
 		it('should create a new settings file without explicit permissions if N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS is not set', () => {
 			process.env.N8N_ENCRYPTION_KEY = 'key_2';
-			const settings = createSettingsInstance();
+			const settings = createInstanceSettings();
 			expect(settings.encryptionKey).not.toEqual('test_key');
-			expect(mkdirSpy).toHaveBeenCalledWith('/test/.n8n', { recursive: true });
-			expect(writeFileSpy).toHaveBeenCalledWith(
+			expect(mockFs.mkdirSync).toHaveBeenCalledWith('/test/.n8n', { recursive: true });
+			expect(mockFs.writeFileSync).toHaveBeenCalledWith(
 				'/test/.n8n/config',
 				expect.stringContaining('"encryptionKey":'),
 				{
@@ -114,10 +113,10 @@ describe('InstanceSettings', () => {
 		it('should create a new settings file without explicit permissions if N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=false', () => {
 			process.env.N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS = 'false';
 			process.env.N8N_ENCRYPTION_KEY = 'key_2';
-			const settings = createSettingsInstance();
+			const settings = createInstanceSettings();
 			expect(settings.encryptionKey).not.toEqual('test_key');
-			expect(mkdirSpy).toHaveBeenCalledWith('/test/.n8n', { recursive: true });
-			expect(writeFileSpy).toHaveBeenCalledWith(
+			expect(mockFs.mkdirSync).toHaveBeenCalledWith('/test/.n8n', { recursive: true });
+			expect(mockFs.writeFileSync).toHaveBeenCalledWith(
 				'/test/.n8n/config',
 				expect.stringContaining('"encryptionKey":'),
 				{
@@ -130,12 +129,12 @@ describe('InstanceSettings', () => {
 		it('should create a new settings file with explicit permissions if N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=true', () => {
 			process.env.N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS = 'true';
 			process.env.N8N_ENCRYPTION_KEY = 'key_2';
-			const settings = createSettingsInstance({
+			const settings = createInstanceSettings({
 				enforceSettingsFilePermissions: true,
 			});
 			expect(settings.encryptionKey).not.toEqual('test_key');
-			expect(mkdirSpy).toHaveBeenCalledWith('/test/.n8n', { recursive: true });
-			expect(writeFileSpy).toHaveBeenCalledWith(
+			expect(mockFs.mkdirSync).toHaveBeenCalledWith('/test/.n8n', { recursive: true });
+			expect(mockFs.writeFileSync).toHaveBeenCalledWith(
 				'/test/.n8n/config',
 				expect.stringContaining('"encryptionKey":'),
 				{
@@ -147,14 +146,14 @@ describe('InstanceSettings', () => {
 
 		it('should pick up the encryption key from env var N8N_ENCRYPTION_KEY', () => {
 			process.env.N8N_ENCRYPTION_KEY = 'env_key';
-			const settings = createSettingsInstance();
+			const settings = createInstanceSettings();
 			expect(settings.encryptionKey).toEqual('env_key');
 			expect(settings.instanceId).toEqual(
 				'2c70e12b7a0646f92279f427c7b38e7334d8e5389cff167a1dc30e73f826b683',
 			);
 			expect(settings.encryptionKey).not.toEqual('test_key');
-			expect(mkdirSpy).toHaveBeenCalledWith('/test/.n8n', { recursive: true });
-			expect(writeFileSpy).toHaveBeenCalledWith(
+			expect(mockFs.mkdirSync).toHaveBeenCalledWith('/test/.n8n', { recursive: true });
+			expect(mockFs.writeFileSync).toHaveBeenCalledWith(
 				'/test/.n8n/config',
 				expect.stringContaining('"encryptionKey":'),
 				{
@@ -167,10 +166,10 @@ describe('InstanceSettings', () => {
 		it("should not set the permissions of the settings file if 'N8N_IGNORE_SETTINGS_FILE_PERMISSIONS' is true", () => {
 			process.env.N8N_ENCRYPTION_KEY = 'key_2';
 			process.env.N8N_IGNORE_SETTINGS_FILE_PERMISSIONS = 'true';
-			const settings = createSettingsInstance();
+			const settings = createInstanceSettings();
 			expect(settings.encryptionKey).not.toEqual('test_key');
-			expect(mkdirSpy).toHaveBeenCalledWith('/test/.n8n', { recursive: true });
-			expect(writeFileSpy).toHaveBeenCalledWith(
+			expect(mockFs.mkdirSync).toHaveBeenCalledWith('/test/.n8n', { recursive: true });
+			expect(mockFs.writeFileSync).toHaveBeenCalledWith(
 				'/test/.n8n/config',
 				expect.stringContaining('"encryptionKey":'),
 				{
@@ -185,14 +184,67 @@ describe('InstanceSettings', () => {
 		it('should generate a `hostId`', () => {
 			const encryptionKey = 'test_key';
 			process.env.N8N_ENCRYPTION_KEY = encryptionKey;
-			jest.spyOn(fs, 'existsSync').mockReturnValueOnce(true);
-			jest.spyOn(fs, 'readFileSync').mockReturnValueOnce(JSON.stringify({ encryptionKey }));
+			mockFs.existsSync.mockReturnValueOnce(true);
+			mockFs.readFileSync.mockReturnValueOnce(JSON.stringify({ encryptionKey }));
 
-			const settings = createSettingsInstance();
+			const settings = createInstanceSettings();
 
 			const [instanceType, nanoid] = settings.hostId.split('-');
 			expect(instanceType).toEqual('main');
 			expect(nanoid).toHaveLength(16); // e.g. sDX6ZPc0bozv66zM
 		});
 	});
+
+	describe('isDocker', () => {
+		let settings: InstanceSettings;
+
+		beforeEach(() => {
+			mockFs.existsSync.calledWith(settingsFile).mockReturnValue(true);
+			mockFs.readFileSync
+				.calledWith(settingsFile)
+				.mockReturnValue(JSON.stringify({ encryptionKey: 'test_key' }));
+			settings = new InstanceSettings(mock());
+		});
+
+		it('should return true if /.dockerenv exists', () => {
+			mockFs.existsSync.calledWith('/.dockerenv').mockReturnValueOnce(true);
+			expect(settings.isDocker).toBe(true);
+			expect(mockFs.existsSync).toHaveBeenCalledWith('/.dockerenv');
+			expect(mockFs.readFileSync).not.toHaveBeenCalledWith('/proc/self/cgroup', 'utf8');
+		});
+
+		it('should return true if /proc/self/cgroup contains docker', () => {
+			mockFs.existsSync.calledWith('/.dockerenv').mockReturnValueOnce(false);
+			mockFs.readFileSync
+				.calledWith('/proc/self/cgroup', 'utf8')
+				.mockReturnValueOnce('docker cgroup');
+
+			expect(settings.isDocker).toBe(true);
+			expect(mockFs.existsSync).toHaveBeenCalledWith('/.dockerenv');
+			expect(mockFs.readFileSync).toHaveBeenCalledWith('/proc/self/cgroup', 'utf8');
+		});
+
+		it('should return false if no docker indicators are found', () => {
+			mockFs.existsSync.calledWith('/.dockerenv').mockReturnValueOnce(false);
+			mockFs.readFileSync.calledWith('/proc/self/cgroup', 'utf8').mockReturnValueOnce('');
+			expect(settings.isDocker).toBe(false);
+		});
+
+		it('should return false if checking for docker throws an error', () => {
+			mockFs.existsSync.calledWith('/.dockerenv').mockImplementationOnce(() => {
+				throw new Error('Access denied');
+			});
+			expect(settings.isDocker).toBe(false);
+		});
+
+		it('should cache the result of isDocker check', () => {
+			mockFs.existsSync.calledWith('/.dockerenv').mockReturnValueOnce(true);
+
+			expect(settings.isDocker).toBe(true);
+
+			mockFs.existsSync.mockClear();
+			expect(settings.isDocker).toBe(true);
+			expect(mockFs.existsSync).not.toHaveBeenCalled();
+		});
+	});
 });
diff --git a/packages/core/test/NodeExecuteFunctions.test.ts b/packages/core/test/NodeExecuteFunctions.test.ts
index cb2b43ca02ccb..b1b6e96577781 100644
--- a/packages/core/test/NodeExecuteFunctions.test.ts
+++ b/packages/core/test/NodeExecuteFunctions.test.ts
@@ -675,7 +675,6 @@ describe('NodeExecuteFunctions', () => {
 
 		beforeEach(() => {
 			nock.cleanAll();
-			nock.disableNetConnect();
 			jest.clearAllMocks();
 		});
 
diff --git a/packages/workflow/test/RoutingNode.test.ts b/packages/core/test/RoutingNode.test.ts
similarity index 95%
rename from packages/workflow/test/RoutingNode.test.ts
rename to packages/core/test/RoutingNode.test.ts
index a38f4551e2a55..45ef937803ebe 100644
--- a/packages/workflow/test/RoutingNode.test.ts
+++ b/packages/core/test/RoutingNode.test.ts
@@ -1,29 +1,30 @@
 import { mock } from 'jest-mock-extended';
-
+import { get } from 'lodash';
 import type {
-	INode,
-	INodeExecutionData,
-	INodeParameters,
 	DeclarativeRestApiSettings,
-	IRunExecutionData,
-	INodeProperties,
+	IExecuteData,
 	IExecuteSingleFunctions,
 	IHttpRequestOptions,
-	ITaskDataConnections,
-	INodeExecuteFunctions,
+	IN8nHttpFullResponse,
+	IN8nHttpResponse,
 	IN8nRequestOperations,
+	INode,
 	INodeCredentialDescription,
-	IExecuteData,
+	INodeExecutionData,
+	INodeParameters,
+	INodeProperties,
+	INodeType,
 	INodeTypeDescription,
+	IRunExecutionData,
+	ITaskDataConnections,
 	IWorkflowExecuteAdditionalData,
-	IExecuteFunctions,
-} from '@/Interfaces';
-import { applyDeclarativeNodeOptionParameters } from '@/NodeHelpers';
+} from 'n8n-workflow';
+import { NodeHelpers, Workflow } from 'n8n-workflow';
+
+import * as executionContexts from '@/node-execution-context';
 import { RoutingNode } from '@/RoutingNode';
-import * as utilsModule from '@/utils';
-import { Workflow } from '@/Workflow';
 
-import * as Helpers from './Helpers';
+import { NodeTypes } from './helpers';
 
 const postReceiveFunction1 = async function (
 	this: IExecuteSingleFunctions,
@@ -42,14 +43,55 @@ const preSendFunction1 = async function (
 	return requestOptions;
 };
 
+const getExecuteSingleFunctions = (
+	workflow: Workflow,
+	runExecutionData: IRunExecutionData,
+	runIndex: number,
+	node: INode,
+	itemIndex: number,
+) =>
+	mock<executionContexts.ExecuteSingleContext>({
+		getItemIndex: () => itemIndex,
+		getNodeParameter: (parameterName: string) =>
+			workflow.expression.getParameterValue(
+				get(node.parameters, parameterName),
+				runExecutionData,
+				runIndex,
+				itemIndex,
+				node.name,
+				[],
+				'internal',
+				{},
+			),
+		getWorkflow: () => ({
+			id: workflow.id,
+			name: workflow.name,
+			active: workflow.active,
+		}),
+		helpers: mock<IExecuteSingleFunctions['helpers']>({
+			async httpRequest(
+				requestOptions: IHttpRequestOptions,
+			): Promise<IN8nHttpFullResponse | IN8nHttpResponse> {
+				return {
+					body: {
+						headers: {},
+						statusCode: 200,
+						requestOptions,
+					},
+				};
+			},
+		}),
+	});
+
 describe('RoutingNode', () => {
+	const nodeTypes = NodeTypes();
 	const additionalData = mock<IWorkflowExecuteAdditionalData>();
 
 	test('applyDeclarativeNodeOptionParameters', () => {
-		const nodeTypes = Helpers.NodeTypes();
+		const nodeTypes = NodeTypes();
 		const nodeType = nodeTypes.getByNameAndVersion('test.setMulti');
 
-		applyDeclarativeNodeOptionParameters(nodeType);
+		NodeHelpers.applyDeclarativeNodeOptionParameters(nodeType);
 
 		const options = nodeType.description.properties.find(
 			(property) => property.name === 'requestOptions',
@@ -667,7 +709,7 @@ describe('RoutingNode', () => {
 			},
 		];
 
-		const nodeTypes = Helpers.NodeTypes();
+		const nodeTypes = NodeTypes();
 		const node: INode = {
 			parameters: {},
 			name: 'test',
@@ -711,7 +753,7 @@ describe('RoutingNode', () => {
 					mode,
 				);
 
-				const executeSingleFunctions = Helpers.getExecuteSingleFunctions(
+				const executeSingleFunctions = getExecuteSingleFunctions(
 					workflow,
 					runExecutionData,
 					runIndex,
@@ -1861,7 +1903,6 @@ describe('RoutingNode', () => {
 			},
 		];
 
-		const nodeTypes = Helpers.NodeTypes();
 		const baseNode: INode = {
 			parameters: {},
 			name: 'test',
@@ -1877,7 +1918,7 @@ describe('RoutingNode', () => {
 		const connectionInputData: INodeExecutionData[] = [];
 		const runExecutionData: IRunExecutionData = { resultData: { runData: {} } };
 		const nodeType = nodeTypes.getByNameAndVersion(baseNode.type);
-		applyDeclarativeNodeOptionParameters(nodeType);
+		NodeHelpers.applyDeclarativeNodeOptionParameters(nodeType);
 
 		const propertiesOriginal = nodeType.description.properties;
 
@@ -1921,8 +1962,8 @@ describe('RoutingNode', () => {
 					source: null,
 				} as IExecuteData;
 
-				const executeFunctions = mock<IExecuteFunctions>();
-				const executeSingleFunctions = Helpers.getExecuteSingleFunctions(
+				const executeFunctions = mock<executionContexts.ExecuteContext>();
+				const executeSingleFunctions = getExecuteSingleFunctions(
 					workflow,
 					runExecutionData,
 					runIndex,
@@ -1930,10 +1971,10 @@ describe('RoutingNode', () => {
 					itemIndex,
 				);
 
-				const nodeExecuteFunctions: Partial<INodeExecuteFunctions> = {
-					getExecuteFunctions: () => executeFunctions,
-					getExecuteSingleFunctions: () => executeSingleFunctions,
-				};
+				jest.spyOn(executionContexts, 'ExecuteContext').mockReturnValue(executeFunctions);
+				jest
+					.spyOn(executionContexts, 'ExecuteSingleContext')
+					.mockReturnValue(executeSingleFunctions);
 
 				const numberOfItems = testData.input.specialTestOptions?.numberOfItems ?? 1;
 				if (!inputData.main[0] || inputData.main[0].length !== numberOfItems) {
@@ -1943,7 +1984,8 @@ describe('RoutingNode', () => {
 					}
 				}
 
-				const spy = jest.spyOn(utilsModule, 'sleep').mockReturnValue(
+				const workflowPackage = await import('n8n-workflow');
+				const spy = jest.spyOn(workflowPackage, 'sleep').mockReturnValue(
 					new Promise((resolve) => {
 						resolve();
 					}),
@@ -1956,18 +1998,13 @@ describe('RoutingNode', () => {
 				);
 
 				const getNodeParameter = executeSingleFunctions.getNodeParameter;
+				// @ts-expect-error overwriting a method
 				executeSingleFunctions.getNodeParameter = (parameterName: string) =>
 					parameterName in testData.input.node.parameters
 						? testData.input.node.parameters[parameterName]
 						: (getNodeParameter(parameterName) ?? {});
 
-				const result = await routingNode.runNode(
-					inputData,
-					runIndex,
-					nodeType,
-					executeData,
-					nodeExecuteFunctions as INodeExecuteFunctions,
-				);
+				const result = await routingNode.runNode(inputData, runIndex, nodeType, executeData);
 
 				if (testData.input.specialTestOptions?.sleepCalls) {
 					expect(spy.mock.calls).toEqual(testData.input.specialTestOptions?.sleepCalls);
@@ -2042,7 +2079,6 @@ describe('RoutingNode', () => {
 			},
 		];
 
-		const nodeTypes = Helpers.NodeTypes();
 		const baseNode: INode = {
 			parameters: {},
 			name: 'test',
@@ -2052,12 +2088,10 @@ describe('RoutingNode', () => {
 			position: [0, 0],
 		};
 
-		const mode = 'internal';
 		const runIndex = 0;
 		const itemIndex = 0;
-		const connectionInputData: INodeExecutionData[] = [];
 		const runExecutionData: IRunExecutionData = { resultData: { runData: {} } };
-		const nodeType = nodeTypes.getByNameAndVersion(baseNode.type);
+		const nodeType = mock<INodeType>();
 
 		const inputData: ITaskDataConnections = {
 			main: [
@@ -2093,53 +2127,17 @@ describe('RoutingNode', () => {
 					nodeTypes,
 				});
 
-				const routingNode = new RoutingNode(
-					workflow,
-					node,
-					connectionInputData,
-					runExecutionData ?? null,
-					additionalData,
-					mode,
-				);
-
-				const executeData = {
-					data: {},
-					node,
-					source: null,
-				} as IExecuteData;
-
 				let currentItemIndex = 0;
 				for (let iteration = 0; iteration < inputData.main[0]!.length; iteration++) {
-					const nodeExecuteFunctions: Partial<INodeExecuteFunctions> = {
-						getExecuteSingleFunctions: () => {
-							return Helpers.getExecuteSingleFunctions(
-								workflow,
-								runExecutionData,
-								runIndex,
-								node,
-								itemIndex + iteration,
-							);
-						},
-					};
-
-					if (!nodeExecuteFunctions.getExecuteSingleFunctions) {
-						fail('Expected nodeExecuteFunctions to contain getExecuteSingleFunctions');
-					}
-
-					const routingNodeExecutionContext = nodeExecuteFunctions.getExecuteSingleFunctions(
-						routingNode.workflow,
-						routingNode.runExecutionData,
+					const context = getExecuteSingleFunctions(
+						workflow,
+						runExecutionData,
 						runIndex,
-						routingNode.connectionInputData,
-						inputData,
-						routingNode.node,
-						iteration,
-						routingNode.additionalData,
-						executeData,
-						routingNode.mode,
+						node,
+						itemIndex + iteration,
 					);
-
-					currentItemIndex = routingNodeExecutionContext.getItemIndex();
+					jest.spyOn(executionContexts, 'ExecuteSingleContext').mockReturnValue(context);
+					currentItemIndex = context.getItemIndex();
 				}
 
 				const expectedItemIndex = inputData.main[0]!.length - 1;
diff --git a/packages/core/test/SerializedBuffer.test.ts b/packages/core/test/SerializedBuffer.test.ts
new file mode 100644
index 0000000000000..42437296299f0
--- /dev/null
+++ b/packages/core/test/SerializedBuffer.test.ts
@@ -0,0 +1,55 @@
+import type { SerializedBuffer } from '@/SerializedBuffer';
+import { toBuffer, isSerializedBuffer } from '@/SerializedBuffer';
+
+// Mock data for tests
+const validSerializedBuffer: SerializedBuffer = {
+	type: 'Buffer',
+	data: [65, 66, 67], // Corresponds to 'ABC' in ASCII
+};
+
+describe('serializedBufferToBuffer', () => {
+	it('should convert a SerializedBuffer to a Buffer', () => {
+		const buffer = toBuffer(validSerializedBuffer);
+		expect(buffer).toBeInstanceOf(Buffer);
+		expect(buffer.toString()).toBe('ABC');
+	});
+
+	it('should serialize stringified buffer to the same buffer', () => {
+		const serializedBuffer = JSON.stringify(Buffer.from('n8n on the rocks'));
+		const buffer = toBuffer(JSON.parse(serializedBuffer));
+		expect(buffer).toBeInstanceOf(Buffer);
+		expect(buffer.toString()).toBe('n8n on the rocks');
+	});
+});
+
+describe('isSerializedBuffer', () => {
+	it('should return true for a valid SerializedBuffer', () => {
+		expect(isSerializedBuffer(validSerializedBuffer)).toBe(true);
+	});
+
+	test.each([
+		[{ data: [1, 2, 3] }],
+		[{ data: [1, 2, 256] }],
+		[{ type: 'Buffer', data: 'notAnArray' }],
+		[{ data: 42 }],
+		[{ data: 'test' }],
+		[{ data: true }],
+		[null],
+		[undefined],
+		[42],
+		[{}],
+	])('should return false for %s', (value) => {
+		expect(isSerializedBuffer(value)).toBe(false);
+	});
+});
+
+describe('Integration: serializedBufferToBuffer and isSerializedBuffer', () => {
+	it('should correctly validate and convert a SerializedBuffer', () => {
+		if (isSerializedBuffer(validSerializedBuffer)) {
+			const buffer = toBuffer(validSerializedBuffer);
+			expect(buffer.toString()).toBe('ABC');
+		} else {
+			fail('Expected validSerializedBuffer to be a SerializedBuffer');
+		}
+	});
+});
diff --git a/packages/core/test/TriggersAndPollers.test.ts b/packages/core/test/TriggersAndPollers.test.ts
new file mode 100644
index 0000000000000..27cc8b47d9956
--- /dev/null
+++ b/packages/core/test/TriggersAndPollers.test.ts
@@ -0,0 +1,163 @@
+import { mock } from 'jest-mock-extended';
+import { ApplicationError } from 'n8n-workflow';
+import type {
+	Workflow,
+	INode,
+	INodeExecutionData,
+	IPollFunctions,
+	IWorkflowExecuteAdditionalData,
+	INodeType,
+	INodeTypes,
+	ITriggerFunctions,
+	WorkflowHooks,
+	IRun,
+} from 'n8n-workflow';
+
+import { TriggersAndPollers } from '@/TriggersAndPollers';
+
+describe('TriggersAndPollers', () => {
+	const node = mock<INode>();
+	const nodeType = mock<INodeType>({
+		trigger: undefined,
+		poll: undefined,
+	});
+	const nodeTypes = mock<INodeTypes>();
+	const workflow = mock<Workflow>({ nodeTypes });
+	const hookFunctions = mock<WorkflowHooks['hookFunctions']>({
+		sendResponse: [],
+		workflowExecuteAfter: [],
+	});
+	const additionalData = mock<IWorkflowExecuteAdditionalData>({
+		hooks: {
+			hookFunctions,
+		},
+	});
+	const triggersAndPollers = new TriggersAndPollers();
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+	});
+
+	describe('runTrigger()', () => {
+		const triggerFunctions = mock<ITriggerFunctions>();
+		const getTriggerFunctions = jest.fn().mockReturnValue(triggerFunctions);
+		const triggerFn = jest.fn();
+		const mockEmitData: INodeExecutionData[][] = [[{ json: { data: 'test' } }]];
+
+		const runTriggerHelper = async (mode: 'manual' | 'trigger' = 'trigger') =>
+			await triggersAndPollers.runTrigger(
+				workflow,
+				node,
+				getTriggerFunctions,
+				additionalData,
+				mode,
+				'init',
+			);
+
+		it('should throw error if node type does not have trigger function', async () => {
+			await expect(runTriggerHelper()).rejects.toThrow(ApplicationError);
+		});
+
+		it('should call trigger function in regular mode', async () => {
+			nodeType.trigger = triggerFn;
+			triggerFn.mockResolvedValue({ test: true });
+
+			const result = await runTriggerHelper();
+
+			expect(triggerFn).toHaveBeenCalled();
+			expect(result).toEqual({ test: true });
+		});
+
+		describe('manual mode', () => {
+			const getMockTriggerFunctions = () => getTriggerFunctions.mock.results[0]?.value;
+
+			beforeEach(() => {
+				nodeType.trigger = triggerFn;
+				triggerFn.mockResolvedValue({ workflowId: '123' });
+			});
+
+			it('should handle promise resolution', async () => {
+				const result = await runTriggerHelper('manual');
+
+				expect(result?.manualTriggerResponse).toBeInstanceOf(Promise);
+				getMockTriggerFunctions()?.emit?.(mockEmitData);
+			});
+
+			it('should handle error emission', async () => {
+				const testError = new Error('Test error');
+				const result = await runTriggerHelper('manual');
+
+				getMockTriggerFunctions()?.emitError?.(testError);
+				await expect(result?.manualTriggerResponse).rejects.toThrow(testError);
+			});
+
+			it('should handle response promise', async () => {
+				const responsePromise = { resolve: jest.fn(), reject: jest.fn() };
+				await runTriggerHelper('manual');
+
+				getMockTriggerFunctions()?.emit?.(mockEmitData, responsePromise);
+
+				expect(hookFunctions.sendResponse?.length).toBe(1);
+				await hookFunctions.sendResponse![0]?.({ testResponse: true });
+				expect(responsePromise.resolve).toHaveBeenCalledWith({ testResponse: true });
+			});
+
+			it('should handle both response and done promises', async () => {
+				const responsePromise = { resolve: jest.fn(), reject: jest.fn() };
+				const donePromise = { resolve: jest.fn(), reject: jest.fn() };
+				const mockRunData = mock<IRun>({ data: { resultData: { runData: {} } } });
+
+				await runTriggerHelper('manual');
+				getMockTriggerFunctions()?.emit?.(mockEmitData, responsePromise, donePromise);
+
+				await hookFunctions.sendResponse![0]?.({ testResponse: true });
+				expect(responsePromise.resolve).toHaveBeenCalledWith({ testResponse: true });
+
+				await hookFunctions.workflowExecuteAfter?.[0]?.(mockRunData, {});
+				expect(donePromise.resolve).toHaveBeenCalledWith(mockRunData);
+			});
+		});
+	});
+
+	describe('runPoll()', () => {
+		const pollFunctions = mock<IPollFunctions>();
+		const pollFn = jest.fn();
+
+		const runPollHelper = async () =>
+			await triggersAndPollers.runPoll(workflow, node, pollFunctions);
+
+		it('should throw error if node type does not have poll function', async () => {
+			await expect(runPollHelper()).rejects.toThrow(ApplicationError);
+		});
+
+		it('should call poll function and return result', async () => {
+			const mockPollResult: INodeExecutionData[][] = [[{ json: { data: 'test' } }]];
+			nodeType.poll = pollFn;
+			pollFn.mockResolvedValue(mockPollResult);
+
+			const result = await runPollHelper();
+
+			expect(pollFn).toHaveBeenCalled();
+			expect(result).toBe(mockPollResult);
+		});
+
+		it('should return null if poll function returns no data', async () => {
+			nodeType.poll = pollFn;
+			pollFn.mockResolvedValue(null);
+
+			const result = await runPollHelper();
+
+			expect(pollFn).toHaveBeenCalled();
+			expect(result).toBeNull();
+		});
+
+		it('should propagate errors from poll function', async () => {
+			nodeType.poll = pollFn;
+			pollFn.mockRejectedValue(new Error('Poll function failed'));
+
+			await expect(runPollHelper()).rejects.toThrow('Poll function failed');
+			expect(pollFn).toHaveBeenCalled();
+		});
+	});
+});
diff --git a/packages/core/test/WorkflowExecute.test.ts b/packages/core/test/WorkflowExecute.test.ts
index f6f9bd2cbfa39..6a826a8118688 100644
--- a/packages/core/test/WorkflowExecute.test.ts
+++ b/packages/core/test/WorkflowExecute.test.ts
@@ -9,12 +9,26 @@
 // XX denotes that the node is disabled
 // PD denotes that the node has pinned data
 
+import { mock } from 'jest-mock-extended';
 import { pick } from 'lodash';
-import type { IPinData, IRun, IRunData, WorkflowTestData } from 'n8n-workflow';
+import type {
+	IExecuteData,
+	INode,
+	INodeType,
+	INodeTypes,
+	IPinData,
+	IRun,
+	IRunData,
+	IRunExecutionData,
+	ITriggerResponse,
+	IWorkflowExecuteAdditionalData,
+	WorkflowTestData,
+} from 'n8n-workflow';
 import {
 	ApplicationError,
 	createDeferredPromise,
 	NodeExecutionOutput,
+	NodeHelpers,
 	Workflow,
 } from 'n8n-workflow';
 
@@ -444,4 +458,150 @@ describe('WorkflowExecute', () => {
 			);
 		});
 	});
+
+	describe('checkReadyForExecution', () => {
+		const disabledNode = mock<INode>({ name: 'Disabled Node', disabled: true });
+		const startNode = mock<INode>({ name: 'Start Node' });
+		const unknownNode = mock<INode>({ name: 'Unknown Node', type: 'unknownNode' });
+
+		const nodeParamIssuesSpy = jest.spyOn(NodeHelpers, 'getNodeParametersIssues');
+
+		const nodeTypes = mock<INodeTypes>();
+		nodeTypes.getByNameAndVersion.mockImplementation((type) => {
+			// TODO: getByNameAndVersion signature needs to be updated to allow returning undefined
+			if (type === 'unknownNode') return undefined as unknown as INodeType;
+			return mock<INodeType>({
+				description: {
+					properties: [],
+				},
+			});
+		});
+		const workflowExecute = new WorkflowExecute(mock(), 'manual');
+
+		beforeEach(() => jest.clearAllMocks());
+
+		it('should return null if there are no nodes', () => {
+			const workflow = new Workflow({
+				nodes: [],
+				connections: {},
+				active: false,
+				nodeTypes,
+			});
+
+			const issues = workflowExecute.checkReadyForExecution(workflow);
+			expect(issues).toBe(null);
+			expect(nodeTypes.getByNameAndVersion).not.toHaveBeenCalled();
+			expect(nodeParamIssuesSpy).not.toHaveBeenCalled();
+		});
+
+		it('should return null if there are no enabled nodes', () => {
+			const workflow = new Workflow({
+				nodes: [disabledNode],
+				connections: {},
+				active: false,
+				nodeTypes,
+			});
+
+			const issues = workflowExecute.checkReadyForExecution(workflow, {
+				startNode: disabledNode.name,
+			});
+			expect(issues).toBe(null);
+			expect(nodeTypes.getByNameAndVersion).toHaveBeenCalledTimes(1);
+			expect(nodeParamIssuesSpy).not.toHaveBeenCalled();
+		});
+
+		it('should return typeUnknown for unknown nodes', () => {
+			const workflow = new Workflow({
+				nodes: [unknownNode],
+				connections: {},
+				active: false,
+				nodeTypes,
+			});
+
+			const issues = workflowExecute.checkReadyForExecution(workflow, {
+				startNode: unknownNode.name,
+			});
+			expect(issues).toEqual({ [unknownNode.name]: { typeUnknown: true } });
+			expect(nodeTypes.getByNameAndVersion).toHaveBeenCalledTimes(2);
+			expect(nodeParamIssuesSpy).not.toHaveBeenCalled();
+		});
+
+		it('should return issues for regular nodes', () => {
+			const workflow = new Workflow({
+				nodes: [startNode],
+				connections: {},
+				active: false,
+				nodeTypes,
+			});
+			nodeParamIssuesSpy.mockReturnValue({ execution: false });
+
+			const issues = workflowExecute.checkReadyForExecution(workflow, {
+				startNode: startNode.name,
+			});
+			expect(issues).toEqual({ [startNode.name]: { execution: false } });
+			expect(nodeTypes.getByNameAndVersion).toHaveBeenCalledTimes(2);
+			expect(nodeParamIssuesSpy).toHaveBeenCalled();
+		});
+	});
+
+	describe('runNode', () => {
+		const nodeTypes = mock<INodeTypes>();
+		const triggerNode = mock<INode>();
+		const triggerResponse = mock<ITriggerResponse>({
+			closeFunction: jest.fn(),
+			// This node should never trigger, or return
+			manualTriggerFunction: async () => await new Promise(() => {}),
+		});
+		const triggerNodeType = mock<INodeType>({
+			description: {
+				properties: [],
+			},
+			execute: undefined,
+			poll: undefined,
+			webhook: undefined,
+			async trigger() {
+				return triggerResponse;
+			},
+		});
+
+		nodeTypes.getByNameAndVersion.mockReturnValue(triggerNodeType);
+
+		const workflow = new Workflow({
+			nodeTypes,
+			nodes: [triggerNode],
+			connections: {},
+			active: false,
+		});
+
+		const executionData = mock<IExecuteData>();
+		const runExecutionData = mock<IRunExecutionData>();
+		const additionalData = mock<IWorkflowExecuteAdditionalData>();
+		const abortController = new AbortController();
+		const workflowExecute = new WorkflowExecute(additionalData, 'manual');
+
+		test('should call closeFunction when manual trigger is aborted', async () => {
+			const runPromise = workflowExecute.runNode(
+				workflow,
+				executionData,
+				runExecutionData,
+				0,
+				additionalData,
+				'manual',
+				abortController.signal,
+			);
+			// Yield back to the event-loop to let async parts of `runNode` execute
+			await new Promise((resolve) => setImmediate(resolve));
+
+			let isSettled = false;
+			void runPromise.then(() => {
+				isSettled = true;
+			});
+			expect(isSettled).toBe(false);
+			expect(abortController.signal.aborted).toBe(false);
+			expect(triggerResponse.closeFunction).not.toHaveBeenCalled();
+
+			abortController.abort();
+			expect(triggerResponse.closeFunction).toHaveBeenCalled();
+		});
+	});
 });
diff --git a/packages/core/test/error-reporter.test.ts b/packages/core/test/error-reporter.test.ts
new file mode 100644
index 0000000000000..1f507ab5c0081
--- /dev/null
+++ b/packages/core/test/error-reporter.test.ts
@@ -0,0 +1,103 @@
+import { QueryFailedError } from '@n8n/typeorm';
+import type { ErrorEvent } from '@sentry/types';
+import { AxiosError } from 'axios';
+import { ApplicationError } from 'n8n-workflow';
+
+import { ErrorReporter } from '@/error-reporter';
+
+jest.mock('@sentry/node', () => ({
+	init: jest.fn(),
+	setTag: jest.fn(),
+	captureException: jest.fn(),
+	Integrations: {},
+}));
+
+jest.spyOn(process, 'on');
+
+describe('ErrorReporter', () => {
+	const errorReporter = new ErrorReporter();
+	const event = {} as ErrorEvent;
+
+	describe('beforeSend', () => {
+		it('should ignore errors with level warning', async () => {
+			const originalException = new ApplicationError('test');
+			originalException.level = 'warning';
+
+			expect(await errorReporter.beforeSend(event, { originalException })).toEqual(null);
+		});
+
+		it('should keep events with a cause with error level', async () => {
+			const cause = new Error('cause-error');
+			const originalException = new ApplicationError('test', cause);
+
+			expect(await errorReporter.beforeSend(event, { originalException })).toEqual(event);
+		});
+
+		it('should ignore events with error cause with warning level', async () => {
+			const cause: Error & { level?: 'warning' } = new Error('cause-error');
+			cause.level = 'warning';
+			const originalException = new ApplicationError('test', cause);
+
+			expect(await errorReporter.beforeSend(event, { originalException })).toEqual(null);
+		});
+
+		it('should set level, extra, and tags from ApplicationError', async () => {
+			const originalException = new ApplicationError('Test error', {
+				level: 'error',
+				extra: { foo: 'bar' },
+				tags: { tag1: 'value1' },
+			});
+
+			const testEvent = {} as ErrorEvent;
+
+			const result = await errorReporter.beforeSend(testEvent, { originalException });
+
+			expect(result).toEqual({
+				level: 'error',
+				extra: { foo: 'bar' },
+				tags: { tag1: 'value1' },
+			});
+		});
+
+		it('should deduplicate errors with same stack trace', async () => {
+			const originalException = new Error();
+
+			const firstResult = await errorReporter.beforeSend(event, { originalException });
+			expect(firstResult).toEqual(event);
+
+			const secondResult = await errorReporter.beforeSend(event, { originalException });
+			expect(secondResult).toBeNull();
+		});
+
+		it('should handle Promise rejections', async () => {
+			const originalException = Promise.reject(new Error());
+
+			const result = await errorReporter.beforeSend(event, { originalException });
+
+			expect(result).toEqual(event);
+		});
+
+		test.each([
+			['undefined', undefined],
+			['null', null],
+			['an AxiosError', new AxiosError()],
+			['a rejected Promise with AxiosError', Promise.reject(new AxiosError())],
+			[
+				'a QueryFailedError with SQLITE_FULL',
+				new QueryFailedError('', [], new Error('SQLITE_FULL')),
+			],
+			[
+				'a QueryFailedError with SQLITE_IOERR',
+				new QueryFailedError('', [], new Error('SQLITE_IOERR')),
+			],
+			['an ApplicationError with "warning" level', new ApplicationError('', { level: 'warning' })],
+			[
+				'an Error with ApplicationError as cause with "warning" level',
+				new Error('', { cause: new ApplicationError('', { level: 'warning' }) }),
+			],
+		])('should ignore if originalException is %s', async (_, originalException) => {
+			const result = await errorReporter.beforeSend(event, { originalException });
+			expect(result).toBeNull();
+		});
+	});
+});
diff --git a/packages/core/test/helpers/constants.ts b/packages/core/test/helpers/constants.ts
index ac8c366866190..e67caadd1edca 100644
--- a/packages/core/test/helpers/constants.ts
+++ b/packages/core/test/helpers/constants.ts
@@ -102,6 +102,89 @@ export const predefinedNodesTypes: INodeTypeData = {
 			},
 		},
 	},
+	'test.set': {
+		sourcePath: '',
+		type: {
+			description: {
+				displayName: 'Set',
+				name: 'set',
+				group: ['input'],
+				version: 1,
+				description: 'Sets a value',
+				defaults: {
+					name: 'Set',
+					color: '#0000FF',
+				},
+				inputs: [NodeConnectionType.Main],
+				outputs: [NodeConnectionType.Main],
+				properties: [
+					{
+						displayName: 'Value1',
+						name: 'value1',
+						type: 'string',
+						default: 'default-value1',
+					},
+					{
+						displayName: 'Value2',
+						name: 'value2',
+						type: 'string',
+						default: 'default-value2',
+					},
+				],
+			},
+		},
+	},
+	'test.setMulti': {
+		sourcePath: '',
+		type: {
+			description: {
+				displayName: 'Set Multi',
+				name: 'setMulti',
+				group: ['input'],
+				version: 1,
+				description: 'Sets multiple values',
+				defaults: {
+					name: 'Set Multi',
+					color: '#0000FF',
+				},
+				inputs: [NodeConnectionType.Main],
+				outputs: [NodeConnectionType.Main],
+				properties: [
+					{
+						displayName: 'Values',
+						name: 'values',
+						type: 'fixedCollection',
+						typeOptions: {
+							multipleValues: true,
+						},
+						default: {},
+						options: [
+							{
+								name: 'string',
+								displayName: 'String',
+								values: [
+									{
+										displayName: 'Name',
+										name: 'name',
+										type: 'string',
+										default: 'propertyName',
+										placeholder: 'Name of the property to write data to.',
+									},
+									{
+										displayName: 'Value',
+										name: 'value',
+										type: 'string',
+										default: '',
+										placeholder: 'The string value to write in the property.',
+									},
+								],
+							},
+						],
+					},
+				],
+			},
+		},
+	},
 };
 
 export const legacyWorkflowExecuteTests: WorkflowTestData[] = [
diff --git a/packages/core/test/helpers/index.ts b/packages/core/test/helpers/index.ts
index 5f0858ea413ae..14f19789b0712 100644
--- a/packages/core/test/helpers/index.ts
+++ b/packages/core/test/helpers/index.ts
@@ -17,12 +17,14 @@ import type {
 import { ApplicationError, NodeHelpers, WorkflowHooks } from 'n8n-workflow';
 import path from 'path';
 
+import { UnrecognizedNodeTypeError } from '@/errors';
+
 import { predefinedNodesTypes } from './constants';
 
 const BASE_DIR = path.resolve(__dirname, '../../..');
 
 class NodeTypesClass implements INodeTypes {
-	constructor(private nodeTypes: INodeTypeData = predefinedNodesTypes) {}
+	constructor(private nodeTypes: INodeTypeData) {}
 
 	getByName(nodeType: string): INodeType | IVersionedNodeType {
 		return this.nodeTypes[nodeType].type;
@@ -39,7 +41,7 @@ class NodeTypesClass implements INodeTypes {
 
 let nodeTypesInstance: NodeTypesClass | undefined;
 
-export function NodeTypes(nodeTypes?: INodeTypeData): INodeTypes {
+export function NodeTypes(nodeTypes: INodeTypeData = predefinedNodesTypes): INodeTypes {
 	if (nodeTypesInstance === undefined || nodeTypes !== undefined) {
 		nodeTypesInstance = new NodeTypesClass(nodeTypes);
 	}
@@ -102,12 +104,9 @@ export function getNodeTypes(testData: WorkflowTestData[] | WorkflowTestData) {
 	);
 
 	for (const nodeName of nodeNames) {
-		if (!nodeName.startsWith('n8n-nodes-base.')) {
-			throw new ApplicationError('Unknown node type', { tags: { nodeType: nodeName } });
-		}
 		const loadInfo = knownNodes[nodeName.replace('n8n-nodes-base.', '')];
 		if (!loadInfo) {
-			throw new ApplicationError('Unknown node type', { tags: { nodeType: nodeName } });
+			throw new UnrecognizedNodeTypeError('n8n-nodes-base', nodeName);
 		}
 		const sourcePath = loadInfo.sourcePath.replace(/^dist\//, './').replace(/\.js$/, '.ts');
 		const nodeSourcePath = path.join(BASE_DIR, 'nodes-base', sourcePath);
diff --git a/packages/core/test/setup-mocks.ts b/packages/core/test/setup-mocks.ts
index d2c9bc6e645e1..c36ff529c2722 100644
--- a/packages/core/test/setup-mocks.ts
+++ b/packages/core/test/setup-mocks.ts
@@ -1 +1,6 @@
 import 'reflect-metadata';
+
+// WebCrypto Polyfill for older versions of Node.js 18
+if (!globalThis.crypto?.getRandomValues) {
+	globalThis.crypto = require('node:crypto').webcrypto;
+}
diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index 9af2fa82043d3..d4a7e1dcec9db 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-design-system",
-  "version": "1.61.0",
+  "version": "1.63.0",
   "main": "src/main.ts",
   "import": "src/main.ts",
   "scripts": {
diff --git a/packages/design-system/src/components/N8nMarkdown/Markdown.vue b/packages/design-system/src/components/N8nMarkdown/Markdown.vue
index 1074d584bf6bc..fa65a8cdc6606 100644
--- a/packages/design-system/src/components/N8nMarkdown/Markdown.vue
+++ b/packages/design-system/src/components/N8nMarkdown/Markdown.vue
@@ -251,17 +251,9 @@ const onCheckboxChange = (index: number) => {
 		}
 	}
 
-	pre {
-		margin-bottom: var(--spacing-s);
-		display: grid;
-	}
-
 	pre > code {
-		display: block;
-		padding: var(--spacing-s);
-		color: var(--color-text-dark);
 		background-color: var(--color-background-base);
-		overflow-x: auto;
+		color: var(--color-text-dark);
 	}
 
 	li > code,
@@ -356,9 +348,8 @@ input[type='checkbox'] + label {
 		}
 	}
 
-	code {
+	pre > code {
 		background-color: var(--color-sticky-code-background);
-		padding: 0 var(--spacing-4xs);
 		color: var(--color-sticky-code-font);
 	}
 
@@ -385,6 +376,20 @@ input[type='checkbox'] + label {
 	}
 }
 
+.sticky,
+.markdown {
+	pre {
+		margin-bottom: var(--spacing-s);
+		display: grid;
+	}
+
+	pre > code {
+		display: block;
+		padding: var(--spacing-s);
+		overflow-x: auto;
+	}
+}
+
 .spacer {
 	margin: var(--spacing-2xl);
 }
diff --git a/packages/design-system/src/components/N8nNotice/Notice.vue b/packages/design-system/src/components/N8nNotice/Notice.vue
index a69ef3f584d8f..d2f7512292257 100644
--- a/packages/design-system/src/components/N8nNotice/Notice.vue
+++ b/packages/design-system/src/components/N8nNotice/Notice.vue
@@ -10,6 +10,7 @@ interface NoticeProps {
 	theme?: 'success' | 'warning' | 'danger' | 'info';
 	content?: string;
 	fullContent?: string;
+	compact?: boolean;
 }
 
 const props = withDefaults(defineProps<NoticeProps>(), {
@@ -17,6 +18,7 @@ const props = withDefaults(defineProps<NoticeProps>(), {
 	theme: 'warning',
 	content: '',
 	fullContent: '',
+	compact: true,
 });
 
 const emit = defineEmits<{
@@ -68,7 +70,7 @@ const onClick = (event: MouseEvent) => {
 <template>
 	<div :id="id" :class="classes" role="alert" @click="onClick">
 		<div class="notice-content">
-			<N8nText size="small" :compact="true">
+			<N8nText size="small" :compact="compact">
 				<slot>
 					<span
 						:id="`${id}-content`"
diff --git a/packages/design-system/src/css/_tokens.dark.scss b/packages/design-system/src/css/_tokens.dark.scss
index a3fc653550f1a..4390bc1da81cb 100644
--- a/packages/design-system/src/css/_tokens.dark.scss
+++ b/packages/design-system/src/css/_tokens.dark.scss
@@ -462,6 +462,9 @@
 	--color-configurable-node-name: var(--color-text-dark);
 	--color-secondary-link: var(--prim-color-secondary-tint-200);
 	--color-secondary-link-hover: var(--prim-color-secondary-tint-100);
+	//Params
+	--color-icon-base: var(--color-text-light);
+	--color-icon-hover: var(--prim-color-primary);
 
 	--color-menu-background: var(--prim-gray-740);
 	--color-menu-hover-background: var(--prim-gray-670);
diff --git a/packages/design-system/src/css/_tokens.scss b/packages/design-system/src/css/_tokens.scss
index 87951534ee4bf..944652e43e3bc 100644
--- a/packages/design-system/src/css/_tokens.scss
+++ b/packages/design-system/src/css/_tokens.scss
@@ -588,6 +588,7 @@
 	--border-width-base: 1px;
 	--border-base: var(--border-width-base) var(--border-style-base) var(--color-foreground-base);
 
+	--font-size-4xs: 0.5rem;
 	--font-size-3xs: 0.625rem;
 	--font-size-2xs: 0.75rem;
 	--font-size-xs: 0.8125rem;
@@ -620,6 +621,10 @@
 	--spacing-3xl: 4rem;
 	--spacing-4xl: 8rem;
 	--spacing-5xl: 16rem;
+
+	//Params
+	--color-icon-base: var(--color-text-light);
+	--color-icon-hover: var(--prim-color-primary);
 }
 
 :root {
diff --git a/packages/editor-ui/.browserslistrc b/packages/editor-ui/.browserslistrc
index 9dee6464636ef..525ded22c2b94 100644
--- a/packages/editor-ui/.browserslistrc
+++ b/packages/editor-ui/.browserslistrc
@@ -1,3 +1,3 @@
-> 1%
-last 2 versions
-not ie <= 8
+defaults
+cover 95% in US
+cover 95% in alt-EU and last 2 years and not dead and fully supports es6-module and fully supports es6-module-dynamic-import
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index bccb5506b887c..3293abfe3b3d6 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "1.71.0",
+  "version": "1.73.0",
   "description": "Workflow Editor UI for n8n",
   "main": "index.js",
   "scripts": {
@@ -40,9 +40,9 @@
     "@n8n/codemirror-lang-sql": "^1.0.2",
     "@n8n/permissions": "workspace:*",
     "@sentry/vue": "catalog:frontend",
-    "@vue-flow/background": "^1.3.1",
+    "@vue-flow/background": "^1.3.2",
     "@vue-flow/controls": "^1.1.2",
-    "@vue-flow/core": "^1.41.4",
+    "@vue-flow/core": "^1.41.6",
     "@vue-flow/minimap": "^1.5.0",
     "@vue-flow/node-resizer": "^1.4.0",
     "@vueuse/components": "^10.11.0",
@@ -82,6 +82,7 @@
     "vue-router": "catalog:frontend",
     "vue-virtual-scroller": "2.0.0-beta.8",
     "vue3-touch-events": "^4.1.3",
+    "vuedraggable": "4.1.0",
     "xss": "catalog:"
   },
   "devDependencies": {
@@ -95,12 +96,15 @@
     "@types/lodash-es": "^4.17.6",
     "@types/luxon": "^3.2.0",
     "@types/uuid": "catalog:",
+    "@vitejs/plugin-legacy": "^6.0.0",
     "@vitejs/plugin-vue": "catalog:frontend",
     "@vitest/coverage-v8": "catalog:frontend",
+    "browserslist-to-esbuild": "^2.1.1",
     "miragejs": "^0.1.48",
     "unplugin-icons": "^0.19.0",
     "unplugin-vue-components": "^0.27.2",
     "vite": "catalog:frontend",
+    "vite-svg-loader": "5.1.0",
     "vitest": "catalog:frontend",
     "vitest-mock-extended": "catalog:frontend",
     "vue-tsc": "catalog:frontend"
diff --git a/packages/editor-ui/public/static/logo/channel/beta-dark.svg b/packages/editor-ui/public/static/logo/channel/beta-dark.svg
deleted file mode 100644
index 7253fbe02b75e..0000000000000
--- a/packages/editor-ui/public/static/logo/channel/beta-dark.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="201" height="40" fill="none"><g clip-path="url(#a)"><mask id="b" width="143" height="40" x="0" y="0" maskUnits="userSpaceOnUse" style="mask-type:luminance"><path fill="#fff" d="M143 0H0v40h143z"/></mask><g mask="url(#b)"><path fill="#EA4B71" fill-rule="evenodd" d="M78.974 8a8 8 0 0 1-15.748 2h-11.17a4 4 0 0 0-3.945 3.342l-.329 1.973a7.98 7.98 0 0 1-2.6 4.685 7.98 7.98 0 0 1 2.6 4.685l.329 1.973A4 4 0 0 0 52.056 30h3.17a8 8 0 1 1 0 4h-3.17a8 8 0 0 1-7.89-6.685l-.33-1.973A4 4 0 0 0 39.891 22h-3.263a8.004 8.004 0 0 1-15.309 0h-4.691a8 8 0 1 1 .172-4h4.348A8.003 8.003 0 0 1 36.8 18h3.09a4 4 0 0 0 3.946-3.342l.33-1.973A8 8 0 0 1 52.055 6h11.17a8 8 0 0 1 15.748 2m-4 0a4 4 0 1 1-8 0 4 4 0 0 1 8 0m-66 15.667a4 4 0 1 0 0-8 4 4 0 0 0 0 8m20 0a4 4 0 1 0 0-8 4 4 0 0 0 0 8m34 12.333a4 4 0 1 0 0-8 4 4 0 0 0 0 8" clip-rule="evenodd"/><path fill="#fff" d="M86.979 30.001h4.176v-8.843c0-2.904 1.763-4.177 3.753-4.177 1.958 0 3.492 1.305 3.492 3.981v9.039h4.176v-9.887c0-4.275-2.48-6.755-6.363-6.755-2.447 0-3.818.979-4.797 2.251h-.26l-.36-1.925h-3.818zm31.584-10.997v-.196c1.436-.718 2.872-1.958 2.872-4.405 0-3.524-2.905-5.645-6.918-5.645-4.112 0-7.049 2.251-7.049 5.71 0 2.35 1.371 3.622 2.872 4.34v.196a5.54 5.54 0 0 0-3.655 5.286c0 3.557 2.937 6.037 7.799 6.037s7.701-2.48 7.701-6.037c0-2.936-1.958-4.666-3.622-5.286m-4.079-7.244c1.632 0 2.839 1.044 2.839 2.806s-1.24 2.807-2.839 2.807-2.937-1.045-2.937-2.807c0-1.795 1.273-2.806 2.937-2.806m0 15.435c-1.893 0-3.426-1.208-3.426-3.264 0-1.86 1.272-3.263 3.393-3.263 2.089 0 3.362 1.37 3.362 3.329 0 1.99-1.469 3.198-3.329 3.198m11.944 2.806h4.177v-8.843c0-2.904 1.762-4.177 3.753-4.177 1.958 0 3.491 1.305 3.491 3.981v9.039h4.177v-9.887c0-4.275-2.48-6.755-6.363-6.755-2.447 0-3.818.979-4.797 2.251h-.261l-.359-1.925h-3.818z"/></g><path fill="#EA4B71" d="M198 12.5h-41a3 3 0 0 0-3 3v13a3 3 0 0 0 3 3h41a3 3 0 0 0 3-3v-13a3 3 0 0 0-3-3"/><path fill="#fff" d="M164.496 21.334c.7.252 1.638.938 1.638 2.45 0 1.722-1.19 2.716-3.164 2.716h-4.004v-9.8h4.032c1.932 0 2.856 1.008 2.856 2.45 0 1.176-.644 1.764-1.358 2.1zm-3.724-3.15v2.534h1.946c.84 0 1.288-.504 1.288-1.274 0-.784-.504-1.26-1.26-1.26zm2.03 6.832c.952 0 1.442-.574 1.442-1.372 0-.826-.532-1.442-1.442-1.442h-2.03v2.814zm8.161-.126h4.9v1.61h-6.706v-9.8h6.566v1.61h-4.76v2.436h4.102v1.568h-4.102zm14.643-8.19v1.652h-2.772V26.5h-1.848v-8.148h-2.772V16.7zm8.189 9.8-.798-2.366h-3.668l-.798 2.366h-1.974l3.5-9.8h2.226l3.486 9.8zm-3.962-3.892h2.66l-1.274-3.78h-.112z"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h201v40H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/packages/editor-ui/public/static/logo/channel/beta.svg b/packages/editor-ui/public/static/logo/channel/beta.svg
deleted file mode 100644
index d4fb970c620bc..0000000000000
--- a/packages/editor-ui/public/static/logo/channel/beta.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="201" height="40" fill="none"><g clip-path="url(#a)"><path fill="#EA4B71" fill-rule="evenodd" d="M78.974 8a8 8 0 0 1-15.748 2h-11.17a4 4 0 0 0-3.945 3.342l-.329 1.973a7.98 7.98 0 0 1-2.6 4.685 7.98 7.98 0 0 1 2.6 4.685l.329 1.973A4 4 0 0 0 52.056 30h3.17a8 8 0 1 1 0 4h-3.17a8 8 0 0 1-7.89-6.685l-.33-1.973A4 4 0 0 0 39.891 22h-3.263a8.004 8.004 0 0 1-15.309 0h-4.691a8 8 0 1 1 .172-4h4.348A8.003 8.003 0 0 1 36.8 18h3.09a4 4 0 0 0 3.946-3.342l.33-1.973A8 8 0 0 1 52.055 6h11.17a8 8 0 0 1 15.748 2m-4 0a4 4 0 1 1-8 0 4 4 0 0 1 8 0m-66 15.667a4 4 0 1 0 0-8 4 4 0 0 0 0 8m20 0a4 4 0 1 0 0-8 4 4 0 0 0 0 8m34 12.333a4 4 0 1 0 0-8 4 4 0 0 0 0 8" clip-rule="evenodd"/><path fill="#101330" d="M86.979 30.001h4.176v-8.843c0-2.904 1.763-4.177 3.753-4.177 1.958 0 3.492 1.305 3.492 3.981v9.039h4.176v-9.887c0-4.275-2.48-6.755-6.363-6.755-2.447 0-3.818.979-4.797 2.251h-.26l-.36-1.925h-3.818zm31.584-10.997v-.196c1.436-.718 2.872-1.958 2.872-4.405 0-3.524-2.905-5.645-6.918-5.645-4.112 0-7.049 2.251-7.049 5.71 0 2.35 1.371 3.622 2.872 4.34v.196a5.54 5.54 0 0 0-3.655 5.286c0 3.557 2.937 6.037 7.799 6.037s7.701-2.48 7.701-6.037c0-2.936-1.958-4.666-3.622-5.286m-4.079-7.244c1.632 0 2.839 1.044 2.839 2.806s-1.24 2.807-2.839 2.807-2.937-1.045-2.937-2.807c0-1.795 1.273-2.806 2.937-2.806m0 15.435c-1.893 0-3.426-1.208-3.426-3.264 0-1.86 1.272-3.263 3.393-3.263 2.089 0 3.362 1.37 3.362 3.329 0 1.99-1.469 3.198-3.329 3.198m11.944 2.806h4.177v-8.843c0-2.904 1.762-4.177 3.753-4.177 1.958 0 3.491 1.305 3.491 3.981v9.039h4.177v-9.887c0-4.275-2.48-6.755-6.363-6.755-2.447 0-3.818.979-4.797 2.251h-.261l-.359-1.925h-3.818z"/></g><rect width="47" height="19" x="154" y="12.5" fill="#EA4B71" rx="3"/><path fill="#fff" d="M164.496 21.334c.7.252 1.638.938 1.638 2.45 0 1.722-1.19 2.716-3.164 2.716h-4.004v-9.8h4.032c1.932 0 2.856 1.008 2.856 2.45 0 1.176-.644 1.764-1.358 2.1zm-3.724-3.15v2.534h1.946c.84 0 1.288-.504 1.288-1.274 0-.784-.504-1.26-1.26-1.26zm2.03 6.832c.952 0 1.442-.574 1.442-1.372 0-.826-.532-1.442-1.442-1.442h-2.03v2.814zm8.161-.126h4.9v1.61h-6.706v-9.8h6.566v1.61h-4.76v2.436h4.102v1.568h-4.102zm14.643-8.19v1.652h-2.772V26.5h-1.848v-8.148h-2.772V16.7zm8.189 9.8-.798-2.366h-3.668l-.798 2.366h-1.974l3.5-9.8h2.226l3.486 9.8zm-3.962-3.892h2.66l-1.274-3.78h-.112z"/><defs><clipPath id="a"><path fill="#fff" d="M0 0h143v40H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/packages/editor-ui/public/static/logo/channel/dev-dark.svg b/packages/editor-ui/public/static/logo/channel/dev-dark.svg
deleted file mode 100644
index 23c8b0571199c..0000000000000
--- a/packages/editor-ui/public/static/logo/channel/dev-dark.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="240" height="40" fill="none"><mask id="a" width="143" height="40" x="0" y="0" maskUnits="userSpaceOnUse" style="mask-type:luminance"><path fill="#fff" d="M0 0h143v40H0z"/></mask><g mask="url(#a)"><path fill="#838383" fill-rule="evenodd" d="M78.974 8a8 8 0 0 1-15.748 2h-11.17a4 4 0 0 0-3.945 3.342l-.329 1.973a7.98 7.98 0 0 1-2.6 4.685 7.98 7.98 0 0 1 2.6 4.685l.329 1.973A4 4 0 0 0 52.056 30h3.17a8 8 0 1 1 0 4h-3.17a8 8 0 0 1-7.89-6.685l-.33-1.973A4 4 0 0 0 39.891 22h-3.263a8.005 8.005 0 0 1-15.309 0h-4.691a8 8 0 1 1 .172-4h4.348A8.003 8.003 0 0 1 36.8 18h3.09a4 4 0 0 0 3.946-3.342l.33-1.973A8 8 0 0 1 52.055 6h11.17a8 8 0 0 1 15.749 2m-4 0a4 4 0 1 1-8 0 4 4 0 0 1 8 0m-66 15.667a4 4 0 1 0 0-8 4 4 0 0 0 0 8m20 0a4 4 0 1 0 0-8 4 4 0 0 0 0 8m34 12.333a4 4 0 1 0 0-8 4 4 0 0 0 0 8" clip-rule="evenodd"/><path fill="#fff" d="M86.978 30h4.177v-8.842c0-2.904 1.762-4.177 3.753-4.177 1.958 0 3.492 1.305 3.492 3.98v9.04h4.176v-9.887c0-4.275-2.48-6.755-6.363-6.755-2.447 0-3.818.979-4.797 2.25h-.26l-.36-1.924H86.98zm31.585-10.996v-.196c1.436-.718 2.872-1.958 2.872-4.405 0-3.524-2.905-5.645-6.918-5.645-4.112 0-7.049 2.25-7.049 5.71 0 2.35 1.371 3.622 2.872 4.34v.196a5.54 5.54 0 0 0-3.655 5.286c0 3.557 2.937 6.037 7.799 6.037s7.701-2.48 7.701-6.037c0-2.936-1.958-4.666-3.622-5.286m-4.079-7.244c1.632 0 2.839 1.044 2.839 2.806s-1.24 2.807-2.839 2.807-2.937-1.045-2.937-2.807c0-1.794 1.273-2.806 2.937-2.806m0 15.435c-1.893 0-3.426-1.208-3.426-3.263 0-1.86 1.272-3.264 3.393-3.264 2.089 0 3.362 1.37 3.362 3.329 0 1.99-1.469 3.198-3.329 3.198M126.428 30h4.177v-8.843c0-2.904 1.762-4.177 3.753-4.177 1.958 0 3.491 1.305 3.491 3.98V30h4.177v-9.887c0-4.275-2.48-6.755-6.363-6.755-2.447 0-3.818.979-4.797 2.25h-.261l-.359-1.924h-3.818z"/></g><path fill="#858585" d="M221.216 6.657h-61.5a4.5 4.5 0 0 0-4.5 4.5v19.5a4.5 4.5 0 0 0 4.5 4.5h61.5a4.5 4.5 0 0 0 4.5-4.5v-19.5a4.5 4.5 0 0 0-4.5-4.5"/><path fill="#fff" d="M183.47 20.765q0 2.597-.688 4.283-.677 1.686-1.847 2.634a7 7 0 0 1-2.658 1.317q-1.477.381-3.065.381h-4.603V12.322h4.308q1.637 0 3.163.345a6.9 6.9 0 0 1 2.745 1.243q1.218.898 1.932 2.56.714 1.65.713 4.295m-4.184 0q0-2.303-.504-3.483-.493-1.182-1.354-1.6-.85-.43-1.92-.43h-.862v11.211h.862q1.12 0 1.969-.48.85-.492 1.33-1.735t.48-3.483zm11.139-5.563V19.3h5.907v2.831h-5.907v4.357h7.126v2.892h-11.163V12.322h11.15l-.406 2.88zm15.901 11.028 3.213-13.908h4.135L208.75 29.38h-4.997l-4.899-17.058h4.284z"/></svg>
\ No newline at end of file
diff --git a/packages/editor-ui/public/static/logo/channel/dev.svg b/packages/editor-ui/public/static/logo/channel/dev.svg
deleted file mode 100644
index f8f2b2d437885..0000000000000
--- a/packages/editor-ui/public/static/logo/channel/dev.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="240" height="40" fill="none"><g clip-path="url(#a)"><path fill="#838383" fill-rule="evenodd" d="M78.974 8a8 8 0 0 1-15.748 2h-11.17a4 4 0 0 0-3.945 3.342l-.329 1.973a7.98 7.98 0 0 1-2.6 4.685 7.98 7.98 0 0 1 2.6 4.685l.329 1.973A4 4 0 0 0 52.056 30h3.17a8 8 0 1 1 0 4h-3.17a8 8 0 0 1-7.89-6.685l-.33-1.973A4 4 0 0 0 39.891 22h-3.263a8.004 8.004 0 0 1-15.309 0h-4.691a8 8 0 1 1 .172-4h4.348A8.003 8.003 0 0 1 36.8 18h3.09a4 4 0 0 0 3.946-3.342l.33-1.973A8 8 0 0 1 52.055 6h11.17a8 8 0 0 1 15.748 2zm-4 0a4 4 0 1 1-8 0 4 4 0 0 1 8 0m-66 15.667a4 4 0 1 0 0-8 4 4 0 0 0 0 8m20 0a4 4 0 1 0 0-8 4 4 0 0 0 0 8m34 12.333a4 4 0 1 0 0-8 4 4 0 0 0 0 8" clip-rule="evenodd"/><path fill="#101330" d="M86.978 30.001h4.177v-8.843c0-2.904 1.762-4.177 3.753-4.177 1.958 0 3.492 1.305 3.492 3.981v9.039h4.176v-9.887c0-4.275-2.48-6.755-6.363-6.755-2.447 0-3.818.979-4.797 2.251h-.26l-.36-1.925H86.98zm31.585-10.997v-.196c1.436-.718 2.872-1.958 2.872-4.405 0-3.524-2.905-5.645-6.918-5.645-4.112 0-7.049 2.251-7.049 5.71 0 2.35 1.371 3.622 2.872 4.34v.196a5.54 5.54 0 0 0-3.655 5.286c0 3.557 2.937 6.037 7.799 6.037s7.701-2.48 7.701-6.037c0-2.936-1.958-4.666-3.622-5.286m-4.079-7.244c1.632 0 2.839 1.044 2.839 2.806s-1.24 2.807-2.839 2.807-2.937-1.045-2.937-2.807c0-1.794 1.273-2.806 2.937-2.806m0 15.435c-1.893 0-3.426-1.208-3.426-3.263 0-1.86 1.272-3.264 3.393-3.264 2.089 0 3.362 1.37 3.362 3.329 0 1.99-1.469 3.198-3.329 3.198m11.944 2.806h4.177v-8.843c0-2.904 1.762-4.177 3.753-4.177 1.958 0 3.491 1.305 3.491 3.981v9.039h4.177v-9.887c0-4.275-2.48-6.755-6.363-6.755-2.447 0-3.818.979-4.797 2.251h-.261l-.359-1.925h-3.818z"/></g><rect width="70.5" height="28.5" x="155.216" y="6.657" fill="#858585" rx="4.5"/><defs><clipPath id="a"><path fill="#fff" d="M0 0h143v40H0z"/></clipPath></defs><path fill="#fff" d="M183.47 20.765q0 2.597-.688 4.283-.677 1.686-1.847 2.634-1.169.935-2.658 1.317-1.477.381-3.065.381h-4.603V12.322h4.308q1.637 0 3.163.345 1.539.332 2.745 1.243 1.218.898 1.932 2.56.714 1.649.714 4.295zm-4.184 0q0-2.302-.504-3.483-.493-1.182-1.354-1.6-.85-.43-1.92-.43h-.862v11.211h.862q1.12 0 1.969-.48.85-.492 1.33-1.735t.48-3.483zm11.139-5.563V19.3h5.907v2.831h-5.907v4.357h7.126v2.892h-11.163V12.322h11.15l-.406 2.88zm15.901 11.028 3.213-13.908h4.135L208.75 29.38h-4.997l-4.899-17.058h4.284z"/></svg>
\ No newline at end of file
diff --git a/packages/editor-ui/public/static/logo/channel/nightly-dark.svg b/packages/editor-ui/public/static/logo/channel/nightly-dark.svg
deleted file mode 100644
index a1b5661dcb3a7..0000000000000
--- a/packages/editor-ui/public/static/logo/channel/nightly-dark.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="230" height="40" fill="none"><mask id="a" width="143" height="40" x="0" y="0" maskUnits="userSpaceOnUse" style="mask-type:luminance"><path fill="#fff" d="M0 0h143v40H0z"/></mask><g mask="url(#a)"><path fill="#EA4B71" fill-rule="evenodd" d="M78.974 8a8 8 0 0 1-15.748 2h-11.17a4 4 0 0 0-3.945 3.342l-.329 1.973a7.98 7.98 0 0 1-2.6 4.685 7.98 7.98 0 0 1 2.6 4.685l.329 1.973A4 4 0 0 0 52.056 30h3.17a8 8 0 1 1 0 4h-3.17a8 8 0 0 1-7.89-6.685l-.33-1.973A4 4 0 0 0 39.891 22h-3.263a8.005 8.005 0 0 1-15.309 0h-4.691a8 8 0 1 1 .172-4h4.348A8.003 8.003 0 0 1 36.8 18h3.09a4 4 0 0 0 3.946-3.342l.33-1.973A8 8 0 0 1 52.055 6h11.17a8 8 0 0 1 15.749 2m-4 0a4 4 0 1 1-8 0 4 4 0 0 1 8 0m-66 15.667a4 4 0 1 0 0-8 4 4 0 0 0 0 8m20 0a4 4 0 1 0 0-8 4 4 0 0 0 0 8m34 12.333a4 4 0 1 0 0-8 4 4 0 0 0 0 8" clip-rule="evenodd"/><path fill="#fff" d="M86.978 30h4.177v-8.842c0-2.904 1.762-4.177 3.753-4.177 1.958 0 3.492 1.305 3.492 3.98v9.04h4.176v-9.887c0-4.275-2.48-6.755-6.363-6.755-2.447 0-3.818.979-4.797 2.25h-.26l-.36-1.924H86.98zm31.585-10.996v-.196c1.436-.718 2.872-1.958 2.872-4.405 0-3.524-2.905-5.645-6.918-5.645-4.112 0-7.049 2.25-7.049 5.71 0 2.35 1.371 3.622 2.872 4.34v.196a5.54 5.54 0 0 0-3.655 5.286c0 3.557 2.937 6.037 7.799 6.037s7.701-2.48 7.701-6.037c0-2.936-1.958-4.666-3.622-5.286m-4.079-7.244c1.632 0 2.839 1.044 2.839 2.806s-1.24 2.807-2.839 2.807-2.937-1.045-2.937-2.807c0-1.794 1.273-2.806 2.937-2.806m0 15.435c-1.893 0-3.426-1.208-3.426-3.263 0-1.86 1.272-3.264 3.393-3.264 2.089 0 3.362 1.37 3.362 3.329 0 1.99-1.469 3.198-3.329 3.198M126.428 30h4.177v-8.843c0-2.904 1.762-4.177 3.753-4.177 1.958 0 3.491 1.305 3.491 3.98V30h4.177v-9.887c0-4.275-2.48-6.755-6.363-6.755-2.447 0-3.818.979-4.797 2.25h-.261l-.359-1.924h-3.818z"/></g><path fill="#EA4B71" d="M214.852 12.5h-56.703A4.15 4.15 0 0 0 154 16.649v10.702a4.15 4.15 0 0 0 4.149 4.149h56.703a4.15 4.15 0 0 0 4.149-4.149V16.649a4.15 4.15 0 0 0-4.149-4.149"/><path fill="#fff" d="m162.985 26.312-2.496-7.624q.061.404.143 1.04.082.63.137 1.4.062.774.062 1.608v3.576h-1.908v-9.477h2.797l2.42 7.583a33 33 0 0 1-.226-1.661 20 20 0 0 1-.116-2.291v-3.63h1.908v9.476zm10.611-9.477v1.64h-1.955v6.189h1.955v1.648h-6.153v-1.648h1.955v-6.188h-1.955v-1.64zm5.477 9.71q-2.018 0-3.084-1.272-1.06-1.28-1.06-3.72 0-1.613.589-2.714.588-1.108 1.586-1.675.997-.568 2.229-.568 1.04 0 1.75.32.711.323 1.265.849l-1.176 1.217a3.5 3.5 0 0 0-.827-.567 2.1 2.1 0 0 0-.903-.185 1.96 1.96 0 0 0-1.135.342q-.492.334-.78 1.074-.286.73-.286 1.92 0 1.238.198 1.97.206.732.615 1.053.41.314 1.04.314.335 0 .629-.075.294-.082.547-.212V22.45h-1.19l-.219-1.573h3.528v4.71a6.8 6.8 0 0 1-1.531.699 5.8 5.8 0 0 1-1.785.259m9.005-.233v-3.993h-2.297v3.993h-2.243v-9.477h2.243v3.638h2.297v-3.638h2.243v9.477zm8.164-7.76v7.76h-2.243v-7.76h-2.66v-1.717h7.672l-.232 1.717zm4.266 7.76v-9.477h2.243v7.706h4.11l-.233 1.77zm12.157-3.555v3.555h-2.242V22.77l-3.09-5.935h2.454l1.798 4.082 1.812-4.082h2.359z"/></svg>
\ No newline at end of file
diff --git a/packages/editor-ui/public/static/logo/channel/nightly.svg b/packages/editor-ui/public/static/logo/channel/nightly.svg
deleted file mode 100644
index bb4746df5640e..0000000000000
--- a/packages/editor-ui/public/static/logo/channel/nightly.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="230" height="40" fill="none"><g clip-path="url(#a)"><path fill="#ea4b71" fill-rule="evenodd" d="M78.974 8a8 8 0 0 1-15.748 2h-11.17a4 4 0 0 0-3.945 3.342l-.329 1.973a7.98 7.98 0 0 1-2.6 4.685 7.98 7.98 0 0 1 2.6 4.685l.329 1.973A4 4 0 0 0 52.056 30h3.17a8 8 0 1 1 0 4h-3.17a8 8 0 0 1-7.89-6.685l-.33-1.973A4 4 0 0 0 39.891 22h-3.263a8.004 8.004 0 0 1-15.309 0h-4.691a8 8 0 1 1 .172-4h4.348A8.003 8.003 0 0 1 36.8 18h3.09a4 4 0 0 0 3.946-3.342l.33-1.973A8 8 0 0 1 52.055 6h11.17a8 8 0 0 1 15.748 2zm-4 0a4 4 0 1 1-8 0 4 4 0 0 1 8 0m-66 15.667a4 4 0 1 0 0-8 4 4 0 0 0 0 8m20 0a4 4 0 1 0 0-8 4 4 0 0 0 0 8m34 12.333a4 4 0 1 0 0-8 4 4 0 0 0 0 8" clip-rule="evenodd"/><path fill="#101330" d="M86.978 30.001h4.177v-8.843c0-2.904 1.762-4.177 3.753-4.177 1.958 0 3.492 1.305 3.492 3.981v9.039h4.176v-9.887c0-4.275-2.48-6.755-6.363-6.755-2.447 0-3.818.979-4.797 2.251h-.26l-.36-1.925H86.98zm31.585-10.997v-.196c1.436-.718 2.872-1.958 2.872-4.405 0-3.524-2.905-5.645-6.918-5.645-4.112 0-7.049 2.251-7.049 5.71 0 2.35 1.371 3.622 2.872 4.34v.196a5.54 5.54 0 0 0-3.655 5.286c0 3.557 2.937 6.037 7.799 6.037s7.701-2.48 7.701-6.037c0-2.936-1.958-4.666-3.622-5.286m-4.079-7.244c1.632 0 2.839 1.044 2.839 2.806s-1.24 2.807-2.839 2.807-2.937-1.045-2.937-2.807c0-1.794 1.273-2.806 2.937-2.806m0 15.435c-1.893 0-3.426-1.208-3.426-3.263 0-1.86 1.272-3.264 3.393-3.264 2.089 0 3.362 1.37 3.362 3.329 0 1.99-1.469 3.198-3.329 3.198m11.944 2.806h4.177v-8.843c0-2.904 1.762-4.177 3.753-4.177 1.958 0 3.491 1.305 3.491 3.981v9.039h4.177v-9.887c0-4.275-2.48-6.755-6.363-6.755-2.447 0-3.818.979-4.797 2.251h-.261l-.359-1.925h-3.818z"/></g><rect width="65.001" height="19" x="154" y="12.5" fill="#ea4b71" rx="4.149"/><defs><clipPath id="a"><path fill="#fff" d="M0 0h143v40H0z"/></clipPath></defs><path fill="#fff" d="m162.985 26.312-2.496-7.624q.061.404.143 1.04.082.629.137 1.401.062.773.062 1.607v3.576h-1.908v-9.477h2.797l2.42 7.583q-.11-.65-.226-1.661t-.116-2.291v-3.63h1.908v9.476Zm10.611-9.477v1.641h-1.955v6.188h1.955v1.648h-6.153v-1.648h1.955v-6.188h-1.955v-1.64zm5.477 9.71q-2.017 0-3.084-1.272-1.06-1.279-1.06-3.72 0-1.613.589-2.714.588-1.108 1.586-1.675.998-.568 2.229-.568 1.04 0 1.75.321.711.322 1.265.848l-1.176 1.217q-.43-.383-.827-.567-.397-.185-.903-.185-.636 0-1.135.342-.492.335-.78 1.074-.286.731-.286 1.92 0 1.238.198 1.97.205.732.615 1.053.41.314 1.04.314.335 0 .629-.075.294-.082.547-.212V22.45h-1.19l-.219-1.573h3.528v4.711q-.71.438-1.531.698-.814.26-1.785.26zm9.005-.233v-3.993h-2.297v3.993h-2.243v-9.477h2.243v3.638h2.297v-3.638h2.243v9.477Zm8.164-7.76v7.76h-2.243v-7.76h-2.66v-1.717h7.672l-.232 1.717zm4.266 7.76v-9.477h2.243v7.706h4.11l-.233 1.771Zm12.157-3.555v3.555h-2.242V22.77l-3.09-5.935h2.454l1.798 4.082 1.812-4.082h2.359z"/></svg>
\ No newline at end of file
diff --git a/packages/editor-ui/public/static/logo/collapsed.svg b/packages/editor-ui/public/static/logo/collapsed.svg
deleted file mode 100644
index f65407694a8d5..0000000000000
--- a/packages/editor-ui/public/static/logo/collapsed.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="16" fill="none"><path fill="#EA4B71" fill-rule="evenodd" d="M28.013 6.4a3.2 3.2 0 0 1-3.1-2.4h-3.667a1.6 1.6 0 0 0-1.579 1.337l-.131.79A3.2 3.2 0 0 1 18.496 8a3.2 3.2 0 0 1 1.04 1.874l.131.789A1.6 1.6 0 0 0 21.246 12h.467a3.201 3.201 0 0 1 6.3.8 3.2 3.2 0 0 1-6.3.8h-.467a3.2 3.2 0 0 1-3.157-2.674l-.131-.789A1.6 1.6 0 0 0 16.379 8.8h-1.267a3.201 3.201 0 0 1-6.199 0H7.112a3.201 3.201 0 0 1-6.3-.8 3.2 3.2 0 0 1 6.3-.8h1.801a3.201 3.201 0 0 1 6.199 0h1.267a1.6 1.6 0 0 0 1.579-1.337l.131-.79A3.2 3.2 0 0 1 21.246 2.4h3.667a3.201 3.201 0 0 1 6.3.8 3.2 3.2 0 0 1-3.2 3.2m0-1.6a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2m-24 4.8a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2m9.6-1.6a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0m12.8 4.8a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/packages/editor-ui/public/static/logo/expanded-dark.svg b/packages/editor-ui/public/static/logo/expanded-dark.svg
deleted file mode 100644
index d9a71faffe534..0000000000000
--- a/packages/editor-ui/public/static/logo/expanded-dark.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="58" height="16" fill="none"><g clip-path="url(#a)"><path fill="#EA4B71" fill-rule="evenodd" d="M27.2 6.4A3.2 3.2 0 0 1 24.1 4h-3.667a1.6 1.6 0 0 0-1.578 1.337l-.132.79A3.2 3.2 0 0 1 17.683 8a3.2 3.2 0 0 1 1.04 1.874l.132.789A1.6 1.6 0 0 0 20.433 12h.468a3.201 3.201 0 0 1 6.299.8 3.2 3.2 0 0 1-6.3.8h-.467a3.2 3.2 0 0 1-3.156-2.674l-.132-.789A1.6 1.6 0 0 0 15.567 8.8h-1.268a3.201 3.201 0 0 1-6.198 0H6.299A3.201 3.201 0 0 1 0 8a3.2 3.2 0 0 1 6.3-.8h1.8a3.201 3.201 0 0 1 6.2 0h1.267a1.6 1.6 0 0 0 1.578-1.337l.132-.79A3.2 3.2 0 0 1 20.433 2.4h3.668a3.201 3.201 0 0 1 6.299.8 3.2 3.2 0 0 1-3.2 3.2m0-1.6a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2m-24 4.8a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2M12.8 8a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0m12.8 4.8a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0" clip-rule="evenodd"/><path fill="#fff" fill-rule="evenodd" d="M48.002 6.918v-.076c.558-.28 1.116-.762 1.116-1.716 0-1.372-1.13-2.198-2.69-2.198-1.598 0-2.74.877-2.74 2.224 0 .915.533 1.41 1.116 1.69v.076a2.16 2.16 0 0 0-1.42 2.059c0 1.385 1.141 2.351 3.032 2.351 1.89 0 2.994-.966 2.994-2.351a2.16 2.16 0 0 0-1.408-2.059m-1.587-2.82c.635 0 1.104.406 1.104 1.092s-.482 1.093-1.103 1.093c-.622 0-1.142-.407-1.142-1.093 0-.699.495-1.093 1.142-1.093m0 6.01c-.735 0-1.332-.47-1.332-1.27 0-.725.495-1.272 1.32-1.272.812 0 1.307.534 1.307 1.297 0 .775-.571 1.245-1.294 1.245" clip-rule="evenodd"/><path fill="#fff" d="M51.367 11.2h1.624V7.758c0-1.13.685-1.627 1.46-1.627.76 0 1.357.509 1.357 1.55v3.52h1.624V7.35c0-1.664-.964-2.63-2.474-2.63-.952 0-1.485.381-1.865.877h-.102l-.14-.75h-1.484zm-14.376 0h-1.624V4.848h1.485l.14.75h.1c.381-.496.914-.877 1.866-.877 1.51 0 2.474.966 2.474 2.63v3.85h-1.624V7.68c0-1.041-.596-1.55-1.358-1.55-.774 0-1.459.496-1.459 1.627z"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h58v16H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/packages/editor-ui/public/static/logo/expanded.svg b/packages/editor-ui/public/static/logo/expanded.svg
deleted file mode 100644
index 337b52be1c119..0000000000000
--- a/packages/editor-ui/public/static/logo/expanded.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="58" height="16" fill="none"><path fill="#EA4B71" fill-rule="evenodd" d="M27.2 6.4A3.2 3.2 0 0 1 24.1 4h-3.667a1.6 1.6 0 0 0-1.578 1.337l-.132.79A3.2 3.2 0 0 1 17.683 8a3.2 3.2 0 0 1 1.04 1.874l.132.789A1.6 1.6 0 0 0 20.433 12h.468a3.201 3.201 0 0 1 6.299.8 3.2 3.2 0 0 1-6.3.8h-.467a3.2 3.2 0 0 1-3.156-2.674l-.132-.789A1.6 1.6 0 0 0 15.567 8.8h-1.268a3.201 3.201 0 0 1-6.198 0H6.299A3.201 3.201 0 0 1 0 8a3.2 3.2 0 0 1 6.3-.8h1.8a3.201 3.201 0 0 1 6.2 0h1.267a1.6 1.6 0 0 0 1.578-1.337l.132-.79A3.2 3.2 0 0 1 20.433 2.4h3.668a3.201 3.201 0 0 1 6.299.8 3.2 3.2 0 0 1-3.2 3.2m0-1.6a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2m-24 4.8a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2M12.8 8a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0m12.8 4.8a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0" clip-rule="evenodd"/><path fill="#101330" fill-rule="evenodd" d="M48.002 6.918v-.076c.558-.28 1.116-.762 1.116-1.716 0-1.372-1.13-2.198-2.69-2.198-1.598 0-2.74.877-2.74 2.224 0 .915.533 1.41 1.116 1.69v.076a2.16 2.16 0 0 0-1.42 2.059c0 1.385 1.141 2.351 3.032 2.351 1.89 0 2.994-.966 2.994-2.351a2.16 2.16 0 0 0-1.408-2.059m-1.587-2.82c.635 0 1.104.406 1.104 1.092s-.482 1.093-1.103 1.093c-.622 0-1.142-.407-1.142-1.093 0-.699.495-1.093 1.142-1.093m0 6.01c-.735 0-1.332-.47-1.332-1.27 0-.725.495-1.272 1.32-1.272.812 0 1.307.534 1.307 1.297 0 .775-.571 1.245-1.294 1.245" clip-rule="evenodd"/><path fill="#101330" d="M51.367 11.2h1.624V7.758c0-1.131.685-1.627 1.46-1.627.76 0 1.357.509 1.357 1.55v3.52h1.624V7.35c0-1.664-.964-2.63-2.474-2.63-.952 0-1.485.381-1.865.877h-.102l-.14-.75h-1.484zm-14.376 0h-1.624V4.848h1.485l.14.75h.1c.381-.496.914-.877 1.866-.877 1.51 0 2.474.966 2.474 2.63v3.85h-1.624V7.68c0-1.041-.596-1.55-1.358-1.55-.774 0-1.459.496-1.459 1.627z"/></svg>
\ No newline at end of file
diff --git a/packages/editor-ui/src/__tests__/defaults.ts b/packages/editor-ui/src/__tests__/defaults.ts
index 61c8213232c05..3771840d6a2dc 100644
--- a/packages/editor-ui/src/__tests__/defaults.ts
+++ b/packages/editor-ui/src/__tests__/defaults.ts
@@ -126,6 +126,5 @@ export const defaultSettings: FrontendSettings = {
 		enabled: false,
 	},
 	betaFeatures: [],
-	virtualSchemaView: false,
 	easyAIWorkflowOnboarded: false,
 };
diff --git a/packages/editor-ui/src/api/nodeTypes.ts b/packages/editor-ui/src/api/nodeTypes.ts
index f4d516aaeff82..ec3e2bdba58fc 100644
--- a/packages/editor-ui/src/api/nodeTypes.ts
+++ b/packages/editor-ui/src/api/nodeTypes.ts
@@ -59,6 +59,18 @@ export async function getResourceMapperFields(
 	);
 }
 
+export async function getLocalResourceMapperFields(
+	context: IRestApiContext,
+	sendData: DynamicNodeParameters.ResourceMapperFieldsRequest,
+): Promise<ResourceMapperFields> {
+	return await makeRestApiRequest(
+		context,
+		'POST',
+		'/dynamic-node-parameters/local-resource-mapper-fields',
+		sendData,
+	);
+}
+
 export async function getNodeParameterActionResult(
 	context: IRestApiContext,
 	sendData: DynamicNodeParameters.ActionResultRequest,
diff --git a/packages/editor-ui/src/components/AssignmentCollection/Assignment.vue b/packages/editor-ui/src/components/AssignmentCollection/Assignment.vue
index 7240dac1e2c11..614ae3f590071 100644
--- a/packages/editor-ui/src/components/AssignmentCollection/Assignment.vue
+++ b/packages/editor-ui/src/components/AssignmentCollection/Assignment.vue
@@ -152,6 +152,14 @@ const onBlur = (): void => {
 		}"
 		data-test-id="assignment"
 	>
+		<N8nIconButton
+			v-if="!isReadOnly"
+			type="tertiary"
+			text
+			size="mini"
+			icon="grip-vertical"
+			:class="[$style.iconButton, $style.defaultTopPadding, 'drag-handle']"
+		></N8nIconButton>
 		<n8n-icon-button
 			v-if="!isReadOnly"
 			type="tertiary"
@@ -159,7 +167,7 @@ const onBlur = (): void => {
 			size="mini"
 			icon="trash"
 			data-test-id="assignment-remove"
-			:class="$style.remove"
+			:class="[$style.iconButton, $style.extraTopPadding]"
 			@click="onRemove"
 		></n8n-icon-button>
 
@@ -241,7 +249,7 @@ const onBlur = (): void => {
 	}
 
 	&:hover {
-		.remove {
+		.iconButton {
 			opacity: 1;
 		}
 	}
@@ -269,12 +277,19 @@ const onBlur = (): void => {
 	}
 }
 
-.remove {
+.iconButton {
 	position: absolute;
 	left: 0;
-	top: var(--spacing-l);
 	opacity: 0;
 	transition: opacity 100ms ease-in;
+	color: var(--icon-base-color);
+}
+.extraTopPadding {
+	top: calc(20px + var(--spacing-l));
+}
+
+.defaultTopPadding {
+	top: var(--spacing-l);
 }
 
 .status {
diff --git a/packages/editor-ui/src/components/AssignmentCollection/AssignmentCollection.vue b/packages/editor-ui/src/components/AssignmentCollection/AssignmentCollection.vue
index 24545bd7b9085..0aebc16bb64fe 100644
--- a/packages/editor-ui/src/components/AssignmentCollection/AssignmentCollection.vue
+++ b/packages/editor-ui/src/components/AssignmentCollection/AssignmentCollection.vue
@@ -15,6 +15,7 @@ import ParameterOptions from '../ParameterOptions.vue';
 import Assignment from './Assignment.vue';
 import { inputDataToAssignments, typeFromExpression } from './utils';
 import { propertyNameFromExpression } from '@/utils/mappingUtils';
+import Draggable from 'vuedraggable';
 
 interface Props {
 	parameter: INodeProperties;
@@ -133,19 +134,27 @@ function optionSelected(action: string) {
 		</n8n-input-label>
 		<div :class="$style.content">
 			<div :class="$style.assignments">
-				<div v-for="(assignment, index) of state.paramValue.assignments" :key="assignment.id">
-					<Assignment
-						:model-value="assignment"
-						:index="index"
-						:path="`${path}.${index}`"
-						:issues="getIssues(index)"
-						:class="$style.assignment"
-						:is-read-only="isReadOnly"
-						@update:model-value="(value) => onAssignmentUpdate(index, value)"
-						@remove="() => onAssignmentRemove(index)"
-					>
-					</Assignment>
-				</div>
+				<Draggable
+					v-model="state.paramValue.assignments"
+					item-key="id"
+					handle=".drag-handle"
+					:drag-class="$style.dragging"
+					:ghost-class="$style.ghost"
+				>
+					<template #item="{ index, element: assignment }">
+						<Assignment
+							:model-value="assignment"
+							:index="index"
+							:path="`${path}.${index}`"
+							:issues="getIssues(index)"
+							:class="$style.assignment"
+							:is-read-only="isReadOnly"
+							@update:model-value="(value) => onAssignmentUpdate(index, value)"
+							@remove="() => onAssignmentRemove(index)"
+						>
+						</Assignment>
+					</template>
+				</Draggable>
 			</div>
 			<div
 				v-if="!isReadOnly"
@@ -265,4 +274,18 @@ function optionSelected(action: string) {
 .icon {
 	font-size: var(--font-size-2xl);
 }
+.ghost,
+.dragging {
+	border-radius: var(--border-radius-base);
+	padding-right: var(--spacing-xs);
+	padding-bottom: var(--spacing-xs);
+}
+.ghost {
+	background-color: var(--color-background-base);
+	opacity: 0.5;
+}
+.dragging {
+	background-color: var(--color-background-xlight);
+	opacity: 0.7;
+}
 </style>
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
index f1b3620a97bb1..e85184a11c12c 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
@@ -759,7 +759,10 @@ const createToastMessagingForNewCredentials = (
 		toastText = i18n.baseText('credentials.create.personal.toast.text');
 	}
 
-	if (projectsStore.currentProject) {
+	if (
+		projectsStore.currentProject &&
+		projectsStore.currentProject.id !== projectsStore.personalProject?.id
+	) {
 		toastTitle = i18n.baseText('credentials.create.project.toast.title', {
 			interpolate: { projectName: project?.name ?? '' },
 		});
diff --git a/packages/editor-ui/src/components/ExpressionEditModal.vue b/packages/editor-ui/src/components/ExpressionEditModal.vue
index e1f7309a7165a..07dcee3c3a938 100644
--- a/packages/editor-ui/src/components/ExpressionEditModal.vue
+++ b/packages/editor-ui/src/components/ExpressionEditModal.vue
@@ -14,7 +14,7 @@ import type { INodeProperties } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 import { outputTheme } from './ExpressionEditorModal/theme';
 import ExpressionOutput from './InlineExpressionEditor/ExpressionOutput.vue';
-import RunDataSchema from './RunDataSchema.vue';
+import VirtualSchema from '@/components/VirtualSchema.vue';
 import OutputItemSelect from './InlineExpressionEditor/OutputItemSelect.vue';
 import { useI18n } from '@/composables/useI18n';
 import { useDebounce } from '@/composables/useDebounce';
@@ -167,14 +167,13 @@ const onResizeThrottle = useThrottleFn(onResize, 10);
 						</template>
 					</N8nInput>
 
-					<RunDataSchema
+					<VirtualSchema
 						:class="$style.schema"
 						:search="appliedSearch"
 						:nodes="parentNodes"
 						:mapping-enabled="!isReadOnly"
 						:connection-type="NodeConnectionType.Main"
 						pane-type="input"
-						context="modal"
 					/>
 				</div>
 			</N8nResizeWrapper>
diff --git a/packages/editor-ui/src/components/FilterConditions/Condition.vue b/packages/editor-ui/src/components/FilterConditions/Condition.vue
index 316b6827fac93..be4d02224c2e7 100644
--- a/packages/editor-ui/src/components/FilterConditions/Condition.vue
+++ b/packages/editor-ui/src/components/FilterConditions/Condition.vue
@@ -33,6 +33,7 @@ interface Props {
 	canRemove?: boolean;
 	readOnly?: boolean;
 	index?: number;
+	canDrag?: boolean;
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -41,6 +42,7 @@ const props = withDefaults(defineProps<Props>(), {
 	fixedLeftValue: false,
 	readOnly: false,
 	index: 0,
+	canDrag: true,
 });
 
 const emit = defineEmits<{
@@ -152,6 +154,15 @@ const onBlur = (): void => {
 		}"
 		data-test-id="filter-condition"
 	>
+		<N8nIconButton
+			v-if="canDrag && !readOnly"
+			type="tertiary"
+			text
+			size="mini"
+			icon="grip-vertical"
+			:title="i18n.baseText('filter.dragCondition')"
+			:class="[$style.iconButton, $style.defaultTopPadding, 'drag-handle']"
+		></N8nIconButton>
 		<n8n-icon-button
 			v-if="canRemove && !readOnly"
 			type="tertiary"
@@ -160,7 +171,7 @@ const onBlur = (): void => {
 			icon="trash"
 			data-test-id="filter-remove-condition"
 			:title="i18n.baseText('filter.removeCondition')"
-			:class="$style.remove"
+			:class="[$style.iconButton, $style.extraTopPadding]"
 			@click="onRemove"
 		></n8n-icon-button>
 		<InputTriple>
@@ -248,7 +259,7 @@ const onBlur = (): void => {
 	}
 
 	&:hover {
-		.remove {
+		.iconButton {
 			opacity: 1;
 		}
 	}
@@ -261,13 +272,21 @@ const onBlur = (): void => {
 
 .statusIcon {
 	padding-left: var(--spacing-4xs);
+	padding-right: var(--spacing-4xs);
 }
 
-.remove {
+.iconButton {
 	position: absolute;
 	left: 0;
-	top: var(--spacing-l);
 	opacity: 0;
 	transition: opacity 100ms ease-in;
+	color: var(--icon-base-color);
+}
+
+.defaultTopPadding {
+	top: var(--spacing-m);
+}
+.extraTopPadding {
+	top: calc(14px + var(--spacing-m));
 }
 </style>
diff --git a/packages/editor-ui/src/components/FilterConditions/FilterConditions.vue b/packages/editor-ui/src/components/FilterConditions/FilterConditions.vue
index 6b58fb4290be5..41ef0f7430ce8 100644
--- a/packages/editor-ui/src/components/FilterConditions/FilterConditions.vue
+++ b/packages/editor-ui/src/components/FilterConditions/FilterConditions.vue
@@ -23,6 +23,7 @@ import Condition from './Condition.vue';
 import CombinatorSelect from './CombinatorSelect.vue';
 import { resolveParameter } from '@/composables/useWorkflowHelpers';
 import { v4 as uuid } from 'uuid';
+import Draggable from 'vuedraggable';
 
 interface Props {
 	parameter: INodeProperties;
@@ -161,30 +162,41 @@ function getIssues(index: number): string[] {
 		</n8n-input-label>
 		<div :class="$style.content">
 			<div :class="$style.conditions">
-				<div v-for="(condition, index) of state.paramValue.conditions" :key="condition.id">
-					<CombinatorSelect
-						v-if="index !== 0"
-						:read-only="index !== 1 || readOnly"
-						:options="allowedCombinators"
-						:selected="state.paramValue.combinator"
-						:class="$style.combinator"
-						@combinator-change="onCombinatorChange"
-					/>
-
-					<Condition
-						:condition="condition"
-						:index="index"
-						:options="state.paramValue.options"
-						:fixed-left-value="!!parameter.typeOptions?.filter?.leftValue"
-						:read-only="readOnly"
-						:can-remove="index !== 0 || state.paramValue.conditions.length > 1"
-						:path="`${path}.${index}`"
-						:issues="getIssues(index)"
-						:class="$style.condition"
-						@update="(value) => onConditionUpdate(index, value)"
-						@remove="() => onConditionRemove(index)"
-					></Condition>
-				</div>
+				<Draggable
+					item-key="id"
+					v-model="state.paramValue.conditions"
+					handle=".drag-handle"
+					:drag-class="$style.dragging"
+					:ghost-class="$style.ghost"
+				>
+					<template #item="{ index, element: condition }">
+						<div>
+							<CombinatorSelect
+								v-if="index !== 0"
+								:read-only="index !== 1 || readOnly"
+								:options="allowedCombinators"
+								:selected="state.paramValue.combinator"
+								:class="$style.combinator"
+								@combinator-change="onCombinatorChange"
+							/>
+
+							<Condition
+								:condition="condition"
+								:index="index"
+								:options="state.paramValue.options"
+								:fixed-left-value="!!parameter.typeOptions?.filter?.leftValue"
+								:read-only="readOnly"
+								:can-remove="index !== 0 || state.paramValue.conditions.length > 1"
+								:can-drag="index !== 0 || state.paramValue.conditions.length > 1"
+								:path="`${path}.${index}`"
+								:issues="getIssues(index)"
+								:class="$style.condition"
+								@update="(value) => onConditionUpdate(index, value)"
+								@remove="() => onConditionRemove(index)"
+							></Condition>
+						</div>
+					</template>
+				</Draggable>
 			</div>
 			<div v-if="!singleCondition && !readOnly" :class="$style.addConditionWrapper">
 				<n8n-button
@@ -224,6 +236,7 @@ function getIssues(index: number): string[] {
 
 .condition {
 	padding-left: var(--spacing-l);
+	padding-bottom: var(--spacing-xs);
 }
 
 .single {
@@ -266,4 +279,20 @@ function getIssues(index: number): string[] {
 		outline: none;
 	}
 }
+.ghost,
+.dragging {
+	border-radius: var(--border-radius-base);
+	padding-right: var(--spacing-xs);
+}
+.ghost {
+	background-color: var(--color-background-base);
+	opacity: 0.5;
+}
+.dragging {
+	background-color: var(--color-background-xlight);
+	opacity: 0.7;
+}
+.dragging > .combinator {
+	display: none;
+}
 </style>
diff --git a/packages/editor-ui/src/components/FixedCollectionParameter.vue b/packages/editor-ui/src/components/FixedCollectionParameter.vue
index de7359dfddb9a..59eacfdb100e6 100644
--- a/packages/editor-ui/src/components/FixedCollectionParameter.vue
+++ b/packages/editor-ui/src/components/FixedCollectionParameter.vue
@@ -17,6 +17,7 @@ import {
 	N8nButton,
 } from 'n8n-design-system';
 import ParameterInputList from './ParameterInputList.vue';
+import Draggable from 'vuedraggable';
 
 const locale = useI18n();
 
@@ -126,42 +127,6 @@ const getOptionProperties = (optionName: string) => {
 	return undefined;
 };
 
-const moveOptionDown = (optionName: string, index: number) => {
-	if (Array.isArray(mutableValues.value[optionName])) {
-		mutableValues.value[optionName].splice(
-			index + 1,
-			0,
-			mutableValues.value[optionName].splice(index, 1)[0],
-		);
-	}
-
-	const parameterData: ValueChangedEvent = {
-		name: getPropertyPath(optionName),
-		value: mutableValues.value[optionName],
-		type: 'optionsOrderChanged',
-	};
-
-	emit('valueChanged', parameterData);
-};
-
-const moveOptionUp = (optionName: string, index: number) => {
-	if (Array.isArray(mutableValues.value[optionName])) {
-		mutableValues.value?.[optionName].splice(
-			index - 1,
-			0,
-			mutableValues.value[optionName].splice(index, 1)[0],
-		);
-	}
-
-	const parameterData: ValueChangedEvent = {
-		name: getPropertyPath(optionName),
-		value: mutableValues.value[optionName],
-		type: 'optionsOrderChanged',
-	};
-
-	emit('valueChanged', parameterData);
-};
-
 const optionSelected = (optionName: string) => {
 	const option = getOptionProperties(optionName);
 	if (option === undefined) {
@@ -219,6 +184,15 @@ const optionSelected = (optionName: string) => {
 const valueChanged = (parameterData: IUpdateInformation) => {
 	emit('valueChanged', parameterData);
 };
+const onDragChange = (optionName: string) => {
+	const parameterData: ValueChangedEvent = {
+		name: getPropertyPath(optionName),
+		value: mutableValues.value[optionName],
+		type: 'optionsOrderChanged',
+	};
+
+	emit('valueChanged', parameterData);
+};
 </script>
 
 <template>
@@ -246,59 +220,61 @@ const valueChanged = (parameterData: IUpdateInformation) => {
 				color="text-dark"
 			/>
 			<div v-if="multipleValues">
-				<div
-					v-for="(_, index) in mutableValues[property.name]"
-					:key="property.name + index"
-					class="parameter-item"
+				<Draggable
+					v-model="mutableValues[property.name]"
+					handle=".drag-handle"
+					drag-class="dragging"
+					ghost-class="ghost"
+					chosen-class="chosen"
+					@change="onDragChange(property.name)"
 				>
-					<div
-						:class="index ? 'border-top-dashed parameter-item-wrapper ' : 'parameter-item-wrapper'"
-					>
-						<div v-if="!isReadOnly" class="delete-option">
-							<N8nIconButton
-								type="tertiary"
-								text
-								size="mini"
-								icon="trash"
-								data-test-id="fixed-collection-delete"
-								:title="locale.baseText('fixedCollectionParameter.deleteItem')"
-								@click="deleteOption(property.name, index)"
-							></N8nIconButton>
-							<N8nIconButton
-								v-if="sortable && index !== 0"
-								type="tertiary"
-								text
-								size="mini"
-								icon="angle-up"
-								:title="locale.baseText('fixedCollectionParameter.moveUp')"
-								@click="moveOptionUp(property.name, index)"
-							></N8nIconButton>
-							<N8nIconButton
-								v-if="sortable && index !== mutableValues[property.name].length - 1"
-								type="tertiary"
-								text
-								size="mini"
-								icon="angle-down"
-								:title="locale.baseText('fixedCollectionParameter.moveDown')"
-								@click="moveOptionDown(property.name, index)"
-							></N8nIconButton>
+					<template #item="{ index }">
+						<div :key="property.name + '-' + index" class="parameter-item">
+							<div
+								:class="
+									index ? 'border-top-dashed parameter-item-wrapper ' : 'parameter-item-wrapper'
+								"
+							>
+								<div v-if="!isReadOnly" class="icon-button default-top-padding">
+									<N8nIconButton
+										v-if="sortable"
+										type="tertiary"
+										text
+										size="mini"
+										icon="grip-vertical"
+										:title="locale.baseText('fixedCollectionParameter.dragItem')"
+										class="drag-handle"
+									></N8nIconButton>
+								</div>
+								<div v-if="!isReadOnly" class="icon-button extra-top-padding">
+									<N8nIconButton
+										type="tertiary"
+										text
+										size="mini"
+										icon="trash"
+										data-test-id="fixed-collection-delete"
+										:title="locale.baseText('fixedCollectionParameter.deleteItem')"
+										@click="deleteOption(property.name, index)"
+									></N8nIconButton>
+								</div>
+								<Suspense>
+									<ParameterInputList
+										:parameters="property.values"
+										:node-values="nodeValues"
+										:path="getPropertyPath(property.name, index)"
+										:hide-delete="true"
+										:is-read-only="isReadOnly"
+										@value-changed="valueChanged"
+									/>
+								</Suspense>
+							</div>
 						</div>
-						<Suspense>
-							<ParameterInputList
-								:parameters="property.values"
-								:node-values="nodeValues"
-								:path="getPropertyPath(property.name, index)"
-								:hide-delete="true"
-								:is-read-only="isReadOnly"
-								@value-changed="valueChanged"
-							/>
-						</Suspense>
-					</div>
-				</div>
+					</template>
+				</Draggable>
 			</div>
 			<div v-else class="parameter-item">
 				<div class="parameter-item-wrapper">
-					<div v-if="!isReadOnly" class="delete-option">
+					<div v-if="!isReadOnly" class="icon-button">
 						<N8nIconButton
 							type="tertiary"
 							text
@@ -355,7 +331,7 @@ const valueChanged = (parameterData: IUpdateInformation) => {
 .fixed-collection-parameter {
 	padding-left: var(--spacing-s);
 
-	.delete-option {
+	.icon-button {
 		display: flex;
 		flex-direction: column;
 	}
@@ -390,21 +366,36 @@ const valueChanged = (parameterData: IUpdateInformation) => {
 
 .fixed-collection-parameter-property {
 	margin: var(--spacing-xs) 0;
+	margin-bottom: 0;
 }
 
-.parameter-item:hover > .parameter-item-wrapper > .delete-option {
+.parameter-item:hover > .parameter-item-wrapper > .icon-button {
 	opacity: 1;
 }
 
 .parameter-item {
 	position: relative;
-	padding: 0 0 0 1em;
+	padding: 0 0 var(--spacing-s) var(--spacing-s);
 
 	+ .parameter-item {
 		.parameter-item-wrapper {
-			.delete-option {
-				top: 14px;
+			.default-top-padding {
+				top: calc(1.2 * var(--spacing-s));
 			}
+			.extra-top-padding {
+				top: calc(2.2 * var(--spacing-s));
+			}
+		}
+	}
+}
+
+.parameter-item:first-of-type {
+	.parameter-item-wrapper {
+		.default-top-padding {
+			top: var(--spacing-3xs);
+		}
+		.extra-top-padding {
+			top: var(--spacing-l);
 		}
 	}
 }
@@ -416,4 +407,20 @@ const valueChanged = (parameterData: IUpdateInformation) => {
 .no-items-exist {
 	margin: var(--spacing-xs) 0;
 }
+.ghost,
+.dragging {
+	border-radius: var(--border-radius-base);
+	padding-right: var(--spacing-xs);
+}
+.ghost {
+	background-color: var(--color-background-base);
+	opacity: 0.5;
+}
+.dragging {
+	background-color: var(--color-background-xlight);
+	.parameter-item-wrapper {
+		border: none;
+	}
+	opacity: 0.7;
+}
 </style>
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
index 593a0aa0289b2..23cb31c7ea7e1 100644
--- a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
@@ -114,27 +114,14 @@ defineExpose({
 </script>
 
 <template>
-	<div
-		ref="root"
-		title=""
-		:class="$style.editor"
-		data-test-id="inline-expression-editor-input"
-	></div>
+	<div ref="root" title="" data-test-id="inline-expression-editor-input"></div>
 </template>
 
-<style lang="scss" module>
-.editor div[contenteditable='false'] {
-	background-color: var(--disabled-fill, var(--color-background-light));
-	cursor: not-allowed;
-}
-</style>
-
 <style lang="scss" scoped>
 :deep(.cm-editor) {
 	padding-left: 0;
 }
 :deep(.cm-content) {
-	--disabled-fill: var(--color-background-base);
 	padding-left: var(--spacing-2xs);
 
 	&[aria-readonly='true'] {
diff --git a/packages/editor-ui/src/components/Logo.vue b/packages/editor-ui/src/components/Logo.vue
deleted file mode 100644
index 4909c77de7d25..0000000000000
--- a/packages/editor-ui/src/components/Logo.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<script setup lang="ts">
-import { computed } from 'vue';
-import { useRootStore } from '@/stores/root.store';
-import { useUIStore } from '@/stores/ui.store';
-
-const rootStore = useRootStore();
-const uiStore = useUIStore();
-
-const basePath = computed(() => rootStore.baseUrl);
-
-const logoPath = computed(() => basePath.value + uiStore.logo);
-</script>
-
-<template>
-	<img :src="logoPath" :class="$style.img" alt="n8n.io" />
-</template>
-
-<style lang="scss" module>
-.img {
-	height: 32px;
-}
-</style>
diff --git a/packages/editor-ui/src/components/Logo/Logo.vue b/packages/editor-ui/src/components/Logo/Logo.vue
new file mode 100644
index 0000000000000..f10c168e28e22
--- /dev/null
+++ b/packages/editor-ui/src/components/Logo/Logo.vue
@@ -0,0 +1,119 @@
+<script setup lang="ts">
+import type { FrontendSettings } from '@n8n/api-types';
+import { computed, onMounted, useCssModule, useTemplateRef } from 'vue';
+import { useFavicon } from '@vueuse/core';
+
+import LogoIcon from './logo-icon.svg';
+import LogoText from './logo-text.svg';
+
+const props = defineProps<
+	(
+		| {
+				location: 'authView';
+		  }
+		| {
+				location: 'sidebar';
+				collapsed: boolean;
+		  }
+	) & {
+		releaseChannel: FrontendSettings['releaseChannel'];
+	}
+>();
+
+const { location, releaseChannel } = props;
+
+const showReleaseChannelTag = computed(() => {
+	if (releaseChannel === 'stable') return false;
+	if (location === 'authView') return true;
+	return !props.collapsed;
+});
+
+const showLogoText = computed(() => {
+	if (location === 'authView') return true;
+	return !props.collapsed;
+});
+
+const $style = useCssModule();
+const containerClasses = computed(() => {
+	if (location === 'authView') {
+		return [$style.logoContainer, $style.authView];
+	}
+	return [
+		$style.logoContainer,
+		$style.sidebar,
+		props.collapsed ? $style.sidebarCollapsed : $style.sidebarExpanded,
+	];
+});
+
+const svg = useTemplateRef<{ $el: Element }>('logo');
+onMounted(() => {
+	if (releaseChannel === 'stable' || !('createObjectURL' in URL)) return;
+
+	const logoEl = svg.value!.$el;
+
+	// Change the logo fill color inline, so that favicon can also use it
+	const logoColor = releaseChannel === 'dev' ? '#838383' : '#E9984B';
+	logoEl.querySelector('path')?.setAttribute('fill', logoColor);
+
+	// Reuse the SVG as favicon
+	const blob = new Blob([logoEl.outerHTML], { type: 'image/svg+xml' });
+	useFavicon(URL.createObjectURL(blob));
+});
+</script>
+
+<template>
+	<div :class="containerClasses" data-test-id="n8n-logo">
+		<LogoIcon :class="$style.logo" ref="logo" />
+		<LogoText v-if="showLogoText" :class="$style.logoText" />
+		<div v-if="showReleaseChannelTag" size="small" round :class="$style.releaseChannelTag">
+			{{ releaseChannel }}
+		</div>
+	</div>
+</template>
+
+<style lang="scss" module>
+.logoContainer {
+	display: flex;
+	justify-content: center;
+}
+
+.logoText {
+	margin-left: var(--spacing-5xs);
+	path {
+		fill: var(--color-text-dark);
+	}
+}
+
+.releaseChannelTag {
+	color: var(--color-text-dark);
+	padding: var(--spacing-5xs) var(--spacing-4xs);
+	background-color: var(--color-background-base);
+	border: 1px solid var(--color-foreground-base);
+	border-radius: var(--border-radius-base);
+	font-size: var(--font-size-4xs);
+	font-weight: var(--font-weight-bold);
+	text-transform: capitalize;
+	line-height: var(--font-line-height-regular);
+	height: var(--spacing-s);
+	margin: 10px 0 0 3px;
+}
+
+.authView {
+	transform: scale(2);
+	margin-bottom: var(--spacing-xl);
+}
+
+.sidebar {
+	transform: scale(1.3);
+}
+
+.sidebarExpanded .logo {
+	margin-left: var(--spacing-xs);
+}
+
+.sidebarCollapsed .logo {
+	width: 40px;
+	height: 30px;
+	padding: 0 var(--spacing-4xs);
+}
+</style>
diff --git a/packages/editor-ui/src/components/Logo/__tests__/Logo.test.ts b/packages/editor-ui/src/components/Logo/__tests__/Logo.test.ts
new file mode 100644
index 0000000000000..49b8d1a22ffb1
--- /dev/null
+++ b/packages/editor-ui/src/components/Logo/__tests__/Logo.test.ts
@@ -0,0 +1,38 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import Logo from '../Logo.vue';
+
+vi.stubGlobal('URL', {
+	createObjectURL: vi.fn(),
+});
+
+describe('Logo', () => {
+	const renderComponent = createComponentRenderer(Logo);
+
+	it('renders the logo for authView location', () => {
+		const wrapper = renderComponent({
+			props: { location: 'authView', releaseChannel: 'stable' },
+		});
+		expect(wrapper.html()).toMatchSnapshot();
+	});
+
+	it('renders the logo for sidebar location when sidebar is expanded', () => {
+		const wrapper = renderComponent({
+			props: { location: 'sidebar', collapsed: false, releaseChannel: 'stable' },
+		});
+		expect(wrapper.html()).toMatchSnapshot();
+	});
+
+	it('renders the logo for sidebar location when sidebar is collapsed', () => {
+		const wrapper = renderComponent({
+			props: { location: 'sidebar', collapsed: true, releaseChannel: 'stable' },
+		});
+		expect(wrapper.html()).toMatchSnapshot();
+	});
+
+	it('renders the releaseChannelTag for non-stable releaseChannel', async () => {
+		const wrapper = renderComponent({
+			props: { location: 'authView', releaseChannel: 'dev' },
+		});
+		expect(wrapper.html()).toMatchSnapshot();
+	});
+});
diff --git a/packages/editor-ui/src/components/Logo/__tests__/__snapshots__/Logo.test.ts.snap b/packages/editor-ui/src/components/Logo/__tests__/__snapshots__/Logo.test.ts.snap
new file mode 100644
index 0000000000000..5947e5d0a50cd
--- /dev/null
+++ b/packages/editor-ui/src/components/Logo/__tests__/__snapshots__/Logo.test.ts.snap
@@ -0,0 +1,49 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`Logo > renders the logo for authView location 1`] = `
+"<div class="logoContainer authView" data-test-id="n8n-logo"><svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" class="logo">
+    <path fill="#EA4B71" fill-rule="evenodd" d="M27.2 16.4a3.2 3.2 0 0 1-3.1-2.4h-3.667a1.6 1.6 0 0 0-1.578 1.337l-.132.79A3.2 3.2 0 0 1 17.683 18a3.2 3.2 0 0 1 1.04 1.874l.132.789A1.6 1.6 0 0 0 20.433 22h.468a3.201 3.201 0 0 1 6.299.8 3.2 3.2 0 0 1-6.3.8h-.467a3.2 3.2 0 0 1-3.156-2.674l-.132-.789a1.6 1.6 0 0 0-1.578-1.337h-1.268a3.201 3.201 0 0 1-6.198 0H6.299A3.201 3.201 0 0 1 0 18a3.2 3.2 0 0 1 6.3-.8h1.8a3.201 3.201 0 0 1 6.2 0h1.267a1.6 1.6 0 0 0 1.578-1.337l.132-.79a3.2 3.2 0 0 1 3.156-2.673h3.668a3.201 3.201 0 0 1 6.299.8 3.2 3.2 0 0 1-3.2 3.2m0-1.6a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2m-24 4.8a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2m9.6-1.6a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0m12.8 4.8a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0" clip-rule="evenodd"></path>
+  </svg><svg width="26" height="30" class="logoText">
+    <g fill="#101330">
+      <path fill-rule="evenodd" d="M15.002 16.918v-.076c.558-.28 1.116-.762 1.116-1.716 0-1.372-1.13-2.198-2.69-2.198-1.598 0-2.74.877-2.74 2.224 0 .915.533 1.41 1.116 1.69v.076a2.16 2.16 0 0 0-1.42 2.059c0 1.385 1.141 2.351 3.032 2.351 1.89 0 2.994-.966 2.994-2.351a2.16 2.16 0 0 0-1.408-2.059m-1.587-2.82c.635 0 1.104.406 1.104 1.092s-.482 1.093-1.103 1.093c-.622 0-1.142-.407-1.142-1.093 0-.699.495-1.093 1.142-1.093m0 6.01c-.735 0-1.332-.47-1.332-1.27 0-.725.495-1.272 1.32-1.272.812 0 1.307.534 1.307 1.297 0 .775-.571 1.245-1.294 1.245" clip-rule="evenodd"></path>
+      <path d="M18.367 21.2h1.624v-3.442c0-1.131.685-1.627 1.46-1.627.76 0 1.357.509 1.357 1.55v3.52h1.624V17.35c0-1.664-.964-2.63-2.474-2.63-.952 0-1.485.381-1.865.877h-.102l-.14-.75h-1.484zm-14.376 0H2.367v-6.352h1.485l.14.75h.1c.381-.496.914-.877 1.866-.877 1.51 0 2.474.966 2.474 2.63v3.85H6.808V17.68c0-1.041-.596-1.55-1.358-1.55-.774 0-1.459.496-1.459 1.627z"></path>
+    </g>
+  </svg>
+  <!--v-if-->
+</div>"
+`;
+
+exports[`Logo > renders the logo for sidebar location when sidebar is collapsed 1`] = `
+"<div class="logoContainer sidebar sidebarCollapsed" data-test-id="n8n-logo"><svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" class="logo">
+    <path fill="#EA4B71" fill-rule="evenodd" d="M27.2 16.4a3.2 3.2 0 0 1-3.1-2.4h-3.667a1.6 1.6 0 0 0-1.578 1.337l-.132.79A3.2 3.2 0 0 1 17.683 18a3.2 3.2 0 0 1 1.04 1.874l.132.789A1.6 1.6 0 0 0 20.433 22h.468a3.201 3.201 0 0 1 6.299.8 3.2 3.2 0 0 1-6.3.8h-.467a3.2 3.2 0 0 1-3.156-2.674l-.132-.789a1.6 1.6 0 0 0-1.578-1.337h-1.268a3.201 3.201 0 0 1-6.198 0H6.299A3.201 3.201 0 0 1 0 18a3.2 3.2 0 0 1 6.3-.8h1.8a3.201 3.201 0 0 1 6.2 0h1.267a1.6 1.6 0 0 0 1.578-1.337l.132-.79a3.2 3.2 0 0 1 3.156-2.673h3.668a3.201 3.201 0 0 1 6.299.8 3.2 3.2 0 0 1-3.2 3.2m0-1.6a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2m-24 4.8a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2m9.6-1.6a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0m12.8 4.8a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0" clip-rule="evenodd"></path>
+  </svg>
+  <!--v-if-->
+  <!--v-if-->
+</div>"
+`;
+
+exports[`Logo > renders the logo for sidebar location when sidebar is expanded 1`] = `
+"<div class="logoContainer sidebar sidebarExpanded" data-test-id="n8n-logo"><svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" class="logo">
+    <path fill="#EA4B71" fill-rule="evenodd" d="M27.2 16.4a3.2 3.2 0 0 1-3.1-2.4h-3.667a1.6 1.6 0 0 0-1.578 1.337l-.132.79A3.2 3.2 0 0 1 17.683 18a3.2 3.2 0 0 1 1.04 1.874l.132.789A1.6 1.6 0 0 0 20.433 22h.468a3.201 3.201 0 0 1 6.299.8 3.2 3.2 0 0 1-6.3.8h-.467a3.2 3.2 0 0 1-3.156-2.674l-.132-.789a1.6 1.6 0 0 0-1.578-1.337h-1.268a3.201 3.201 0 0 1-6.198 0H6.299A3.201 3.201 0 0 1 0 18a3.2 3.2 0 0 1 6.3-.8h1.8a3.201 3.201 0 0 1 6.2 0h1.267a1.6 1.6 0 0 0 1.578-1.337l.132-.79a3.2 3.2 0 0 1 3.156-2.673h3.668a3.201 3.201 0 0 1 6.299.8 3.2 3.2 0 0 1-3.2 3.2m0-1.6a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2m-24 4.8a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2m9.6-1.6a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0m12.8 4.8a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0" clip-rule="evenodd"></path>
+  </svg><svg width="26" height="30" class="logoText">
+    <g fill="#101330">
+      <path fill-rule="evenodd" d="M15.002 16.918v-.076c.558-.28 1.116-.762 1.116-1.716 0-1.372-1.13-2.198-2.69-2.198-1.598 0-2.74.877-2.74 2.224 0 .915.533 1.41 1.116 1.69v.076a2.16 2.16 0 0 0-1.42 2.059c0 1.385 1.141 2.351 3.032 2.351 1.89 0 2.994-.966 2.994-2.351a2.16 2.16 0 0 0-1.408-2.059m-1.587-2.82c.635 0 1.104.406 1.104 1.092s-.482 1.093-1.103 1.093c-.622 0-1.142-.407-1.142-1.093 0-.699.495-1.093 1.142-1.093m0 6.01c-.735 0-1.332-.47-1.332-1.27 0-.725.495-1.272 1.32-1.272.812 0 1.307.534 1.307 1.297 0 .775-.571 1.245-1.294 1.245" clip-rule="evenodd"></path>
+      <path d="M18.367 21.2h1.624v-3.442c0-1.131.685-1.627 1.46-1.627.76 0 1.357.509 1.357 1.55v3.52h1.624V17.35c0-1.664-.964-2.63-2.474-2.63-.952 0-1.485.381-1.865.877h-.102l-.14-.75h-1.484zm-14.376 0H2.367v-6.352h1.485l.14.75h.1c.381-.496.914-.877 1.866-.877 1.51 0 2.474.966 2.474 2.63v3.85H6.808V17.68c0-1.041-.596-1.55-1.358-1.55-.774 0-1.459.496-1.459 1.627z"></path>
+    </g>
+  </svg>
+  <!--v-if-->
+</div>"
+`;
+
+exports[`Logo > renders the releaseChannelTag for non-stable releaseChannel 1`] = `
+"<div class="logoContainer authView" data-test-id="n8n-logo"><svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" class="logo">
+    <path fill="#838383" fill-rule="evenodd" d="M27.2 16.4a3.2 3.2 0 0 1-3.1-2.4h-3.667a1.6 1.6 0 0 0-1.578 1.337l-.132.79A3.2 3.2 0 0 1 17.683 18a3.2 3.2 0 0 1 1.04 1.874l.132.789A1.6 1.6 0 0 0 20.433 22h.468a3.201 3.201 0 0 1 6.299.8 3.2 3.2 0 0 1-6.3.8h-.467a3.2 3.2 0 0 1-3.156-2.674l-.132-.789a1.6 1.6 0 0 0-1.578-1.337h-1.268a3.201 3.201 0 0 1-6.198 0H6.299A3.201 3.201 0 0 1 0 18a3.2 3.2 0 0 1 6.3-.8h1.8a3.201 3.201 0 0 1 6.2 0h1.267a1.6 1.6 0 0 0 1.578-1.337l.132-.79a3.2 3.2 0 0 1 3.156-2.673h3.668a3.201 3.201 0 0 1 6.299.8 3.2 3.2 0 0 1-3.2 3.2m0-1.6a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2m-24 4.8a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2m9.6-1.6a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0m12.8 4.8a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0" clip-rule="evenodd"></path>
+  </svg><svg width="26" height="30" class="logoText">
+    <g fill="#101330">
+      <path fill-rule="evenodd" d="M15.002 16.918v-.076c.558-.28 1.116-.762 1.116-1.716 0-1.372-1.13-2.198-2.69-2.198-1.598 0-2.74.877-2.74 2.224 0 .915.533 1.41 1.116 1.69v.076a2.16 2.16 0 0 0-1.42 2.059c0 1.385 1.141 2.351 3.032 2.351 1.89 0 2.994-.966 2.994-2.351a2.16 2.16 0 0 0-1.408-2.059m-1.587-2.82c.635 0 1.104.406 1.104 1.092s-.482 1.093-1.103 1.093c-.622 0-1.142-.407-1.142-1.093 0-.699.495-1.093 1.142-1.093m0 6.01c-.735 0-1.332-.47-1.332-1.27 0-.725.495-1.272 1.32-1.272.812 0 1.307.534 1.307 1.297 0 .775-.571 1.245-1.294 1.245" clip-rule="evenodd"></path>
+      <path d="M18.367 21.2h1.624v-3.442c0-1.131.685-1.627 1.46-1.627.76 0 1.357.509 1.357 1.55v3.52h1.624V17.35c0-1.664-.964-2.63-2.474-2.63-.952 0-1.485.381-1.865.877h-.102l-.14-.75h-1.484zm-14.376 0H2.367v-6.352h1.485l.14.75h.1c.381-.496.914-.877 1.866-.877 1.51 0 2.474.966 2.474 2.63v3.85H6.808V17.68c0-1.041-.596-1.55-1.358-1.55-.774 0-1.459.496-1.459 1.627z"></path>
+    </g>
+  </svg>
+  <div size="small" round="" class="releaseChannelTag">dev</div>
+</div>"
+`;
diff --git a/packages/editor-ui/src/components/Logo/logo-icon.svg b/packages/editor-ui/src/components/Logo/logo-icon.svg
new file mode 100644
index 0000000000000..90a0081f126ad
--- /dev/null
+++ b/packages/editor-ui/src/components/Logo/logo-icon.svg
@@ -0,0 +1,3 @@
+<svg xmlns='http://www.w3.org/2000/svg' width="30" height="30">
+  <path fill="#EA4B71" fill-rule="evenodd" clip-rule="evenodd" transform="translate(0, 10)" d="M27.2 6.4A3.2 3.2 0 0 1 24.1 4h-3.667a1.6 1.6 0 0 0-1.578 1.337l-.132.79A3.2 3.2 0 0 1 17.683 8a3.2 3.2 0 0 1 1.04 1.874l.132.789A1.6 1.6 0 0 0 20.433 12h.468a3.201 3.201 0 0 1 6.299.8 3.2 3.2 0 0 1-6.3.8h-.467a3.2 3.2 0 0 1-3.156-2.674l-.132-.789A1.6 1.6 0 0 0 15.567 8.8h-1.268a3.201 3.201 0 0 1-6.198 0H6.299A3.201 3.201 0 0 1 0 8a3.2 3.2 0 0 1 6.3-.8h1.8a3.201 3.201 0 0 1 6.2 0h1.267a1.6 1.6 0 0 0 1.578-1.337l.132-.79A3.2 3.2 0 0 1 20.433 2.4h3.668a3.201 3.201 0 0 1 6.299.8 3.2 3.2 0 0 1-3.2 3.2m0-1.6a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2m-24 4.8a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2M12.8 8a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0m12.8 4.8a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0" />
+</svg>
diff --git a/packages/editor-ui/src/components/Logo/logo-text.svg b/packages/editor-ui/src/components/Logo/logo-text.svg
new file mode 100644
index 0000000000000..6b8c96389430c
--- /dev/null
+++ b/packages/editor-ui/src/components/Logo/logo-text.svg
@@ -0,0 +1,6 @@
+<svg width="26" height="30">
+  <g fill="#101330" transform="translate(-33, 10)">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M 48.002,6.918 V 6.842 c 0.558,-0.28 1.116,-0.762 1.116,-1.716 0,-1.372 -1.13,-2.198 -2.69,-2.198 -1.598,0 -2.74,0.877 -2.74,2.224 0,0.915 0.533,1.41 1.116,1.69 v 0.076 a 2.16,2.16 0 0 0 -1.42,2.059 c 0,1.385 1.141,2.351 3.032,2.351 1.89,0 2.994,-0.966 2.994,-2.351 A 2.16,2.16 0 0 0 48.002,6.918 m -1.587,-2.82 c 0.635,0 1.104,0.406 1.104,1.092 0,0.686 -0.482,1.093 -1.103,1.093 -0.622,0 -1.142,-0.407 -1.142,-1.093 0,-0.699 0.495,-1.093 1.142,-1.093 m 0,6.01 c -0.735,0 -1.332,-0.47 -1.332,-1.27 0,-0.725 0.495,-1.272 1.32,-1.272 0.812,0 1.307,0.534 1.307,1.297 0,0.775 -0.571,1.245 -1.294,1.245" />
+    <path d="m 51.367,11.2 h 1.624 V 7.758 c 0,-1.131 0.685,-1.627 1.46,-1.627 0.76,0 1.357,0.509 1.357,1.55 v 3.52 h 1.624 V 7.35 c 0,-1.664 -0.964,-2.63 -2.474,-2.63 -0.952,0 -1.485,0.381 -1.865,0.877 h -0.102 l -0.14,-0.75 h -1.484 z m -14.376,0 H 35.367 V 4.848 h 1.485 l 0.14,0.75 h 0.1 c 0.381,-0.496 0.914,-0.877 1.866,-0.877 1.51,0 2.474,0.966 2.474,2.63 v 3.85 H 39.808 V 7.68 c 0,-1.041 -0.596,-1.55 -1.358,-1.55 -0.774,0 -1.459,0.496 -1.459,1.627 z" />
+  </g>
+</svg>
diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
index 6725bbf92d135..89ff66a32ec3c 100644
--- a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
+++ b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
@@ -605,7 +605,11 @@ function showCreateWorkflowSuccessToast(id?: string) {
 	if (!id || ['new', PLACEHOLDER_EMPTY_WORKFLOW_ID].includes(id)) {
 		let toastTitle = locale.baseText('workflows.create.personal.toast.title');
 		let toastText = locale.baseText('workflows.create.personal.toast.text');
-		if (projectsStore.currentProject) {
+
+		if (
+			projectsStore.currentProject &&
+			projectsStore.currentProject.id !== projectsStore.personalProject?.id
+		) {
 			toastTitle = locale.baseText('workflows.create.project.toast.title', {
 				interpolate: { projectName: projectsStore.currentProject.name ?? '' },
 			});
diff --git a/packages/editor-ui/src/components/MainSidebar.vue b/packages/editor-ui/src/components/MainSidebar.vue
index 9b294a85f1e7c..40ace711e18f0 100644
--- a/packages/editor-ui/src/components/MainSidebar.vue
+++ b/packages/editor-ui/src/components/MainSidebar.vue
@@ -25,6 +25,7 @@ import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper
 import { useGlobalEntityCreation } from '@/composables/useGlobalEntityCreation';
 import { N8nNavigationDropdown } from 'n8n-design-system';
 import { onClickOutside, type VueInstance } from '@vueuse/core';
+import Logo from './Logo/Logo.vue';
 
 const becomeTemplateCreatorStore = useBecomeTemplateCreatorStore();
 const cloudPlanStore = useCloudPlanStore();
@@ -165,10 +166,6 @@ const createBtn = ref<InstanceType<typeof N8nNavigationDropdown>>();
 
 const isCollapsed = computed(() => uiStore.sidebarMenuCollapsed);
 
-const logoPath = computed(
-	() => basePath.value + (isCollapsed.value ? 'static/logo/collapsed.svg' : uiStore.logo),
-);
-
 const hasVersionUpdates = computed(
 	() => settingsStore.settings.releaseChannel === 'stable' && versionsStore.hasVersionUpdates,
 );
@@ -296,6 +293,7 @@ const {
 	handleSelect: handleMenuSelect,
 	createProjectAppendSlotName,
 	projectsLimitReachedMessage,
+	upgradeLabel,
 } = useGlobalEntityCreation();
 onClickOutside(createBtn as Ref<VueInstance>, () => {
 	createBtn.value?.close();
@@ -320,7 +318,11 @@ onClickOutside(createBtn as Ref<VueInstance>, () => {
 			<N8nIcon v-else icon="chevron-left" size="xsmall" class="mr-5xs" />
 		</div>
 		<div :class="$style.logo">
-			<img :src="logoPath" data-test-id="n8n-logo" :class="$style.icon" alt="n8n" />
+			<Logo
+				location="sidebar"
+				:collapsed="isCollapsed"
+				:release-channel="settingsStore.settings.releaseChannel"
+			/>
 			<N8nNavigationDropdown
 				ref="createBtn"
 				data-test-id="universal-add"
@@ -336,7 +338,7 @@ onClickOutside(createBtn as Ref<VueInstance>, () => {
 							type="tertiary"
 							@click="handleMenuSelect(item.id)"
 						>
-							{{ i18n.baseText('generic.upgrade') }}
+							{{ upgradeLabel }}
 						</N8nButton>
 					</N8nTooltip>
 				</template>
@@ -450,15 +452,11 @@ onClickOutside(createBtn as Ref<VueInstance>, () => {
 
 	&.sideMenuCollapsed {
 		width: $sidebar-width;
-		padding-top: 90px;
+		padding-top: 100px;
 
 		.logo {
 			flex-direction: column;
-			gap: 16px;
-		}
-
-		.logo img {
-			left: 0;
+			gap: 12px;
 		}
 	}
 }
diff --git a/packages/editor-ui/src/components/MainSidebarSourceControl.test.ts b/packages/editor-ui/src/components/MainSidebarSourceControl.test.ts
index b6f89a1d33ec5..4c192ffba6dc2 100644
--- a/packages/editor-ui/src/components/MainSidebarSourceControl.test.ts
+++ b/packages/editor-ui/src/components/MainSidebarSourceControl.test.ts
@@ -16,10 +16,17 @@ let sourceControlStore: ReturnType<typeof useSourceControlStore>;
 let uiStore: ReturnType<typeof useUIStore>;
 let rbacStore: ReturnType<typeof useRBACStore>;
 
+const showMessage = vi.fn();
+const showError = vi.fn();
+vi.mock('@/composables/useToast', () => ({
+	useToast: () => ({ showMessage, showError }),
+}));
+
 const renderComponent = createComponentRenderer(MainSidebarSourceControl);
 
 describe('MainSidebarSourceControl', () => {
 	beforeEach(() => {
+		vi.resetAllMocks();
 		pinia = createTestingPinia({
 			initialState: {
 				[STORES.SETTINGS]: {
@@ -75,13 +82,13 @@ describe('MainSidebarSourceControl', () => {
 			vi.spyOn(sourceControlStore, 'pullWorkfolder').mockRejectedValueOnce({
 				response: { status: 400 },
 			});
-			const { getAllByRole, getByRole } = renderComponent({
+			const { getAllByRole } = renderComponent({
 				pinia,
 				props: { isCollapsed: false },
 			});
 
 			await userEvent.click(getAllByRole('button')[0]);
-			await waitFor(() => expect(getByRole('alert')).toBeInTheDocument());
+			await waitFor(() => expect(showError).toHaveBeenCalled());
 		});
 
 		it('should show confirm if pull response http status code is 409', async () => {
@@ -108,5 +115,21 @@ describe('MainSidebarSourceControl', () => {
 				),
 			);
 		});
+
+		it('should show toast when there are no changes', async () => {
+			vi.spyOn(sourceControlStore, 'getAggregatedStatus').mockResolvedValueOnce([]);
+
+			const { getAllByRole } = renderComponent({
+				pinia,
+				props: { isCollapsed: false },
+			});
+
+			await userEvent.click(getAllByRole('button')[1]);
+			await waitFor(() =>
+				expect(showMessage).toHaveBeenCalledWith(
+					expect.objectContaining({ title: 'No changes to commit' }),
+				),
+			);
+		});
 	});
 });
diff --git a/packages/editor-ui/src/components/MainSidebarSourceControl.vue b/packages/editor-ui/src/components/MainSidebarSourceControl.vue
index d00f5364fa9aa..8dab6c1de86b0 100644
--- a/packages/editor-ui/src/components/MainSidebarSourceControl.vue
+++ b/packages/editor-ui/src/components/MainSidebarSourceControl.vue
@@ -43,6 +43,15 @@ async function pushWorkfolder() {
 	try {
 		const status = await sourceControlStore.getAggregatedStatus();
 
+		if (!status.length) {
+			toast.showMessage({
+				title: 'No changes to commit',
+				message: 'Everything is up to date',
+				type: 'info',
+			});
+			return;
+		}
+
 		uiStore.openModalWithData({
 			name: SOURCE_CONTROL_PUSH_MODAL_KEY,
 			data: { eventBus, status },
@@ -68,6 +77,7 @@ async function pullWorkfolder() {
 		const statusWithoutLocallyCreatedWorkflows = status.filter((file) => {
 			return !(file.type === 'workflow' && file.status === 'created' && file.location === 'local');
 		});
+
 		if (statusWithoutLocallyCreatedWorkflows.length === 0) {
 			toast.showMessage({
 				title: i18n.baseText('settings.sourceControl.pull.upToDate.title'),
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
index 9b4a8614d2e92..b982e4ecee414 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
@@ -9,7 +9,6 @@ import {
 } from '@/constants';
 
 import { isCommunityPackageName } from '@/utils/nodeTypesUtils';
-import { getNewNodePosition, NODE_SIZE } from '@/utils/nodeViewUtils';
 import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
 import NodeIcon from '@/components/NodeIcon.vue';
 
@@ -93,15 +92,6 @@ const isTrigger = computed<boolean>(() => {
 });
 
 function onDragStart(event: DragEvent): void {
-	/**
-	 * Workaround for firefox, that doesn't attach the pageX and pageY coordinates to "ondrag" event.
-	 * All browsers attach the correct page coordinates to the "dragover" event.
-	 * @bug https://bugzilla.mozilla.org/show_bug.cgi?id=505521
-	 */
-	document.body.addEventListener('dragover', onDragOver);
-
-	const { pageX: x, pageY: y } = event;
-
 	if (event.dataTransfer) {
 		event.dataTransfer.effectAllowed = 'copy';
 		event.dataTransfer.dropEffect = 'copy';
@@ -113,22 +103,9 @@ function onDragStart(event: DragEvent): void {
 	}
 
 	dragging.value = true;
-	draggablePosition.value = { x, y };
-}
-
-function onDragOver(event: DragEvent): void {
-	if (!dragging.value || (event.pageX === 0 && event.pageY === 0)) {
-		return;
-	}
-
-	const [x, y] = getNewNodePosition([], [event.pageX - NODE_SIZE / 2, event.pageY - NODE_SIZE / 2]);
-
-	draggablePosition.value = { x, y };
 }
 
 function onDragEnd(): void {
-	document.body.removeEventListener('dragover', onDragOver);
-
 	dragging.value = false;
 	setTimeout(() => {
 		draggablePosition.value = { x: -100, y: -100 };
@@ -144,7 +121,7 @@ function onCommunityNodeTooltipClick(event: MouseEvent) {
 
 <template>
 	<!-- Node Item is draggable only if it doesn't contain actions -->
-	<n8n-node-creator-node
+	<N8nNodeCreatorNode
 		:draggable="!showActionArrow"
 		:class="$style.nodeItem"
 		:description="description"
@@ -176,12 +153,16 @@ function onCommunityNodeTooltipClick(event: MouseEvent) {
 			/>
 		</template>
 		<template #dragContent>
-			<div ref="draggableDataTransfer" :class="$style.draggableDataTransfer" />
-			<div v-show="dragging" :class="$style.draggable" :style="draggableStyle">
+			<div
+				ref="draggableDataTransfer"
+				v-show="dragging"
+				:class="$style.draggable"
+				:style="draggableStyle"
+			>
 				<NodeIcon :node-type="nodeType" :size="40" :shrink="false" @click.capture.stop />
 			</div>
 		</template>
-	</n8n-node-creator-node>
+	</N8nNodeCreatorNode>
 </template>
 
 <style lang="scss" module>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/composables/useActions.ts b/packages/editor-ui/src/components/Node/NodeCreator/composables/useActions.ts
index 92a5563d80d8f..e92097bbddae1 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/composables/useActions.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/composables/useActions.ts
@@ -212,24 +212,10 @@ export const useActions = () => {
 		];
 
 		const isCompatibleNode = addedNodes.some((node) => COMPATIBLE_CHAT_NODES.includes(node.type));
-
 		if (!isCompatibleNode) return false;
 
-		const { allNodes, getNodeTypes } = useWorkflowsStore();
-		const { getByNameAndVersion } = getNodeTypes();
-
-		// We want to add a trigger if there are no triggers other than Manual Triggers
-		// Performance here should be fine as `getByNameAndVersion` fetches nodeTypes once in bulk
-		// and `every` aborts on first `false`
-		const shouldAddChatTrigger = allNodes.every((node) => {
-			const nodeType = getByNameAndVersion(node.type, node.typeVersion);
-
-			return (
-				!nodeType.description.group.includes('trigger') || node.type === MANUAL_TRIGGER_NODE_TYPE
-			);
-		});
-
-		return shouldAddChatTrigger;
+		const { allNodes } = useWorkflowsStore();
+		return allNodes.filter((x) => x.type !== MANUAL_TRIGGER_NODE_TYPE).length === 0;
 	}
 
 	// AI-226: Prepend LLM Chain node when adding a language model
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/useActions.test.ts b/packages/editor-ui/src/components/Node/NodeCreator/useActions.test.ts
index cf8fa94014ba1..386ff58c6eefe 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/useActions.test.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/useActions.test.ts
@@ -73,10 +73,11 @@ describe('useActions', () => {
 			});
 		});
 
-		test('should insert a ChatTrigger node when an AI Agent is added without trigger', () => {
+		test('should insert a ChatTrigger node when an AI Agent is added on an empty canvas', () => {
 			const workflowsStore = useWorkflowsStore();
 
 			vi.spyOn(workflowsStore, 'workflowTriggerNodes', 'get').mockReturnValue([]);
+			vi.spyOn(workflowsStore, 'allNodes', 'get').mockReturnValue([]);
 
 			const { getAddedNodesAndConnections } = useActions();
 
@@ -98,15 +99,15 @@ describe('useActions', () => {
 			});
 		});
 
-		test('should insert a ChatTrigger node when an AI Agent is added with only a Manual Trigger', () => {
+		test('should insert a ChatTrigger node when an AI Agent is added with only a Manual Trigger present', () => {
 			const workflowsStore = useWorkflowsStore();
 
 			vi.spyOn(workflowsStore, 'workflowTriggerNodes', 'get').mockReturnValue([
 				{ type: MANUAL_TRIGGER_NODE_TYPE } as never,
 			]);
-			vi.spyOn(workflowsStore, 'getNodeTypes').mockReturnValue({
-				getByNameAndVersion: () => ({ description: { group: ['trigger'] } }),
-			} as never);
+			vi.spyOn(workflowsStore, 'allNodes', 'get').mockReturnValue([
+				{ type: MANUAL_TRIGGER_NODE_TYPE } as never,
+			]);
 
 			const { getAddedNodesAndConnections } = useActions();
 
@@ -128,15 +129,17 @@ describe('useActions', () => {
 			});
 		});
 
-		test('should not insert a ChatTrigger node when an AI Agent is added with a trigger already present', () => {
+		test('should not insert a ChatTrigger node when an AI Agent is added with a non-trigger node prseent', () => {
 			const workflowsStore = useWorkflowsStore();
 
+			vi.spyOn(workflowsStore, 'workflowTriggerNodes', 'get').mockReturnValue([
+				{ type: GITHUB_TRIGGER_NODE_TYPE } as never,
+			]);
+
 			vi.spyOn(workflowsStore, 'allNodes', 'get').mockReturnValue([
 				{ type: GITHUB_TRIGGER_NODE_TYPE } as never,
+				{ type: HTTP_REQUEST_NODE_TYPE } as never,
 			]);
-			vi.spyOn(workflowsStore, 'getNodeTypes').mockReturnValue({
-				getByNameAndVersion: () => ({ description: { group: ['trigger'] } }),
-			} as never);
 
 			const { getAddedNodesAndConnections } = useActions();
 
@@ -155,9 +158,6 @@ describe('useActions', () => {
 			vi.spyOn(workflowsStore, 'allNodes', 'get').mockReturnValue([
 				{ type: CHAT_TRIGGER_NODE_TYPE } as never,
 			]);
-			vi.spyOn(workflowsStore, 'getNodeTypes').mockReturnValue({
-				getByNameAndVersion: () => ({ description: { group: ['trigger'] } }),
-			} as never);
 
 			const { getAddedNodesAndConnections } = useActions();
 
diff --git a/packages/editor-ui/src/components/NodeSettings.vue b/packages/editor-ui/src/components/NodeSettings.vue
index 5256f41983a34..c7e41fb00fc3b 100644
--- a/packages/editor-ui/src/components/NodeSettings.vue
+++ b/packages/editor-ui/src/components/NodeSettings.vue
@@ -162,7 +162,7 @@ const executeButtonTooltip = computed(() => {
 		node.value &&
 		isLatestNodeVersion.value &&
 		props.inputSize > 1 &&
-		!NodeHelpers.isSingleExecution(node.value.type, node.value.parameters)
+		!nodeHelpers.isSingleExecution(node.value.type, node.value.parameters)
 	) {
 		return i18n.baseText('nodeSettings.executeButtonTooltip.times', {
 			interpolate: { inputSize: props.inputSize },
diff --git a/packages/editor-ui/src/components/NpsSurvey.vue b/packages/editor-ui/src/components/NpsSurvey.vue
index 818f7483f8acf..ce792ba20de0b 100644
--- a/packages/editor-ui/src/components/NpsSurvey.vue
+++ b/packages/editor-ui/src/components/NpsSurvey.vue
@@ -96,7 +96,6 @@ async function send() {
 			message: Number(form.value.value) >= 8 ? i18n.baseText('prompts.npsSurvey.reviewUs') : '',
 			type: 'success',
 			duration: 15000,
-			dangerouslyUseHTMLString: true,
 		});
 
 		setTimeout(() => {
diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index 50ee284d2cd0e..1a5740979d6c6 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -1059,6 +1059,7 @@ onUpdated(async () => {
 				:expression-edit-dialog-visible="expressionEditDialogVisible"
 				:path="path"
 				:parameter-issues="getIssues"
+				:is-read-only="isReadOnly"
 				@update:model-value="valueChanged"
 				@modal-opener-click="openExpressionEditorModal"
 				@focus="setFocus"
@@ -1430,6 +1431,7 @@ onUpdated(async () => {
 					:key="option.value.toString()"
 					:value="option.value"
 					:label="getOptionsOptionDisplayName(option)"
+					data-test-id="parameter-input-item"
 				>
 					<div class="list-option">
 						<div
diff --git a/packages/editor-ui/src/components/ParameterInputFull.vue b/packages/editor-ui/src/components/ParameterInputFull.vue
index 84b697f9da42f..332011b9ea743 100644
--- a/packages/editor-ui/src/components/ParameterInputFull.vue
+++ b/packages/editor-ui/src/components/ParameterInputFull.vue
@@ -167,7 +167,6 @@ function onDrop(newParamValue: string) {
 					title: i18n.baseText('dataMapping.success.title'),
 					message: i18n.baseText('dataMapping.success.moreInfo'),
 					type: 'success',
-					dangerouslyUseHTMLString: true,
 				});
 
 				ndvStore.setMappingOnboarded();
diff --git a/packages/editor-ui/src/components/ParameterInputList.vue b/packages/editor-ui/src/components/ParameterInputList.vue
index 91249fbafba45..11fe4e1f42a5a 100644
--- a/packages/editor-ui/src/components/ParameterInputList.vue
+++ b/packages/editor-ui/src/components/ParameterInputList.vue
@@ -531,16 +531,6 @@ function getParameterValue<T extends NodeParameterValueType = NodeParameterValue
 				v-else-if="['collection', 'fixedCollection'].includes(parameter.type)"
 				class="multi-parameter"
 			>
-				<N8nIconButton
-					v-if="hideDelete !== true && !isReadOnly && !parameter.isNodeSetting"
-					type="tertiary"
-					text
-					size="mini"
-					icon="trash"
-					class="delete-option"
-					:title="i18n.baseText('parameterInputList.delete')"
-					@click="deleteOption(parameter.name)"
-				></N8nIconButton>
 				<N8nInputLabel
 					:label="i18n.nodeText().inputLabelDisplayName(parameter, path)"
 					:tooltip-text="i18n.nodeText().inputLabelDescription(parameter, path)"
@@ -580,6 +570,16 @@ function getParameterValue<T extends NodeParameterValueType = NodeParameterValue
 					<N8nIcon icon="exclamation-triangle" size="xsmall" />
 					{{ i18n.baseText('parameterInputList.loadingError') }}
 				</N8nText>
+				<N8nIconButton
+					v-if="hideDelete !== true && !isReadOnly && !parameter.isNodeSetting"
+					type="tertiary"
+					text
+					size="mini"
+					icon="trash"
+					class="icon-button"
+					:title="i18n.baseText('parameterInputList.delete')"
+					@click="deleteOption(parameter.name)"
+				></N8nIconButton>
 			</div>
 			<ResourceMapper
 				v-else-if="parameter.type === 'resourceMapper'"
@@ -620,7 +620,7 @@ function getParameterValue<T extends NodeParameterValueType = NodeParameterValue
 					text
 					size="mini"
 					icon="trash"
-					class="delete-option"
+					class="icon-button"
 					:title="i18n.baseText('parameterInputList.delete')"
 					@click="deleteOption(parameter.name)"
 				></N8nIconButton>
@@ -650,12 +650,19 @@ function getParameterValue<T extends NodeParameterValueType = NodeParameterValue
 
 <style lang="scss">
 .parameter-input-list-wrapper {
-	.delete-option {
+	--disabled-fill: var(--color-background-base);
+	.icon-button {
 		position: absolute;
 		opacity: 0;
 		top: 0;
-		left: calc(-1 * var(--spacing-2xs));
+		left: calc(-0.5 * var(--spacing-2xs));
 		transition: opacity 100ms ease-in;
+		Button {
+			color: var(--color-icon-base);
+		}
+	}
+	.icon-button > Button:hover {
+		color: var(--color-icon-hover);
 	}
 
 	.indent > div {
@@ -675,8 +682,8 @@ function getParameterValue<T extends NodeParameterValueType = NodeParameterValue
 		position: relative;
 		margin: var(--spacing-xs) 0;
 	}
-	.parameter-item:hover > .delete-option,
-	.multi-parameter:hover > .delete-option {
+	.parameter-item:hover > .icon-button,
+	.multi-parameter:hover > .icon-button {
 		opacity: 1;
 	}
 
diff --git a/packages/editor-ui/src/components/Projects/ProjectCreateResource.vue b/packages/editor-ui/src/components/Projects/ProjectCreateResource.vue
new file mode 100644
index 0000000000000..c35a203e868ac
--- /dev/null
+++ b/packages/editor-ui/src/components/Projects/ProjectCreateResource.vue
@@ -0,0 +1,55 @@
+<script lang="ts" setup>
+import { N8nIconButton, N8nActionToggle } from 'n8n-design-system';
+
+type Action = {
+	label: string;
+	value: string;
+	disabled: boolean;
+};
+defineProps<{
+	actions: Action[];
+}>();
+
+const emit = defineEmits<{
+	action: [id: string];
+}>();
+</script>
+
+<template>
+	<div :class="[$style.buttonGroup]">
+		<slot></slot>
+		<N8nActionToggle
+			data-test-id="add-resource"
+			:actions="actions"
+			placement="bottom-end"
+			:teleported="false"
+			@action="emit('action', $event)"
+		>
+			<N8nIconButton :class="[$style.buttonGroupDropdown]" icon="angle-down" />
+		</N8nActionToggle>
+	</div>
+</template>
+
+<style lang="scss" module>
+.buttonGroup {
+	display: inline-flex;
+
+	:global(> .button) {
+		border-right: 1px solid var(--button-font-color, var(--color-button-primary-font));
+
+		&:not(:first-child) {
+			border-radius: 0;
+		}
+
+		&:first-child {
+			border-top-right-radius: 0;
+			border-bottom-right-radius: 0;
+		}
+	}
+}
+
+.buttonGroupDropdown {
+	border-top-left-radius: 0;
+	border-bottom-left-radius: 0;
+}
+</style>
diff --git a/packages/editor-ui/src/components/Projects/ProjectHeader.test.ts b/packages/editor-ui/src/components/Projects/ProjectHeader.test.ts
index 21a4c8c52faa4..09b652dab9fdc 100644
--- a/packages/editor-ui/src/components/Projects/ProjectHeader.test.ts
+++ b/packages/editor-ui/src/components/Projects/ProjectHeader.test.ts
@@ -1,5 +1,4 @@
 import { createTestingPinia } from '@pinia/testing';
-import { within } from '@testing-library/dom';
 import { createComponentRenderer } from '@/__tests__/render';
 import { mockedStore } from '@/__tests__/utils';
 import { createTestProject } from '@/__tests__/data/projects';
@@ -10,13 +9,19 @@ import { useProjectsStore } from '@/stores/projects.store';
 import type { Project } from '@/types/projects.types';
 import { ProjectTypes } from '@/types/projects.types';
 import { VIEWS } from '@/constants';
+import userEvent from '@testing-library/user-event';
+import { waitFor, within } from '@testing-library/vue';
 
+const mockPush = vi.fn();
 vi.mock('vue-router', async () => {
 	const actual = await vi.importActual('vue-router');
 	const params = {};
 	const location = {};
 	return {
 		...actual,
+		useRouter: () => ({
+			push: mockPush,
+		}),
 		useRoute: () => ({
 			params,
 			location,
@@ -32,7 +37,6 @@ const renderComponent = createComponentRenderer(ProjectHeader, {
 	global: {
 		stubs: {
 			ProjectTabs: projectTabsSpy,
-			N8nNavigationDropdown: true,
 		},
 	},
 });
@@ -143,23 +147,45 @@ describe('ProjectHeader', () => {
 		);
 	});
 
-	test.each([
-		[null, 'Create'],
-		[createTestProject({ type: ProjectTypes.Personal }), 'Create in personal'],
-		[createTestProject({ type: ProjectTypes.Team }), 'Create in project'],
-	])('in project %s should render correct create button label %s', (project, label) => {
+	it('should create a workflow', async () => {
+		const project = createTestProject({
+			scopes: ['workflow:create'],
+		});
 		projectsStore.currentProject = project;
-		const { getByTestId } = renderComponent({
-			global: {
-				stubs: {
-					N8nNavigationDropdown: {
-						template: '<div><slot></slot></div>',
-					},
-				},
-			},
+
+		const { getByTestId } = renderComponent();
+
+		await userEvent.click(getByTestId('add-resource-workflow'));
+
+		expect(mockPush).toHaveBeenCalledWith({
+			name: VIEWS.NEW_WORKFLOW,
+			query: { projectId: project.id },
 		});
+	});
+
+	describe('dropdown', () => {
+		it('should create a credential', async () => {
+			const project = createTestProject({
+				scopes: ['credential:create'],
+			});
+			projectsStore.currentProject = project;
 
-		expect(within(getByTestId('resource-add')).getByRole('button', { name: label })).toBeVisible();
+			const { getByTestId } = renderComponent();
+
+			await userEvent.click(within(getByTestId('add-resource')).getByRole('button'));
+
+			await waitFor(() => expect(getByTestId('action-credential')).toBeVisible());
+
+			await userEvent.click(getByTestId('action-credential'));
+
+			expect(mockPush).toHaveBeenCalledWith({
+				name: VIEWS.PROJECTS_CREDENTIALS,
+				params: {
+					projectId: project.id,
+					credentialId: 'create',
+				},
+			});
+		});
 	});
 
 	it('should not render creation button in setting page', async () => {
@@ -167,15 +193,7 @@ describe('ProjectHeader', () => {
 		vi.spyOn(router, 'useRoute').mockReturnValueOnce({
 			name: VIEWS.PROJECT_SETTINGS,
 		} as RouteLocationNormalizedLoadedGeneric);
-		const { queryByTestId } = renderComponent({
-			global: {
-				stubs: {
-					N8nNavigationDropdown: {
-						template: '<div><slot></slot></div>',
-					},
-				},
-			},
-		});
-		expect(queryByTestId('resource-add')).not.toBeInTheDocument();
+		const { queryByTestId } = renderComponent();
+		expect(queryByTestId('add-resource-buttons')).not.toBeInTheDocument();
 	});
 });
diff --git a/packages/editor-ui/src/components/Projects/ProjectHeader.vue b/packages/editor-ui/src/components/Projects/ProjectHeader.vue
index 977abe73935bc..8ef45239fcf91 100644
--- a/packages/editor-ui/src/components/Projects/ProjectHeader.vue
+++ b/packages/editor-ui/src/components/Projects/ProjectHeader.vue
@@ -1,21 +1,21 @@
 <script setup lang="ts">
-import { computed, type Ref, ref } from 'vue';
-import { useRoute } from 'vue-router';
-import { N8nNavigationDropdown, N8nButton, N8nIconButton, N8nTooltip } from 'n8n-design-system';
-import { onClickOutside, type VueInstance } from '@vueuse/core';
+import { computed } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { N8nButton } from 'n8n-design-system';
 import { useI18n } from '@/composables/useI18n';
 import { ProjectTypes } from '@/types/projects.types';
 import { useProjectsStore } from '@/stores/projects.store';
 import ProjectTabs from '@/components/Projects/ProjectTabs.vue';
 import { getResourcePermissions } from '@/permissions';
-import { useGlobalEntityCreation } from '@/composables/useGlobalEntityCreation';
 import { VIEWS } from '@/constants';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import ProjectCreateResource from '@/components/Projects/ProjectCreateResource.vue';
 
 const route = useRoute();
+const router = useRouter();
 const i18n = useI18n();
 const projectsStore = useProjectsStore();
-
-const createBtn = ref<InstanceType<typeof N8nNavigationDropdown>>();
+const sourceControlStore = useSourceControlStore();
 
 const headerIcon = computed(() => {
 	if (projectsStore.currentProject?.type === ProjectTypes.Personal) {
@@ -48,22 +48,58 @@ const showSettings = computed(
 		projectsStore.currentProject?.type === ProjectTypes.Team,
 );
 
-const { menu, handleSelect, createProjectAppendSlotName, projectsLimitReachedMessage } =
-	useGlobalEntityCreation(computed(() => !Boolean(projectsStore.currentProject)));
+const homeProject = computed(() => projectsStore.currentProject ?? projectsStore.personalProject);
 
-const createLabel = computed(() => {
-	if (!projectsStore.currentProject) {
-		return i18n.baseText('projects.create');
-	} else if (projectsStore.currentProject.type === ProjectTypes.Personal) {
-		return i18n.baseText('projects.create.personal');
-	} else {
-		return i18n.baseText('projects.create.team');
-	}
-});
+const ACTION_TYPES = {
+	WORKFLOW: 'workflow',
+	CREDENTIAL: 'credential',
+} as const;
+type ActionTypes = (typeof ACTION_TYPES)[keyof typeof ACTION_TYPES];
 
-onClickOutside(createBtn as Ref<VueInstance>, () => {
-	createBtn.value?.close();
-});
+const createWorkflowButton = computed(() => ({
+	value: ACTION_TYPES.WORKFLOW,
+	label: 'Create Workflow',
+	disabled:
+		sourceControlStore.preferences.branchReadOnly ||
+		!getResourcePermissions(homeProject.value?.scopes).workflow.create,
+}));
+const menu = computed(() => [
+	{
+		value: ACTION_TYPES.CREDENTIAL,
+		label: 'Create credential',
+		disabled:
+			sourceControlStore.preferences.branchReadOnly ||
+			!getResourcePermissions(homeProject.value?.scopes).credential.create,
+	},
+]);
+
+const actions: Record<ActionTypes, (projectId: string) => void> = {
+	[ACTION_TYPES.WORKFLOW]: (projectId: string) => {
+		void router.push({
+			name: VIEWS.NEW_WORKFLOW,
+			query: {
+				projectId,
+			},
+		});
+	},
+	[ACTION_TYPES.CREDENTIAL]: (projectId: string) => {
+		void router.push({
+			name: VIEWS.PROJECTS_CREDENTIALS,
+			params: {
+				projectId,
+				credentialId: 'create',
+			},
+		});
+	},
+} as const;
+
+const onSelect = (action: string) => {
+	const executableAction = actions[action as ActionTypes];
+	if (!homeProject.value) {
+		return;
+	}
+	executableAction(homeProject.value.id);
+};
 </script>
 
 <template>
@@ -83,30 +119,17 @@ onClickOutside(createBtn as Ref<VueInstance>, () => {
 				</N8nText>
 			</div>
 			<div v-if="route.name !== VIEWS.PROJECT_SETTINGS" :class="[$style.headerActions]">
-				<N8nNavigationDropdown
-					ref="createBtn"
-					data-test-id="resource-add"
-					:menu="menu"
-					@select="handleSelect"
+				<ProjectCreateResource
+					data-test-id="add-resource-buttons"
+					:actions="menu"
+					@action="onSelect"
 				>
-					<N8nIconButton :label="createLabel" icon="plus" style="width: auto" />
-					<template #[createProjectAppendSlotName]="{ item }">
-						<N8nTooltip
-							v-if="item.disabled"
-							placement="right"
-							:content="projectsLimitReachedMessage"
-						>
-							<N8nButton
-								:size="'mini'"
-								style="margin-left: auto"
-								type="tertiary"
-								@click="handleSelect(item.id)"
-							>
-								{{ i18n.baseText('generic.upgrade') }}
-							</N8nButton>
-						</N8nTooltip>
-					</template>
-				</N8nNavigationDropdown>
+					<N8nButton
+						data-test-id="add-resource-workflow"
+						v-bind="createWorkflowButton"
+						@click="onSelect(ACTION_TYPES.WORKFLOW)"
+					/>
+				</ProjectCreateResource>
 			</div>
 		</div>
 		<div :class="$style.actions">
diff --git a/packages/editor-ui/src/components/Projects/ProjectNavigation.test.ts b/packages/editor-ui/src/components/Projects/ProjectNavigation.test.ts
index c75e9a174ab3e..2e660cb8b55d0 100644
--- a/packages/editor-ui/src/components/Projects/ProjectNavigation.test.ts
+++ b/packages/editor-ui/src/components/Projects/ProjectNavigation.test.ts
@@ -1,10 +1,10 @@
-import { createComponentRenderer } from '@/__tests__/render';
-import { createTestingPinia } from '@pinia/testing';
 import { createRouter, createMemoryHistory } from 'vue-router';
+import { createTestingPinia } from '@pinia/testing';
+import { createComponentRenderer } from '@/__tests__/render';
+import { mockedStore } from '@/__tests__/utils';
 import { createProjectListItem } from '@/__tests__/data/projects';
-import ProjectsNavigation from '@/components/Projects//ProjectNavigation.vue';
+import ProjectsNavigation from '@/components/Projects/ProjectNavigation.vue';
 import { useProjectsStore } from '@/stores/projects.store';
-import { mockedStore } from '@/__tests__/utils';
 
 vi.mock('vue-router', async () => {
 	const actual = await vi.importActual('vue-router');
@@ -81,7 +81,7 @@ describe('ProjectsNavigation', () => {
 	});
 
 	it('should show "Projects" title and Personal project when the feature is enabled', async () => {
-		projectsStore.isTeamProjectFeatureEnabled = true;
+		projectsStore.teamProjectsLimit = -1;
 		projectsStore.myProjects = [...personalProjects, ...teamProjects];
 
 		const { getByRole, getAllByTestId, getByTestId } = renderComponent({
@@ -97,7 +97,7 @@ describe('ProjectsNavigation', () => {
 	});
 
 	it('should not show "Projects" title when the menu is collapsed', async () => {
-		projectsStore.isTeamProjectFeatureEnabled = true;
+		projectsStore.teamProjectsLimit = -1;
 
 		const { queryByRole } = renderComponent({
 			props: {
@@ -109,7 +109,7 @@ describe('ProjectsNavigation', () => {
 	});
 
 	it('should not show "Projects" title when the feature is not enabled', async () => {
-		projectsStore.isTeamProjectFeatureEnabled = false;
+		projectsStore.teamProjectsLimit = 0;
 
 		const { queryByRole } = renderComponent({
 			props: {
@@ -121,7 +121,7 @@ describe('ProjectsNavigation', () => {
 	});
 
 	it('should not show project icons when the menu is collapsed', async () => {
-		projectsStore.isTeamProjectFeatureEnabled = true;
+		projectsStore.teamProjectsLimit = -1;
 
 		const { getByTestId } = renderComponent({
 			props: {
@@ -132,4 +132,43 @@ describe('ProjectsNavigation', () => {
 		expect(getByTestId('project-personal-menu-item')).toBeVisible();
 		expect(getByTestId('project-personal-menu-item').querySelector('svg')).not.toBeInTheDocument();
 	});
+
+	it('should not show add first project button if there are projects already', async () => {
+		projectsStore.teamProjectsLimit = -1;
+		projectsStore.myProjects = [...teamProjects];
+
+		const { queryByTestId } = renderComponent({
+			props: {
+				collapsed: false,
+			},
+		});
+
+		expect(queryByTestId('add-first-project-button')).not.toBeInTheDocument();
+	});
+
+	it('should not show project plus button and add first project button if user cannot create projects', async () => {
+		projectsStore.teamProjectsLimit = 0;
+
+		const { queryByTestId } = renderComponent({
+			props: {
+				collapsed: false,
+			},
+		});
+
+		expect(queryByTestId('project-plus-button')).not.toBeInTheDocument();
+		expect(queryByTestId('add-first-project-button')).not.toBeInTheDocument();
+	});
+
+	it('should show project plus button and add first project button if user can create projects', async () => {
+		projectsStore.teamProjectsLimit = -1;
+
+		const { getByTestId } = renderComponent({
+			props: {
+				collapsed: false,
+			},
+		});
+
+		expect(getByTestId('project-plus-button')).toBeVisible();
+		expect(getByTestId('add-first-project-button')).toBeVisible();
+	});
 });
diff --git a/packages/editor-ui/src/components/Projects/ProjectNavigation.vue b/packages/editor-ui/src/components/Projects/ProjectNavigation.vue
index 79316f34f46c0..c161087996ca6 100644
--- a/packages/editor-ui/src/components/Projects/ProjectNavigation.vue
+++ b/packages/editor-ui/src/components/Projects/ProjectNavigation.vue
@@ -5,7 +5,7 @@ import { useI18n } from '@/composables/useI18n';
 import { VIEWS } from '@/constants';
 import { useProjectsStore } from '@/stores/projects.store';
 import type { ProjectListItem } from '@/types/projects.types';
-import { sortByProperty } from '@/utils/sortUtils';
+import { useGlobalEntityCreation } from '@/composables/useGlobalEntityCreation';
 
 type Props = {
 	collapsed: boolean;
@@ -16,6 +16,10 @@ const props = defineProps<Props>();
 
 const locale = useI18n();
 const projectsStore = useProjectsStore();
+const globalEntityCreation = useGlobalEntityCreation();
+
+const isCreatingProject = computed(() => globalEntityCreation.isCreatingProject.value);
+const displayProjects = computed(() => globalEntityCreation.displayProjects.value);
 
 const home = computed<IMenuItem>(() => ({
 	id: 'home',
@@ -50,11 +54,8 @@ const personalProject = computed<IMenuItem>(() => ({
 	},
 }));
 
-const displayProjects = computed(() =>
-	sortByProperty(
-		'name',
-		projectsStore.myProjects.filter((p) => p.type === 'team'),
-	),
+const showAddFirstProject = computed(
+	() => projectsStore.isTeamProjectFeatureEnabled && !displayProjects.value.length,
 );
 </script>
 
@@ -72,11 +73,20 @@ const displayProjects = computed(() =>
 		<hr v-if="projectsStore.isTeamProjectFeatureEnabled" class="mt-m mb-m" />
 		<N8nText
 			v-if="!props.collapsed && projectsStore.isTeamProjectFeatureEnabled"
-			:class="$style.projectsLabel"
+			:class="[$style.projectsLabel]"
 			tag="h3"
 			bold
 		>
 			<span>{{ locale.baseText('projects.menu.title') }}</span>
+			<N8nButton
+				v-if="projectsStore.canCreateProjects"
+				icon="plus"
+				text
+				data-test-id="project-plus-button"
+				:disabled="isCreatingProject"
+				:class="$style.plusBtn"
+				@click="globalEntityCreation.createProject"
+			/>
 		</N8nText>
 		<ElMenu
 			v-if="projectsStore.isTeamProjectFeatureEnabled"
@@ -103,6 +113,22 @@ const displayProjects = computed(() =>
 				data-test-id="project-menu-item"
 			/>
 		</ElMenu>
+		<N8nButton
+			v-if="showAddFirstProject"
+			:class="[
+				$style.addFirstProjectBtn,
+				{
+					[$style.collapsed]: props.collapsed,
+				},
+			]"
+			:disabled="isCreatingProject"
+			type="tertiary"
+			icon="plus"
+			data-test-id="add-first-project-button"
+			@click="globalEntityCreation.createProject"
+		>
+			{{ locale.baseText('projects.menu.addFirstProject') }}
+		</N8nButton>
 		<hr v-if="projectsStore.isTeamProjectFeatureEnabled" class="mb-m" />
 	</div>
 </template>
@@ -114,6 +140,11 @@ const displayProjects = computed(() =>
 	width: 100%;
 	overflow: hidden;
 	align-items: start;
+	&:hover {
+		.plusBtn {
+			display: block;
+		}
+	}
 }
 
 .projectItems {
@@ -132,12 +163,40 @@ const displayProjects = computed(() =>
 }
 
 .projectsLabel {
-	margin: 0 var(--spacing-xs) var(--spacing-s);
+	display: flex;
+	justify-content: space-between;
+	margin: 0 0 var(--spacing-s) var(--spacing-xs);
 	padding: 0 var(--spacing-s);
 	text-overflow: ellipsis;
 	overflow: hidden;
 	box-sizing: border-box;
 	color: var(--color-text-base);
+
+	&.collapsed {
+		padding: 0;
+		margin-left: 0;
+		justify-content: center;
+	}
+}
+
+.plusBtn {
+	margin: 0;
+	padding: 0;
+	color: var(--color-text-lighter);
+	display: none;
+}
+
+.addFirstProjectBtn {
+	border: 1px solid var(--color-background-dark);
+	font-size: var(--font-size-xs);
+	padding: var(--spacing-3xs);
+	margin: 0 var(--spacing-m) var(--spacing-m);
+
+	&.collapsed {
+		> span:last-child {
+			display: none;
+		}
+	}
 }
 </style>
 
diff --git a/packages/editor-ui/src/components/ResourceMapper.test.ts b/packages/editor-ui/src/components/ResourceMapper.test.ts
index 25db059504bce..fdc06099cf845 100644
--- a/packages/editor-ui/src/components/ResourceMapper.test.ts
+++ b/packages/editor-ui/src/components/ResourceMapper.test.ts
@@ -74,6 +74,27 @@ describe('ResourceMapper.vue', () => {
 		expect(queryByTestId('matching-column-select')).not.toBeInTheDocument();
 	});
 
+	it('renders map mode properly', async () => {
+		const { getByTestId, queryByTestId } = renderComponent(
+			{
+				props: {
+					parameter: {
+						typeOptions: {
+							resourceMapper: {
+								mode: 'map',
+							},
+						},
+					},
+				},
+			},
+			{ merge: true },
+		);
+		await waitAllPromises();
+		expect(getByTestId('resource-mapper-container')).toBeInTheDocument();
+		// This mode doesn't render matching column selector
+		expect(queryByTestId('matching-column-select')).not.toBeInTheDocument();
+	});
+
 	it('renders multi-key match selector properly', async () => {
 		const { container, getByTestId } = renderComponent(
 			{
@@ -201,7 +222,7 @@ describe('ResourceMapper.vue', () => {
 		expect(
 			getByText('Look for incoming data that matches the foos in the service'),
 		).toBeInTheDocument();
-		expect(getByText('Foos to Match On')).toBeInTheDocument();
+		expect(getByText('Foos to match on')).toBeInTheDocument();
 		expect(
 			getByText(
 				'The foos to use when matching rows in the service to the input items of this node. Usually an ID.',
diff --git a/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue b/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue
index 0b444dd13f6e7..546e33cdc3a51 100644
--- a/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue
@@ -21,7 +21,14 @@ import {
 	parseResourceMapperFieldName,
 } from '@/utils/nodeTypesUtils';
 import { useNodeSpecificationValues } from '@/composables/useNodeSpecificationValues';
-import { N8nIconButton, N8nInputLabel, N8nOption, N8nSelect, N8nTooltip } from 'n8n-design-system';
+import {
+	N8nIcon,
+	N8nIconButton,
+	N8nInputLabel,
+	N8nOption,
+	N8nSelect,
+	N8nTooltip,
+} from 'n8n-design-system';
 import { useI18n } from '@/composables/useI18n';
 
 interface Props {
@@ -37,11 +44,13 @@ interface Props {
 	refreshInProgress: boolean;
 	teleported?: boolean;
 	isReadOnly?: boolean;
+	isDataStale?: boolean;
 }
 
 const props = withDefaults(defineProps<Props>(), {
 	teleported: true,
 	isReadOnly: false,
+	isDataStale: false,
 });
 const FORCE_TEXT_INPUT_FOR_TYPES: FieldType[] = ['time', 'object', 'array'];
 
@@ -310,6 +319,27 @@ defineExpose({
 					:value="props.paramValue"
 					@update:model-value="onParameterActionSelected"
 				/>
+				<div v-if="props.isDataStale && !props.refreshInProgress" :class="$style.staleDataWarning">
+					<N8nTooltip>
+						<template #content>
+							<span>{{
+								locale.baseText('resourceMapper.staleDataWarning.tooltip', {
+									interpolate: { fieldWord: pluralFieldWordCapitalized },
+								})
+							}}</span>
+						</template>
+						<N8nIcon icon="exclamation-triangle" size="small" color="warning" />
+					</N8nTooltip>
+					<N8nIconButton
+						icon="refresh"
+						type="tertiary"
+						size="small"
+						:text="true"
+						:title="locale.baseText('generic.refresh')"
+						:disabled="props.refreshInProgress"
+						@click="onParameterActionSelected('refreshFieldList')"
+					/>
+				</div>
 			</template>
 		</N8nInputLabel>
 		<div v-if="orderedFields.length === 0" class="mt-3xs mb-xs">
@@ -360,7 +390,7 @@ defineExpose({
 					:title="
 						locale.baseText('resourceMapper.removeField', {
 							interpolate: {
-								fieldWord: singularFieldWordCapitalized,
+								fieldWord: singularFieldWord,
 							},
 						})
 					"
@@ -391,7 +421,7 @@ defineExpose({
 			<N8nSelect
 				:placeholder="
 					locale.baseText('resourceMapper.addFieldToSend', {
-						interpolate: { fieldWord: singularFieldWordCapitalized },
+						interpolate: { fieldWord: singularFieldWord },
 					})
 				"
 				size="small"
@@ -442,4 +472,11 @@ defineExpose({
 	margin-top: var(--spacing-l);
 	padding: 0 0 0 var(--spacing-s);
 }
+
+.staleDataWarning {
+	display: flex;
+	height: var(--spacing-m);
+	align-items: baseline;
+	gap: var(--spacing-5xs);
+}
 </style>
diff --git a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
index b09354ed00a16..7487f1d8d4e47 100644
--- a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
@@ -7,7 +7,9 @@ import type {
 	INodeParameters,
 	INodeProperties,
 	INodeTypeDescription,
+	NodeParameterValueType,
 	ResourceMapperField,
+	ResourceMapperFields,
 	ResourceMapperValue,
 } from 'n8n-workflow';
 import { NodeHelpers } from 'n8n-workflow';
@@ -15,11 +17,17 @@ import { computed, onMounted, reactive, watch } from 'vue';
 import MappingModeSelect from './MappingModeSelect.vue';
 import MatchingColumnsSelect from './MatchingColumnsSelect.vue';
 import MappingFields from './MappingFields.vue';
-import { fieldCannotBeDeleted, parseResourceMapperFieldName } from '@/utils/nodeTypesUtils';
+import {
+	fieldCannotBeDeleted,
+	isResourceMapperFieldListStale,
+	parseResourceMapperFieldName,
+} from '@/utils/nodeTypesUtils';
 import { isFullExecutionResponse, isResourceMapperValue } from '@/utils/typeGuards';
 import { i18n as locale } from '@/plugins/i18n';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useDocumentVisibility } from '@/composables/useDocumentVisibility';
+import { N8nButton, N8nCallout } from 'n8n-design-system';
 
 type Props = {
 	parameter: INodeProperties;
@@ -42,6 +50,8 @@ const props = withDefaults(defineProps<Props>(), {
 	isReadOnly: false,
 });
 
+const { onDocumentVisible } = useDocumentVisibility();
+
 const emit = defineEmits<{
 	valueChanged: [value: IUpdateInformation];
 }>();
@@ -52,11 +62,18 @@ const state = reactive({
 		value: {},
 		matchingColumns: [] as string[],
 		schema: [] as ResourceMapperField[],
+		ignoreTypeMismatchErrors: false,
+		attemptToConvertTypes: false,
+		// This should always be true if `showTypeConversionOptions` is provided
+		// It's used to avoid accepting any value as string without casting it
+		// Which is the legacy behavior without these type options.
+		convertFieldsToString: false,
 	} as ResourceMapperValue,
 	parameterValues: {} as INodeParameters,
 	loading: false,
 	refreshInProgress: false, // Shows inline loader when refreshing fields
 	loadingError: false,
+	hasStaleFields: false,
 });
 
 // Reload fields to map when dependent parameters change
@@ -76,6 +93,21 @@ watch(
 	},
 );
 
+onDocumentVisible(async () => {
+	await checkStaleFields();
+});
+
+async function checkStaleFields(): Promise<void> {
+	const fetchedFields = await fetchFields();
+	if (fetchedFields) {
+		const isSchemaStale = isResourceMapperFieldListStale(
+			state.paramValue.schema,
+			fetchedFields.fields,
+		);
+		state.hasStaleFields = isSchemaStale;
+	}
+}
+
 // Reload fields to map when node is executed
 watch(
 	() => workflowsStore.getWorkflowExecution,
@@ -97,6 +129,10 @@ onMounted(async () => {
 			...state.parameterValues,
 			parameters: props.node.parameters,
 		};
+
+		if (showTypeConversionOptions.value) {
+			state.paramValue.convertFieldsToString = true;
+		}
 	}
 	const params = state.parameterValues.parameters as INodeParameters;
 	const parameterName = props.parameter.name;
@@ -138,6 +174,8 @@ onMounted(async () => {
 	if (!hasSchema) {
 		// Only fetch a schema if it's not already set
 		await initFetching();
+	} else {
+		await checkStaleFields();
 	}
 	// Set default values if this is the first time the parameter is being set
 	if (!state.paramValue.value) {
@@ -161,11 +199,19 @@ const showMappingModeSelect = computed<boolean>(() => {
 	return props.parameter.typeOptions?.resourceMapper?.supportAutoMap !== false;
 });
 
+const showTypeConversionOptions = computed<boolean>(() => {
+	return props.parameter.typeOptions?.resourceMapper?.showTypeConversionOptions === true;
+});
+
+const hasFields = computed<boolean>(() => {
+	return state.paramValue.schema.length > 0;
+});
+
 const showMatchingColumnsSelector = computed<boolean>(() => {
 	return (
 		!state.loading &&
-		props.parameter.typeOptions?.resourceMapper?.mode !== 'add' &&
-		state.paramValue.schema.length > 0
+		['upsert', 'update'].includes(props.parameter.typeOptions?.resourceMapper?.mode ?? '') &&
+		hasFields.value
 	);
 });
 
@@ -174,7 +220,7 @@ const showMappingFields = computed<boolean>(() => {
 		state.paramValue.mappingMode === 'defineBelow' &&
 		!state.loading &&
 		!state.loadingError &&
-		state.paramValue.schema.length > 0 &&
+		hasFields.value &&
 		hasAvailableMatchingColumns.value
 	);
 });
@@ -190,6 +236,10 @@ const matchingColumns = computed<string[]>(() => {
 });
 
 const hasAvailableMatchingColumns = computed<boolean>(() => {
+	// 'map' mode doesn't require matching columns
+	if (resourceMapperMode.value === 'map') {
+		return true;
+	}
 	if (resourceMapperMode.value !== 'add' && resourceMapperMode.value !== 'upsert') {
 		return (
 			state.paramValue.schema.filter(
@@ -227,10 +277,11 @@ async function initFetching(inlineLoading = false): Promise<void> {
 		state.loading = true;
 	}
 	try {
-		await loadFieldsToMap();
+		await loadAndSetFieldsToMap();
 		if (!state.paramValue.matchingColumns || state.paramValue.matchingColumns.length === 0) {
 			onMatchingColumnsChanged(defaultSelectedMatchingColumns.value);
 		}
+		state.hasStaleFields = false;
 	} catch (error) {
 		state.loadingError = true;
 	} finally {
@@ -239,19 +290,13 @@ async function initFetching(inlineLoading = false): Promise<void> {
 	}
 }
 
-async function loadFieldsToMap(): Promise<void> {
+const createRequestParams = (methodName: string) => {
 	if (!props.node) {
 		return;
 	}
-
-	const methodName = props.parameter.typeOptions?.resourceMapper?.resourceMapperMethod;
-	if (typeof methodName !== 'string') {
-		return;
-	}
-
 	const requestParams: DynamicNodeParameters.ResourceMapperFieldsRequest = {
 		nodeTypeAndVersion: {
-			name: props.node?.type,
+			name: props.node.type,
 			version: props.node.typeVersion,
 		},
 		currentNodeParameters: resolveRequiredParameters(
@@ -262,7 +307,38 @@ async function loadFieldsToMap(): Promise<void> {
 		methodName,
 		credentials: props.node.credentials,
 	};
-	const fetchedFields = await nodeTypesStore.getResourceMapperFields(requestParams);
+
+	return requestParams;
+};
+
+async function fetchFields(): Promise<ResourceMapperFields | null> {
+	const { resourceMapperMethod, localResourceMapperMethod } =
+		props.parameter.typeOptions?.resourceMapper ?? {};
+
+	let fetchedFields = null;
+
+	if (typeof resourceMapperMethod === 'string') {
+		const requestParams = createRequestParams(
+			resourceMapperMethod,
+		) as DynamicNodeParameters.ResourceMapperFieldsRequest;
+		fetchedFields = await nodeTypesStore.getResourceMapperFields(requestParams);
+	} else if (typeof localResourceMapperMethod === 'string') {
+		const requestParams = createRequestParams(
+			localResourceMapperMethod,
+		) as DynamicNodeParameters.ResourceMapperFieldsRequest;
+
+		fetchedFields = await nodeTypesStore.getLocalResourceMapperFields(requestParams);
+	}
+	return fetchedFields;
+}
+
+async function loadAndSetFieldsToMap(): Promise<void> {
+	if (!props.node) {
+		return;
+	}
+
+	const fetchedFields = await fetchFields();
+
 	if (fetchedFields !== null) {
 		const newSchema = fetchedFields.fields.map((field) => {
 			const existingField = state.paramValue.schema.find((f) => f.id === field.id);
@@ -531,11 +607,26 @@ defineExpose({
 			:teleported="teleported"
 			:refresh-in-progress="state.refreshInProgress"
 			:is-read-only="isReadOnly"
+			:is-data-stale="state.hasStaleFields"
 			@field-value-changed="fieldValueChanged"
 			@remove-field="removeField"
 			@add-field="addField"
 			@refresh-field-list="initFetching(true)"
 		/>
+		<N8nCallout v-else-if="state.hasStaleFields" theme="info" :iconless="true">
+			{{ locale.baseText('resourceMapper.staleDataWarning.notice') }}
+			<template #trailingContent>
+				<N8nButton
+					size="mini"
+					icon="refresh"
+					type="secondary"
+					:loading="state.refreshInProgress"
+					@click="initFetching(true)"
+				>
+					{{ locale.baseText('generic.refresh') }}
+				</N8nButton>
+			</template>
+		</N8nCallout>
 		<N8nNotice
 			v-if="state.paramValue.mappingMode === 'autoMapInputData' && hasAvailableMatchingColumns"
 		>
@@ -548,5 +639,49 @@ defineExpose({
 				})
 			}}
 		</N8nNotice>
+		<div v-if="showTypeConversionOptions && hasFields" :class="$style.typeConversionOptions">
+			<ParameterInputFull
+				:parameter="{
+					name: 'attemptToConvertTypes',
+					type: 'boolean',
+					displayName: locale.baseText('resourceMapper.attemptToConvertTypes.displayName'),
+					default: false,
+					description: locale.baseText('resourceMapper.attemptToConvertTypes.description'),
+				}"
+				:path="props.path + '.attemptToConvertTypes'"
+				:value="state.paramValue.attemptToConvertTypes"
+				@update="
+					(x: IUpdateInformation<NodeParameterValueType>) => {
+						state.paramValue.attemptToConvertTypes = x.value as boolean;
+						emitValueChanged();
+					}
+				"
+			/>
+			<ParameterInputFull
+				:parameter="{
+					name: 'ignoreTypeMismatchErrors',
+					type: 'boolean',
+					displayName: locale.baseText('resourceMapper.ignoreTypeMismatchErrors.displayName'),
+					default: false,
+					description: locale.baseText('resourceMapper.ignoreTypeMismatchErrors.description'),
+				}"
+				:path="props.path + '.ignoreTypeMismatchErrors'"
+				:value="state.paramValue.ignoreTypeMismatchErrors"
+				@update="
+					(x: IUpdateInformation<NodeParameterValueType>) => {
+						state.paramValue.ignoreTypeMismatchErrors = x.value as boolean;
+						emitValueChanged();
+					}
+				"
+			/>
+		</div>
 	</div>
 </template>
+
+<style module lang="scss">
+.typeConversionOptions {
+	display: grid;
+	padding: var(--spacing-m);
+	gap: var(--spacing-2xs);
+}
+</style>
diff --git a/packages/editor-ui/src/components/RunData.vue b/packages/editor-ui/src/components/RunData.vue
index 803bc86a0e6ad..5c5fa0dbac332 100644
--- a/packages/editor-ui/src/components/RunData.vue
+++ b/packages/editor-ui/src/components/RunData.vue
@@ -46,7 +46,6 @@ import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useI18n } from '@/composables/useI18n';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
 import { useNodeType } from '@/composables/useNodeType';
-import { useSettingsStore } from '@/stores/settings.store';
 import type { PinDataSource, UnpinDataSource } from '@/composables/usePinnedData';
 import { usePinnedData } from '@/composables/usePinnedData';
 import { useTelemetry } from '@/composables/useTelemetry';
@@ -88,10 +87,8 @@ const LazyRunDataJson = defineAsyncComponent(
 	async () => await import('@/components/RunDataJson.vue'),
 );
 
-const LazyRunDataSchema = defineAsyncComponent(async () =>
-	useSettingsStore().settings.virtualSchemaView
-		? await import('@/components/VirtualSchema.vue')
-		: await import('@/components/RunDataSchema.vue'),
+const LazyRunDataSchema = defineAsyncComponent(
+	async () => await import('@/components/VirtualSchema.vue'),
 );
 const LazyRunDataHtml = defineAsyncComponent(
 	async () => await import('@/components/RunDataHtml.vue'),
@@ -547,6 +544,10 @@ watch(node, (newNode, prevNode) => {
 
 watch(hasNodeRun, () => {
 	if (props.paneType === 'output') setDisplayMode();
+	else {
+		// InputPanel relies on the outputIndex to check if we have data
+		outputIndex.value = determineInitialOutputIndex();
+	}
 });
 
 watch(
@@ -1080,9 +1081,19 @@ function getDataCount(
 	return getFilteredData(pinOrLiveData).length;
 }
 
+function determineInitialOutputIndex() {
+	for (let i = 0; i <= maxOutputIndex.value; i++) {
+		if (getRawInputData(props.runIndex, i).length) {
+			return i;
+		}
+	}
+
+	return 0;
+}
+
 function init() {
 	// Reset the selected output index every time another node gets selected
-	outputIndex.value = 0;
+	outputIndex.value = determineInitialOutputIndex();
 	refreshDataSize();
 	closeBinaryDataDisplay();
 	let outputTypes: NodeConnectionType[] = [];
diff --git a/packages/editor-ui/src/components/RunDataSchema.test.ts b/packages/editor-ui/src/components/RunDataSchema.test.ts
deleted file mode 100644
index 3cbe68836ff22..0000000000000
--- a/packages/editor-ui/src/components/RunDataSchema.test.ts
+++ /dev/null
@@ -1,304 +0,0 @@
-import { createComponentRenderer } from '@/__tests__/render';
-import RunDataJsonSchema from '@/components/RunDataSchema.vue';
-import { useWorkflowsStore } from '@/stores/workflows.store';
-import { userEvent } from '@testing-library/user-event';
-import { cleanup, within, waitFor } from '@testing-library/vue';
-import { createPinia, setActivePinia } from 'pinia';
-import {
-	createTestNode,
-	defaultNodeDescriptions,
-	mockNodeTypeDescription,
-} from '@/__tests__/mocks';
-import { IF_NODE_TYPE, SET_NODE_TYPE } from '@/constants';
-import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import { mock } from 'vitest-mock-extended';
-import type { IWorkflowDb } from '@/Interface';
-import { NodeConnectionType, type IDataObject } from 'n8n-workflow';
-import * as nodeHelpers from '@/composables/useNodeHelpers';
-
-const mockNode1 = createTestNode({
-	name: 'Set1',
-	type: SET_NODE_TYPE,
-	typeVersion: 1,
-	disabled: false,
-});
-
-const mockNode2 = createTestNode({
-	name: 'Set2',
-	type: SET_NODE_TYPE,
-	typeVersion: 1,
-	disabled: false,
-});
-
-const disabledNode = createTestNode({
-	name: 'Disabled Node',
-	type: SET_NODE_TYPE,
-	typeVersion: 1,
-	disabled: true,
-});
-
-const ifNode = createTestNode({
-	name: 'If',
-	type: IF_NODE_TYPE,
-	typeVersion: 1,
-	disabled: false,
-});
-
-const aiTool = createTestNode({
-	name: 'AI Tool',
-	type: '@n8n/n8n-nodes-langchain.memoryBufferWindow',
-	typeVersion: 1,
-	disabled: false,
-});
-
-async function setupStore() {
-	const workflow = mock<IWorkflowDb>({
-		id: '123',
-		name: 'Test Workflow',
-		connections: {},
-		active: true,
-		nodes: [mockNode1, mockNode2, disabledNode, ifNode, aiTool],
-	});
-
-	const pinia = createPinia();
-	setActivePinia(pinia);
-
-	const workflowsStore = useWorkflowsStore();
-	const nodeTypesStore = useNodeTypesStore();
-
-	nodeTypesStore.setNodeTypes([
-		...defaultNodeDescriptions,
-		mockNodeTypeDescription({
-			name: IF_NODE_TYPE,
-			outputs: [NodeConnectionType.Main, NodeConnectionType.Main],
-		}),
-	]);
-	workflowsStore.workflow = workflow;
-
-	return pinia;
-}
-
-function mockNodeOutputData(nodeName: string, data: IDataObject[], outputIndex = 0) {
-	const originalNodeHelpers = nodeHelpers.useNodeHelpers();
-	vi.spyOn(nodeHelpers, 'useNodeHelpers').mockImplementation(() => {
-		return {
-			...originalNodeHelpers,
-			getNodeInputData: vi.fn((node, _, output) => {
-				if (node.name === nodeName && output === outputIndex) {
-					return data.map((json) => ({ json }));
-				}
-				return [];
-			}),
-		};
-	});
-}
-
-describe('RunDataSchema.vue', () => {
-	let renderComponent: ReturnType<typeof createComponentRenderer>;
-
-	beforeEach(async () => {
-		cleanup();
-		renderComponent = createComponentRenderer(RunDataJsonSchema, {
-			global: {
-				stubs: ['font-awesome-icon'],
-			},
-			pinia: await setupStore(),
-			props: {
-				mappingEnabled: true,
-				runIndex: 1,
-				outputIndex: 0,
-				totalRuns: 2,
-				paneType: 'input',
-				connectionType: 'main',
-				search: '',
-				nodes: [
-					{ name: 'Set1', indicies: [], depth: 1 },
-					{ name: 'Set2', indicies: [], depth: 2 },
-				],
-			},
-		});
-	});
-
-	it('renders schema for empty data', async () => {
-		const { getAllByTestId } = renderComponent();
-		expect(getAllByTestId('run-data-schema-empty').length).toBe(1);
-
-		// Expand second node
-		await userEvent.click(getAllByTestId('run-data-schema-node-name')[1]);
-		expect(getAllByTestId('run-data-schema-empty').length).toBe(2);
-	});
-
-	it('renders schema for data', async () => {
-		useWorkflowsStore().pinData({
-			node: mockNode1,
-			data: [
-				{ json: { name: 'John', age: 22, hobbies: ['surfing', 'traveling'] } },
-				{ json: { name: 'Joe', age: 33, hobbies: ['skateboarding', 'gaming'] } },
-			],
-		});
-		useWorkflowsStore().pinData({
-			node: mockNode2,
-			data: [
-				{ json: { name: 'John', age: 22, hobbies: ['surfing', 'traveling'] } },
-				{ json: { name: 'Joe', age: 33, hobbies: ['skateboarding', 'gaming'] } },
-			],
-		});
-
-		const { getAllByTestId } = renderComponent();
-		const nodes = getAllByTestId('run-data-schema-node');
-		expect(nodes.length).toBe(2);
-		const firstNodeName = await within(nodes[0]).findByTestId('run-data-schema-node-name');
-		const firstNodeItemCount = await within(nodes[0]).findByTestId(
-			'run-data-schema-node-item-count',
-		);
-		expect(firstNodeName).toHaveTextContent('Set1');
-		expect(firstNodeItemCount).toHaveTextContent('2 items');
-		expect(within(nodes[0]).getByTestId('run-data-schema-node-schema')).toMatchSnapshot();
-
-		const secondNodeName = await within(nodes[1]).findByTestId('run-data-schema-node-name');
-		expect(secondNodeName).toHaveTextContent('Set2');
-
-		// Expand second node
-		await userEvent.click(secondNodeName);
-		expect(within(nodes[1]).getByTestId('run-data-schema-node-schema')).toMatchSnapshot();
-	});
-
-	it('renders schema in output pane', async () => {
-		const { container } = renderComponent({
-			props: {
-				nodes: [],
-				paneType: 'output',
-				node: mockNode1,
-				data: [
-					{ name: 'John', age: 22, hobbies: ['surfing', 'traveling'] },
-					{ name: 'Joe', age: 33, hobbies: ['skateboarding', 'gaming'] },
-				],
-			},
-		});
-
-		expect(container).toMatchSnapshot();
-	});
-
-	it('renders schema with spaces and dots', () => {
-		useWorkflowsStore().pinData({
-			node: mockNode1,
-			data: [
-				{
-					json: {
-						'hello world': [
-							{
-								test: {
-									'more to think about': 1,
-								},
-								'test.how': 'ignore',
-							},
-						],
-					},
-				},
-			],
-		});
-
-		const { container } = renderComponent();
-		expect(container).toMatchSnapshot();
-	});
-
-	it('renders no data to show for data empty objects', () => {
-		useWorkflowsStore().pinData({
-			node: mockNode1,
-			data: [{ json: {} }, { json: {} }],
-		});
-
-		const { getAllByTestId } = renderComponent();
-		expect(getAllByTestId('run-data-schema-empty').length).toBe(1);
-	});
-
-	it('renders disabled nodes correctly', () => {
-		const { getByTestId } = renderComponent({
-			props: {
-				nodes: [{ name: disabledNode.name, indicies: [], depth: 1 }],
-			},
-		});
-		expect(getByTestId('run-data-schema-disabled')).toBeInTheDocument();
-		expect(getByTestId('run-data-schema-node-name')).toHaveTextContent(
-			`${disabledNode.name} (Deactivated)`,
-		);
-	});
-
-	it('renders schema for correct output branch', async () => {
-		mockNodeOutputData(
-			'If',
-			[
-				{ id: 1, name: 'John' },
-				{ id: 2, name: 'Jane' },
-			],
-			1,
-		);
-		const { getByTestId } = renderComponent({
-			props: {
-				nodes: [{ name: 'If', indicies: [1], depth: 2 }],
-			},
-		});
-
-		await waitFor(() => {
-			expect(getByTestId('run-data-schema-node-name')).toHaveTextContent('If');
-			expect(getByTestId('run-data-schema-node-item-count')).toHaveTextContent('2 items');
-			expect(getByTestId('run-data-schema-node-schema')).toMatchSnapshot();
-		});
-	});
-
-	it('renders previous nodes schema for AI tools', async () => {
-		mockNodeOutputData(
-			'If',
-			[
-				{ id: 1, name: 'John' },
-				{ id: 2, name: 'Jane' },
-			],
-			0,
-		);
-		const { getByTestId } = renderComponent({
-			props: {
-				nodes: [
-					{
-						name: 'If',
-						indicies: [], // indicies are not set for AI tools
-						depth: 2,
-					},
-				],
-				node: aiTool,
-			},
-		});
-
-		await waitFor(() => {
-			expect(getByTestId('run-data-schema-node-name')).toHaveTextContent('If');
-			expect(getByTestId('run-data-schema-node-item-count')).toHaveTextContent('2 items');
-			expect(getByTestId('run-data-schema-node-schema')).toMatchSnapshot();
-		});
-	});
-
-	it('renders its own data for AI tools in debug mode', async () => {
-		const { getByTestId } = renderComponent({
-			props: {
-				nodes: [], // in debug mode nodes are empty
-				node: aiTool,
-				data: [{ output: 'AI tool output' }],
-			},
-		});
-
-		await waitFor(() => {
-			expect(getByTestId('run-data-schema-node-schema')).toMatchSnapshot();
-		});
-	});
-
-	test.each([[[{ tx: false }, { tx: false }]], [[{ tx: '' }, { tx: '' }]], [[{ tx: [] }]]])(
-		'renders schema instead of showing no data for %o',
-		(data) => {
-			useWorkflowsStore().pinData({
-				node: mockNode1,
-				data: data.map((item) => ({ json: item })),
-			});
-
-			const { queryByTestId } = renderComponent();
-			expect(queryByTestId('run-data-schema-empty')).not.toBeInTheDocument();
-		},
-	);
-});
diff --git a/packages/editor-ui/src/components/RunDataSchema.vue b/packages/editor-ui/src/components/RunDataSchema.vue
deleted file mode 100644
index aa1e821de1067..0000000000000
--- a/packages/editor-ui/src/components/RunDataSchema.vue
+++ /dev/null
@@ -1,643 +0,0 @@
-<script lang="ts" setup>
-import { computed, ref, watch } from 'vue';
-import { snakeCase } from 'lodash-es';
-import type { INodeUi, Schema } from '@/Interface';
-import RunDataSchemaItem from '@/components/RunDataSchemaItem.vue';
-import NodeIcon from '@/components/NodeIcon.vue';
-import Draggable from '@/components/Draggable.vue';
-import { useNDVStore } from '@/stores/ndv.store';
-import { telemetry } from '@/plugins/telemetry';
-import {
-	NodeConnectionType,
-	type IConnectedNode,
-	type IDataObject,
-	type INodeTypeDescription,
-} from 'n8n-workflow';
-import { useExternalHooks } from '@/composables/useExternalHooks';
-import { i18n } from '@/plugins/i18n';
-import MappingPill from './MappingPill.vue';
-import { useDataSchema } from '@/composables/useDataSchema';
-import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import { useWorkflowsStore } from '@/stores/workflows.store';
-import { executionDataToJson } from '@/utils/nodeTypesUtils';
-import { useNodeHelpers } from '@/composables/useNodeHelpers';
-import { useDebounce } from '@/composables/useDebounce';
-
-type Props = {
-	nodes?: IConnectedNode[];
-	node?: INodeUi | null;
-	data?: IDataObject[];
-	mappingEnabled?: boolean;
-	runIndex?: number;
-	outputIndex?: number;
-	totalRuns?: number;
-	paneType: 'input' | 'output';
-	connectionType?: NodeConnectionType;
-	search?: string;
-	context?: 'ndv' | 'modal';
-};
-
-type SchemaNode = {
-	node: INodeUi;
-	nodeType: INodeTypeDescription;
-	depth: number;
-	loading: boolean;
-	open: boolean;
-	connectedOutputIndexes: number[];
-	itemsCount: number | null;
-	schema: Schema | null;
-};
-
-const props = withDefaults(defineProps<Props>(), {
-	nodes: () => [],
-	distanceFromActive: 1,
-	node: null,
-	data: undefined,
-	runIndex: 0,
-	outputIndex: 0,
-	totalRuns: 1,
-	connectionType: NodeConnectionType.Main,
-	search: '',
-	mappingEnabled: false,
-	context: 'ndv',
-});
-
-const draggingPath = ref<string>('');
-const nodesOpen = ref<Partial<Record<string, boolean>>>({});
-const nodesData = ref<Partial<Record<string, { schema: Schema; itemsCount: number }>>>({});
-const nodesLoading = ref<Partial<Record<string, boolean>>>({});
-const disableScrollInView = ref(false);
-
-const ndvStore = useNDVStore();
-const nodeTypesStore = useNodeTypesStore();
-const workflowsStore = useWorkflowsStore();
-const { getSchemaForExecutionData, filterSchema } = useDataSchema();
-const { getNodeInputData } = useNodeHelpers();
-const { debounce } = useDebounce();
-
-const emit = defineEmits<{
-	'clear:search': [];
-}>();
-
-const nodeSchema = computed(() =>
-	filterSchema(getSchemaForExecutionData(props.data ?? []), props.search),
-);
-const nodes = computed(() => {
-	return props.nodes
-		.map((node) => {
-			const fullNode = workflowsStore.getNodeByName(node.name);
-
-			if (!fullNode) return null;
-
-			const nodeType = nodeTypesStore.getNodeType(fullNode.type, fullNode.typeVersion);
-			const { itemsCount, schema } = nodesData.value[node.name] ?? {
-				itemsCount: null,
-				schema: null,
-			};
-
-			return {
-				node: fullNode,
-				connectedOutputIndexes: node.indicies.length > 0 ? node.indicies : [0],
-				depth: node.depth,
-				itemsCount,
-				nodeType,
-				schema: schema ? filterSchema(schema, props.search) : null,
-				loading: nodesLoading.value[node.name],
-				open: nodesOpen.value[node.name],
-			};
-		})
-		.filter((node): node is SchemaNode => !!(node?.node && node.nodeType));
-});
-
-const filteredNodes = computed(() =>
-	nodes.value.filter((node) => !props.search || !isDataEmpty(node.schema)),
-);
-
-const nodeAdditionalInfo = (node: INodeUi) => {
-	const returnData: string[] = [];
-	if (node.disabled) {
-		returnData.push(i18n.baseText('node.disabled'));
-	}
-
-	const connections = ndvStore.ndvNodeInputNumber[node.name];
-	if (connections) {
-		if (connections.length === 1) {
-			returnData.push(`Input ${connections}`);
-		} else {
-			returnData.push(`Inputs ${connections.join(', ')}`);
-		}
-	}
-
-	return returnData.length ? `(${returnData.join(' | ')})` : '';
-};
-
-const isDataEmpty = (schema: Schema | null) => {
-	if (!schema) return true;
-	// Utilize the generated schema instead of looping over the entire data again
-	// The schema for empty data is { type: 'object' | 'array', value: [] }
-	const isObjectOrArray = schema.type === 'object' || schema.type === 'array';
-	const isEmpty = Array.isArray(schema.value) && schema.value.length === 0;
-
-	return isObjectOrArray && isEmpty;
-};
-
-const highlight = computed(() => ndvStore.highlightDraggables);
-const allNodesOpen = computed(() => nodes.value.every((node) => node.open));
-const noNodesOpen = computed(() => nodes.value.every((node) => !node.open));
-
-const loadNodeData = async ({ node, connectedOutputIndexes }: SchemaNode) => {
-	const pinData = workflowsStore.pinDataByNodeName(node.name);
-	const data =
-		pinData ??
-		connectedOutputIndexes
-			.map((outputIndex) =>
-				executionDataToJson(
-					getNodeInputData(node, props.runIndex, outputIndex, props.paneType, props.connectionType),
-				),
-			)
-			.flat();
-
-	nodesData.value[node.name] = {
-		schema: getSchemaForExecutionData(data),
-		itemsCount: data.length,
-	};
-};
-
-const toggleOpenNode = async (schemaNode: SchemaNode, exclusive = false) => {
-	const { node, schema, open } = schemaNode;
-	disableScrollInView.value = false;
-	if (open) {
-		nodesOpen.value[node.name] = false;
-		return;
-	}
-
-	if (!schema) {
-		nodesLoading.value[node.name] = true;
-		await loadNodeData(schemaNode);
-		nodesLoading.value[node.name] = false;
-	}
-
-	if (exclusive) {
-		nodesOpen.value = { [node.name]: true };
-	} else {
-		nodesOpen.value[node.name] = true;
-	}
-};
-
-const openAllNodes = async () => {
-	const nodesToLoad = nodes.value.filter((node) => !node.schema);
-	await Promise.all(nodesToLoad.map(loadNodeData));
-	nodesOpen.value = Object.fromEntries(nodes.value.map(({ node }) => [node.name, true]));
-};
-
-const onDragStart = (el: HTMLElement) => {
-	if (el?.dataset?.path) {
-		draggingPath.value = el.dataset.path;
-	}
-
-	ndvStore.resetMappingTelemetry();
-};
-
-const onDragEnd = (el: HTMLElement, node: INodeUi, depth: number) => {
-	draggingPath.value = '';
-
-	setTimeout(() => {
-		const mappingTelemetry = ndvStore.mappingTelemetry;
-		const telemetryPayload = {
-			src_node_type: node.type,
-			src_field_name: el.dataset.name ?? '',
-			src_nodes_back: depth,
-			src_run_index: props.runIndex,
-			src_runs_total: props.totalRuns,
-			src_field_nest_level: el.dataset.depth ?? 0,
-			src_view: 'schema',
-			src_element: el,
-			success: false,
-			...mappingTelemetry,
-		};
-
-		void useExternalHooks().run('runDataJson.onDragEnd', telemetryPayload);
-
-		telemetry.track('User dragged data for mapping', telemetryPayload, { withPostHog: true });
-	}, 1000); // ensure dest data gets set if drop
-};
-
-const onTransitionStart = debounce(
-	(event: TransitionEvent, nodeName: string) => {
-		if (
-			nodesOpen.value[nodeName] &&
-			event.target instanceof HTMLElement &&
-			!disableScrollInView.value
-		) {
-			event.target.scrollIntoView({
-				behavior: 'smooth',
-				block: 'nearest',
-				inline: 'nearest',
-			});
-		}
-	},
-	{ debounceTime: 100, trailing: true },
-);
-
-watch(
-	() => props.nodes,
-	() => {
-		if (noNodesOpen.value && nodes.value.length > 0) {
-			void toggleOpenNode(nodes.value[0]);
-		}
-	},
-	{ immediate: true },
-);
-
-watch(
-	() => props.search,
-	(search, prevSearch) => {
-		if (!prevSearch?.trim() && search.trim() && !allNodesOpen.value) {
-			disableScrollInView.value = true;
-			void openAllNodes();
-		}
-
-		if (prevSearch?.trim() && !search.trim() && allNodesOpen.value && nodes.value.length > 0) {
-			nodesOpen.value = { [nodes.value[0].node.name]: true };
-		}
-	},
-	{ immediate: true },
-);
-</script>
-
-<template>
-	<div
-		v-if="paneType === 'input' && nodes.length > 0"
-		:class="[$style.schemaWrapper, { highlightSchema: highlight }]"
-	>
-		<div v-if="search && nodes.length > 0 && filteredNodes.length === 0" :class="$style.noMatch">
-			<n8n-text tag="h3" size="large">{{ i18n.baseText('ndv.search.noNodeMatch.title') }}</n8n-text>
-			<n8n-text>
-				<i18n-t keypath="ndv.search.noMatch.description" tag="span">
-					<template #link>
-						<a href="#" @click="emit('clear:search')">
-							{{ i18n.baseText('ndv.search.noMatch.description.link') }}
-						</a>
-					</template>
-				</i18n-t>
-			</n8n-text>
-		</div>
-
-		<div
-			v-for="currentNode in filteredNodes"
-			:key="currentNode.node.id"
-			data-test-id="run-data-schema-node"
-			:class="[$style.node, { [$style.open]: currentNode.open }]"
-		>
-			<div
-				:class="[
-					$style.header,
-					{
-						[$style.trigger]: currentNode.nodeType.group.includes('trigger'),
-					},
-				]"
-				data-test-id="run-data-schema-node-header"
-			>
-				<div :class="$style.expand" @click="toggleOpenNode(currentNode)">
-					<font-awesome-icon icon="angle-right" :class="$style.expandIcon" />
-				</div>
-
-				<div
-					:class="$style.titleContainer"
-					data-test-id="run-data-schema-node-name"
-					@click="toggleOpenNode(currentNode, true)"
-				>
-					<div :class="$style.nodeIcon">
-						<NodeIcon :node-type="currentNode.nodeType" :size="12" />
-					</div>
-
-					<div :class="$style.title">
-						{{ currentNode.node.name }}
-						<span v-if="nodeAdditionalInfo(currentNode.node)" :class="$style.subtitle">{{
-							nodeAdditionalInfo(currentNode.node)
-						}}</span>
-					</div>
-					<font-awesome-icon
-						v-if="currentNode.nodeType.group.includes('trigger')"
-						:class="$style.triggerIcon"
-						icon="bolt"
-						size="xs"
-					/>
-				</div>
-
-				<Transition name="items">
-					<div
-						v-if="currentNode.itemsCount && currentNode.open"
-						:class="$style.items"
-						data-test-id="run-data-schema-node-item-count"
-					>
-						{{
-							i18n.baseText('ndv.output.items', {
-								interpolate: { count: currentNode.itemsCount },
-							})
-						}}
-					</div>
-				</Transition>
-			</div>
-
-			<Draggable
-				type="mapping"
-				target-data-key="mappable"
-				:disabled="!mappingEnabled"
-				@dragstart="onDragStart"
-				@dragend="(el: HTMLElement) => onDragEnd(el, currentNode.node, currentNode.depth)"
-			>
-				<template #preview="{ canDrop, el }">
-					<MappingPill v-if="el" :html="el.outerHTML" :can-drop="canDrop" />
-				</template>
-
-				<Transition name="schema">
-					<div
-						v-if="currentNode.schema || search"
-						:class="[$style.schema, $style.animated]"
-						data-test-id="run-data-schema-node-schema"
-						@transitionstart="(event) => onTransitionStart(event, currentNode.node.name)"
-					>
-						<div :class="$style.innerSchema" @transitionstart.stop>
-							<div
-								v-if="currentNode.node.disabled"
-								:class="$style.notice"
-								data-test-id="run-data-schema-disabled"
-							>
-								{{ i18n.baseText('dataMapping.schemaView.disabled') }}
-							</div>
-
-							<div
-								v-else-if="isDataEmpty(currentNode.schema)"
-								:class="$style.notice"
-								data-test-id="run-data-schema-empty"
-							>
-								{{ i18n.baseText('dataMapping.schemaView.emptyData') }}
-							</div>
-
-							<RunDataSchemaItem
-								v-else-if="currentNode.schema"
-								:schema="currentNode.schema"
-								:level="0"
-								:parent="null"
-								:pane-type="paneType"
-								:sub-key="`${props.context}_${snakeCase(currentNode.node.name)}`"
-								:mapping-enabled="mappingEnabled"
-								:dragging-path="draggingPath"
-								:distance-from-active="currentNode.depth"
-								:node="currentNode.node"
-								:search="search"
-							/>
-						</div>
-					</div>
-				</Transition>
-			</Draggable>
-		</div>
-	</div>
-
-	<div v-else :class="[$style.schemaWrapper, { highlightSchema: highlight }]">
-		<div v-if="isDataEmpty(nodeSchema) && search" :class="$style.noMatch">
-			<n8n-text tag="h3" size="large">{{ i18n.baseText('ndv.search.noNodeMatch.title') }}</n8n-text>
-			<n8n-text>
-				<i18n-t keypath="ndv.search.noMatch.description" tag="span">
-					<template #link>
-						<a href="#" @click="emit('clear:search')">
-							{{ i18n.baseText('ndv.search.noMatch.description.link') }}
-						</a>
-					</template>
-				</i18n-t>
-			</n8n-text>
-			<n8n-text>{{ i18n.baseText('ndv.search.noMatchSchema.description') }}</n8n-text>
-		</div>
-
-		<div v-else :class="$style.schema" data-test-id="run-data-schema-node-schema">
-			<n8n-info-tip
-				v-if="isDataEmpty(nodeSchema)"
-				:class="$style.tip"
-				data-test-id="run-data-schema-empty"
-			>
-				{{ i18n.baseText('dataMapping.schemaView.emptyData') }}
-			</n8n-info-tip>
-
-			<RunDataSchemaItem
-				v-else-if="nodeSchema"
-				:schema="nodeSchema"
-				:level="0"
-				:parent="null"
-				:pane-type="paneType"
-				:sub-key="`${props.context}_output_${nodeSchema.type}-0-0`"
-				:mapping-enabled="mappingEnabled"
-				:dragging-path="draggingPath"
-				:node="node"
-				:search="search"
-			/>
-		</div>
-	</div>
-</template>
-
-<style lang="scss" module>
-@import '@/styles/variables';
-
-.schemaWrapper {
-	--header-height: 38px;
-	--title-spacing-left: 38px;
-	display: flex;
-	flex-direction: column;
-	container: schema / inline-size;
-
-	&.animating {
-		overflow: hidden;
-		height: 100%;
-	}
-}
-
-.node {
-	.schema {
-		padding-left: var(--title-spacing-left);
-		scroll-margin-top: var(--header-height);
-	}
-
-	.notice {
-		padding-left: var(--spacing-l);
-	}
-}
-
-.schema {
-	display: grid;
-	grid-template-rows: 1fr;
-
-	&.animated {
-		grid-template-rows: 0fr;
-		transform: translateX(-8px);
-		opacity: 0;
-
-		transition:
-			grid-template-rows 0.2s $ease-out-expo,
-			opacity 0.2s $ease-out-expo 0s,
-			transform 0.2s $ease-out-expo 0s;
-	}
-}
-
-.notice {
-	font-size: var(--font-size-2xs);
-	color: var(--color-text-light);
-}
-
-.innerSchema {
-	min-height: 0;
-	min-width: 0;
-
-	> div {
-		margin-bottom: var(--spacing-xs);
-	}
-}
-
-.titleContainer {
-	display: flex;
-	align-items: center;
-	gap: var(--spacing-2xs);
-	flex-basis: 100%;
-	cursor: pointer;
-}
-
-.subtitle {
-	margin-left: auto;
-	padding-left: var(--spacing-2xs);
-	color: var(--color-text-light);
-	font-weight: var(--font-weight-regular);
-}
-
-.header {
-	display: flex;
-	align-items: center;
-	position: sticky;
-	top: 0;
-	z-index: 1;
-	padding-bottom: var(--spacing-2xs);
-	background: var(--color-run-data-background);
-}
-
-.expand {
-	--expand-toggle-size: 30px;
-	width: var(--expand-toggle-size);
-	height: var(--expand-toggle-size);
-	flex-shrink: 0;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	cursor: pointer;
-
-	&:hover,
-	&:active {
-		color: var(--color-text-dark);
-	}
-}
-
-.expandIcon {
-	transition: transform 0.2s $ease-out-expo;
-}
-
-.open {
-	.expandIcon {
-		transform: rotate(90deg);
-	}
-
-	.schema {
-		transition:
-			grid-template-rows 0.2s $ease-out-expo,
-			opacity 0.2s $ease-out-expo,
-			transform 0.2s $ease-out-expo;
-		grid-template-rows: 1fr;
-		opacity: 1;
-		transform: translateX(0);
-	}
-}
-
-.nodeIcon {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	padding: var(--spacing-3xs);
-	border: 1px solid var(--color-foreground-light);
-	border-radius: var(--border-radius-base);
-	background-color: var(--color-background-xlight);
-}
-
-.noMatch {
-	display: flex;
-	flex-grow: 1;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-	padding: var(--spacing-s) var(--spacing-s) var(--spacing-xl) var(--spacing-s);
-	text-align: center;
-
-	> * {
-		max-width: 316px;
-		margin-bottom: var(--spacing-2xs);
-	}
-}
-
-.title {
-	font-size: var(--font-size-2xs);
-	color: var(--color-text-dark);
-}
-
-.items {
-	flex-shrink: 0;
-	font-size: var(--font-size-2xs);
-	color: var(--color-text-light);
-	margin-left: var(--spacing-2xs);
-
-	transition:
-		opacity 0.2s $ease-out-expo,
-		transform 0.2s $ease-out-expo;
-}
-
-.triggerIcon {
-	margin-left: var(--spacing-2xs);
-	color: var(--color-primary);
-}
-
-.trigger {
-	.nodeIcon {
-		border-radius: 16px 4px 4px 16px;
-	}
-}
-
-@container schema (max-width: 24em) {
-	.depth {
-		display: none;
-	}
-}
-</style>
-
-<style lang="scss" scoped>
-@import '@/styles/variables';
-
-.items-enter-from,
-.items-leave-to {
-	transform: translateX(-4px);
-	opacity: 0;
-}
-
-.items-enter-to,
-.items-leave-from {
-	transform: translateX(0);
-	opacity: 1;
-}
-
-.schema-enter-from,
-.schema-leave-to {
-	grid-template-rows: 0fr;
-	transform: translateX(-8px);
-	opacity: 0;
-}
-
-.schema-enter-to,
-.schema-leave-from {
-	transform: translateX(0);
-	grid-template-rows: 1fr;
-	opacity: 1;
-}
-</style>
diff --git a/packages/editor-ui/src/components/RunDataSchemaItem.vue b/packages/editor-ui/src/components/RunDataSchemaItem.vue
deleted file mode 100644
index 43751ccb9d580..0000000000000
--- a/packages/editor-ui/src/components/RunDataSchemaItem.vue
+++ /dev/null
@@ -1,333 +0,0 @@
-<script lang="ts" setup>
-import { computed } from 'vue';
-import type { INodeUi, Schema } from '@/Interface';
-import { checkExhaustive } from '@/utils/typeGuards';
-import { shorten } from '@/utils/typesUtils';
-import { getMappedExpression } from '@/utils/mappingUtils';
-import TextWithHighlights from './TextWithHighlights.vue';
-import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
-
-type Props = {
-	schema: Schema;
-	level: number;
-	parent: Schema | null;
-	subKey: string;
-	paneType: 'input' | 'output';
-	mappingEnabled: boolean;
-	draggingPath: string;
-	distanceFromActive?: number;
-	node: INodeUi | null;
-	search: string;
-};
-
-const props = defineProps<Props>();
-
-const isSchemaValueArray = computed(() => Array.isArray(props.schema.value));
-const schemaArray = computed(
-	() => (isSchemaValueArray.value ? props.schema.value : []) as Schema[],
-);
-const isSchemaParentTypeArray = computed(() => props.parent?.type === 'array');
-
-const key = computed((): string | undefined => {
-	return isSchemaParentTypeArray.value ? `[${props.schema.key}]` : props.schema.key;
-});
-const schemaName = computed(() =>
-	isSchemaParentTypeArray.value ? `${props.schema.type}[${props.schema.key}]` : props.schema.key,
-);
-
-const text = computed(() =>
-	Array.isArray(props.schema.value) ? '' : shorten(props.schema.value, 600, 0),
-);
-
-const dragged = computed(() => props.draggingPath === props.schema.path);
-
-const getJsonParameterPath = (path: string): string =>
-	getMappedExpression({
-		nodeName: props.node!.name,
-		distanceFromActive: props.distanceFromActive ?? 1,
-		path,
-	});
-
-const getIconBySchemaType = (type: Schema['type']): string => {
-	switch (type) {
-		case 'object':
-			return 'cube';
-		case 'array':
-			return 'list';
-		case 'string':
-		case 'null':
-			return 'font';
-		case 'number':
-			return 'hashtag';
-		case 'boolean':
-			return 'check-square';
-		case 'function':
-			return 'code';
-		case 'bigint':
-			return 'calculator';
-		case 'symbol':
-			return 'sun';
-		case 'undefined':
-			return 'ban';
-		default:
-			checkExhaustive(type);
-			return '';
-	}
-};
-</script>
-
-<template>
-	<div :class="$style.item" data-test-id="run-data-schema-item">
-		<div :class="$style.itemContent">
-			<div
-				v-if="level > 0 || (level === 0 && !isSchemaValueArray)"
-				:title="schema.type"
-				:class="{
-					[$style.pill]: true,
-					[$style.mappable]: mappingEnabled,
-					[$style.highlight]: dragged,
-				}"
-			>
-				<span
-					:class="$style.label"
-					:data-value="getJsonParameterPath(schema.path)"
-					:data-name="schemaName"
-					:data-path="schema.path"
-					:data-depth="level"
-					data-target="mappable"
-				>
-					<FontAwesomeIcon :icon="getIconBySchemaType(schema.type)" size="sm" />
-					<TextWithHighlights
-						v-if="isSchemaParentTypeArray"
-						:content="props.parent?.key"
-						:search="props.search"
-					/>
-					<TextWithHighlights
-						v-if="key"
-						:class="{ [$style.arrayIndex]: isSchemaParentTypeArray }"
-						:content="key"
-						:search="props.search"
-					/>
-				</span>
-			</div>
-
-			<span v-if="text" :class="$style.text" data-test-id="run-data-schema-item-value">
-				<template v-for="(line, index) in text.split('\n')" :key="`line-${index}`">
-					<span v-if="index > 0" :class="$style.newLine">\n</span>
-					<TextWithHighlights :content="line" :search="props.search" />
-				</template>
-			</span>
-		</div>
-
-		<input v-if="level > 0 && isSchemaValueArray" :id="subKey" type="checkbox" inert checked />
-		<label v-if="level > 0 && isSchemaValueArray" :class="$style.toggle" :for="subKey">
-			<FontAwesomeIcon icon="angle-right" />
-		</label>
-
-		<div v-if="isSchemaValueArray" :class="$style.sub">
-			<div :class="$style.innerSub">
-				<RunDataSchemaItem
-					v-for="s in schemaArray"
-					:key="s.key ?? s.type"
-					:schema="s"
-					:level="level + 1"
-					:parent="schema"
-					:pane-type="paneType"
-					:sub-key="`${subKey}-${s.key ?? s.type}`"
-					:mapping-enabled="mappingEnabled"
-					:dragging-path="draggingPath"
-					:distance-from-active="distanceFromActive"
-					:node="node"
-					:search="search"
-				/>
-			</div>
-		</div>
-	</div>
-</template>
-
-<style lang="scss" module>
-@import '@/styles/variables';
-
-.item {
-	display: flex;
-	flex-wrap: wrap;
-	align-items: center;
-	line-height: var(--font-line-height-loose);
-	position: relative;
-	column-gap: var(--spacing-2xs);
-
-	+ .item {
-		margin-top: var(--spacing-2xs);
-	}
-
-	.item {
-		padding-left: var(--spacing-l);
-	}
-
-	input {
-		display: none;
-
-		~ .sub {
-			transition:
-				grid-template-rows 0.2s $ease-out-expo,
-				opacity 0.2s $ease-out-expo,
-				transform 0.2s $ease-out-expo;
-			transform: translateX(-8px);
-			opacity: 0;
-			margin-bottom: 0;
-
-			.innerSub {
-				min-height: 0;
-			}
-		}
-
-		&:checked {
-			~ .toggle svg {
-				transform: rotate(90deg);
-			}
-
-			~ .sub {
-				transform: translateX(0);
-				opacity: 1;
-				grid-template-rows: 1fr;
-			}
-		}
-	}
-}
-
-.itemContent {
-	display: flex;
-	gap: var(--spacing-2xs);
-	align-items: baseline;
-	flex-grow: 1;
-	min-width: 0;
-}
-
-.sub {
-	display: grid;
-	grid-template-rows: 0fr;
-	overflow: hidden;
-	flex-basis: 100%;
-	scroll-margin: 64px;
-}
-
-.innerSub {
-	display: inline-flex;
-	flex-direction: column;
-	order: -1;
-	min-width: 0;
-
-	.innerSub > div:first-child {
-		margin-top: var(--spacing-2xs);
-	}
-}
-
-:global(.highlightSchema) {
-	.pill.mappable {
-		&,
-		&:hover,
-		span,
-		&:hover span span {
-			color: var(--color-primary);
-			border-color: var(--color-primary-tint-1);
-			background-color: var(--color-primary-tint-3);
-
-			svg {
-				path {
-					fill: var(--color-primary);
-				}
-			}
-		}
-	}
-}
-
-.pill {
-	display: inline-flex;
-	height: 24px;
-	padding: 0 var(--spacing-3xs);
-	border: 1px solid var(--color-foreground-light);
-	border-radius: var(--border-radius-base);
-	background-color: var(--color-background-xlight);
-	font-size: var(--font-size-2xs);
-	color: var(--color-text-dark);
-	max-width: 50%;
-
-	path {
-		fill: var(--color-text-light);
-	}
-
-	&.mappable {
-		cursor: grab;
-
-		&:hover {
-			&,
-			span span {
-				background-color: var(--color-background-light);
-				border-color: var(--color-foreground-base);
-			}
-		}
-	}
-}
-
-.label {
-	display: flex;
-	min-width: 0;
-	align-items: center;
-
-	> span {
-		display: flex;
-		align-items: center;
-
-		margin-left: var(--spacing-3xs);
-		padding-left: var(--spacing-3xs);
-		border-left: 1px solid var(--color-foreground-light);
-
-		overflow: hidden;
-
-		span {
-			overflow: hidden;
-			text-overflow: ellipsis;
-			white-space: nowrap;
-		}
-
-		&.arrayIndex {
-			border: 0;
-			padding-left: 0;
-			margin-left: 0;
-		}
-	}
-}
-
-.text {
-	display: block;
-	font-weight: var(--font-weight-normal);
-	font-size: var(--font-size-2xs);
-	overflow: hidden;
-	word-break: break-word;
-
-	.newLine {
-		font-family: var(--font-family-monospace);
-		color: var(--color-line-break);
-		padding-right: 2px;
-	}
-}
-
-.toggle {
-	display: flex;
-	position: absolute;
-	padding: var(--spacing-4xs) var(--spacing-2xs);
-	left: 0;
-	top: 0;
-	justify-content: center;
-	align-items: center;
-	cursor: pointer;
-	user-select: none;
-	font-weight: normal;
-	font-size: var(--font-size-s);
-	overflow: hidden;
-
-	svg {
-		transition: transform 0.2s $ease-out-expo;
-	}
-}
-</style>
diff --git a/packages/editor-ui/src/components/SourceControlPushModal.ee.test.ts b/packages/editor-ui/src/components/SourceControlPushModal.ee.test.ts
index e4f9da72a680e..2d71a7f6d2b7b 100644
--- a/packages/editor-ui/src/components/SourceControlPushModal.ee.test.ts
+++ b/packages/editor-ui/src/components/SourceControlPushModal.ee.test.ts
@@ -207,11 +207,9 @@ describe('SourceControlPushModal', () => {
 		const submitButton = getByTestId('source-control-push-modal-submit');
 		const commitMessage = 'commit message';
 		expect(submitButton).toBeDisabled();
-		expect(
-			getByText(
-				'No workflow changes to push. Only modified credentials, variables, and tags will be pushed.',
-			),
-		).toBeInTheDocument();
+		expect(getByText('1 new credentials added, 0 deleted and 0 changed')).toBeInTheDocument();
+		expect(getByText('At least one new variable has been added or modified')).toBeInTheDocument();
+		expect(getByText('At least one new tag has been added or modified')).toBeInTheDocument();
 
 		await userEvent.type(getByTestId('source-control-push-modal-commit'), commitMessage);
 
@@ -375,5 +373,57 @@ describe('SourceControlPushModal', () => {
 				expect(items[0]).toHaveTextContent('Created Workflow');
 			});
 		});
+
+		it('should reset', async () => {
+			const status: SourceControlAggregatedFile[] = [
+				{
+					id: 'JIGKevgZagmJAnM6',
+					name: 'Modified workflow',
+					type: 'workflow',
+					status: 'modified',
+					location: 'local',
+					conflict: false,
+					file: '/home/user/.n8n/git/workflows/JIGKevgZagmJAnM6.json',
+					updatedAt: '2024-09-20T14:42:51.968Z',
+				},
+			];
+
+			const { getByTestId, getAllByTestId, queryAllByTestId } = renderModal({
+				props: {
+					data: {
+						eventBus,
+						status,
+					},
+				},
+			});
+
+			expect(getAllByTestId('source-control-push-modal-file-checkbox')).toHaveLength(1);
+
+			await userEvent.click(getByTestId('source-control-filter-dropdown'));
+
+			expect(getByTestId('source-control-status-filter')).toBeVisible();
+
+			await userEvent.click(
+				within(getByTestId('source-control-status-filter')).getByRole('combobox'),
+			);
+
+			await waitFor(() =>
+				expect(getAllByTestId('source-control-status-filter-option')[0]).toBeVisible(),
+			);
+
+			const menu = getAllByTestId('source-control-status-filter-option')[0]
+				.parentElement as HTMLElement;
+
+			await userEvent.click(within(menu).getByText('New'));
+			await waitFor(() => {
+				expect(queryAllByTestId('source-control-push-modal-file-checkbox')).toHaveLength(0);
+				expect(getByTestId('source-control-filters-reset')).toBeInTheDocument();
+			});
+
+			await userEvent.click(getByTestId('source-control-filters-reset'));
+
+			const items = getAllByTestId('source-control-push-modal-file-checkbox');
+			expect(items).toHaveLength(1);
+		});
 	});
 });
diff --git a/packages/editor-ui/src/components/SourceControlPushModal.ee.vue b/packages/editor-ui/src/components/SourceControlPushModal.ee.vue
index cf7f0b9d2bd5b..eb518c2d4cffa 100644
--- a/packages/editor-ui/src/components/SourceControlPushModal.ee.vue
+++ b/packages/editor-ui/src/components/SourceControlPushModal.ee.vue
@@ -28,6 +28,7 @@ import {
 	N8nSelect,
 	N8nOption,
 	N8nInputLabel,
+	N8nInfoTip,
 } from 'n8n-design-system';
 import {
 	SOURCE_CONTROL_FILE_STATUS,
@@ -36,7 +37,7 @@ import {
 	type SourceControlledFileStatus,
 	type SourceControlAggregatedFile,
 } from '@/types/sourceControl.types';
-import { orderBy } from 'lodash-es';
+import { orderBy, groupBy } from 'lodash-es';
 
 const props = defineProps<{
 	data: { eventBus: EventBus; status: SourceControlAggregatedFile[] };
@@ -101,6 +102,27 @@ const classifyFilesByType = (
 		{ tags: [], variables: [], credentials: [], workflows: [], currentWorkflow: undefined },
 	);
 
+const userNotices = computed(() => {
+	const messages: string[] = [];
+
+	if (changes.value.credentials.length) {
+		const { created, deleted, modified } = groupBy(changes.value.credentials, 'status');
+
+		messages.push(
+			`${created?.length ?? 0} new credentials added, ${deleted?.length ?? 0} deleted and ${modified?.length ?? 0} changed`,
+		);
+	}
+
+	if (changes.value.variables.length) {
+		messages.push('At least one new variable has been added or modified');
+	}
+
+	if (changes.value.tags.length) {
+		messages.push('At least one new tag has been added or modified');
+	}
+
+	return messages;
+});
 const workflowId = computed(
 	() =>
 		([VIEWS.WORKFLOW].includes(route.name as VIEWS) && route.params.name?.toString()) || undefined,
@@ -121,9 +143,12 @@ const maybeSelectCurrentWorkflow = (workflow?: SourceControlAggregatedFile) =>
 	workflow && selectedChanges.value.add(workflow.id);
 onMounted(() => maybeSelectCurrentWorkflow(changes.value.currentWorkflow));
 
-const filters = ref<{ status?: SourceControlledFileStatus }>({
-	status: undefined,
-});
+const filters = ref<{ status?: SourceControlledFileStatus }>({});
+const filtersApplied = computed(() => Boolean(Object.keys(filters.value).length));
+const resetFilters = () => {
+	filters.value = {};
+};
+
 const statusFilterOptions: Array<{ label: string; value: SourceControlledFileStatus }> = [
 	{
 		label: 'New',
@@ -245,12 +270,46 @@ async function onCommitKeyDownEnter() {
 	}
 }
 
+const successNotificationMessage = () => {
+	const messages: string[] = [];
+
+	if (selectedChanges.value.size) {
+		messages.push(
+			i18n.baseText('generic.workflow', {
+				adjustToNumber: selectedChanges.value.size,
+				interpolate: { count: selectedChanges.value.size },
+			}),
+		);
+	}
+
+	if (changes.value.credentials.length) {
+		messages.push(
+			i18n.baseText('generic.credential', {
+				adjustToNumber: changes.value.credentials.length,
+				interpolate: { count: changes.value.credentials.length },
+			}),
+		);
+	}
+
+	if (changes.value.variables.length) {
+		messages.push(i18n.baseText('generic.variable_plural'));
+	}
+
+	if (changes.value.tags.length) {
+		messages.push(i18n.baseText('generic.tag_plural'));
+	}
+
+	return [
+		new Intl.ListFormat(i18n.locale, { style: 'long', type: 'conjunction' }).format(messages),
+		i18n.baseText('settings.sourceControl.modals.push.success.description'),
+	].join(' ');
+};
+
 async function commitAndPush() {
 	const files = changes.value.tags
 		.concat(changes.value.variables)
 		.concat(changes.value.credentials)
 		.concat(changes.value.workflows.filter((file) => selectedChanges.value.has(file.id)));
-
 	loadingService.startLoading(i18n.baseText('settings.sourceControl.loading.push'));
 	close();
 
@@ -263,7 +322,7 @@ async function commitAndPush() {
 
 		toast.showToast({
 			title: i18n.baseText('settings.sourceControl.modals.push.success.title'),
-			message: i18n.baseText('settings.sourceControl.modals.push.success.description'),
+			message: successNotificationMessage(),
 			type: 'success',
 		});
 	} catch (error) {
@@ -299,7 +358,7 @@ const getStatusTheme = (status: SourceControlledFileStatus) => {
 			<N8nHeading tag="h1" size="xlarge">
 				{{ i18n.baseText('settings.sourceControl.modals.push.title') }}
 			</N8nHeading>
-			<div class="mb-l mt-l">
+			<div class="mt-l">
 				<N8nText tag="div">
 					{{ i18n.baseText('settings.sourceControl.modals.push.description') }}
 					<N8nLink :to="i18n.baseText('settings.sourceControl.docs.using.pushPull.url')">
@@ -307,18 +366,14 @@ const getStatusTheme = (status: SourceControlledFileStatus) => {
 					</N8nLink>
 				</N8nText>
 
-				<N8nNotice v-if="!changes.workflows.length" class="mt-xs">
-					<i18n-t keypath="settings.sourceControl.modals.push.noWorkflowChanges">
-						<template #link>
-							<N8nLink size="small" :to="i18n.baseText('settings.sourceControl.docs.using.url')">
-								{{ i18n.baseText('settings.sourceControl.modals.push.noWorkflowChanges.moreInfo') }}
-							</N8nLink>
-						</template>
-					</i18n-t>
+				<N8nNotice v-if="userNotices.length" class="mt-xs" :compact="false">
+					<ul class="ml-m">
+						<li v-for="notice in userNotices" :key="notice">{{ notice }}</li>
+					</ul>
 				</N8nNotice>
 			</div>
 
-			<div :class="[$style.filers]">
+			<div v-if="changes.workflows.length" :class="[$style.filers]" class="mt-l">
 				<N8nCheckbox
 					:class="$style.selectAll"
 					:indeterminate="selectAllIndeterminate"
@@ -378,7 +433,14 @@ const getStatusTheme = (status: SourceControlledFileStatus) => {
 			</div>
 		</template>
 		<template #content>
+			<N8nInfoTip v-if="filtersApplied && !sortedWorkflows.length" :bold="false">
+				{{ i18n.baseText('workflows.filters.active') }}
+				<N8nLink size="small" data-test-id="source-control-filters-reset" @click="resetFilters">
+					{{ i18n.baseText('workflows.filters.active.reset') }}
+				</N8nLink>
+			</N8nInfoTip>
 			<RecycleScroller
+				v-if="sortedWorkflows.length"
 				:class="[$style.scroller]"
 				:items="sortedWorkflows"
 				:item-size="69"
@@ -463,8 +525,7 @@ const getStatusTheme = (status: SourceControlledFileStatus) => {
 }
 
 .scroller {
-	height: 380px;
-	max-height: 100%;
+	max-height: 380px;
 }
 
 .listItem {
diff --git a/packages/editor-ui/src/components/VirtualSchema.test.ts b/packages/editor-ui/src/components/VirtualSchema.test.ts
index 0a000ea24e1a6..f648b1de3c3be 100644
--- a/packages/editor-ui/src/components/VirtualSchema.test.ts
+++ b/packages/editor-ui/src/components/VirtualSchema.test.ts
@@ -110,7 +110,7 @@ function mockNodeOutputData(nodeName: string, data: IDataObject[], outputIndex =
 	});
 }
 
-describe('RunDataSchema.vue', () => {
+describe('VirtualSchema.vue', () => {
 	let renderComponent: ReturnType<typeof createComponentRenderer>;
 
 	const DynamicScrollerStub = {
diff --git a/packages/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.vue b/packages/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.vue
index 7c917eb08000a..c54b13144d310 100644
--- a/packages/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.vue
+++ b/packages/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.vue
@@ -324,6 +324,7 @@ const onAddResourceClicked = () => {
 									ref="input"
 									:model-value="expressionDisplayValue"
 									:path="path"
+									:is-read-only="isReadOnly"
 									:rows="3"
 									@update:model-value="onInputChange"
 									@modal-opener-click="emit('modalOpenerClick')"
diff --git a/packages/editor-ui/src/components/__snapshots__/RunDataSchema.test.ts.snap b/packages/editor-ui/src/components/__snapshots__/RunDataSchema.test.ts.snap
deleted file mode 100644
index 5d4d5c4e4dea9..0000000000000
--- a/packages/editor-ui/src/components/__snapshots__/RunDataSchema.test.ts.snap
+++ /dev/null
@@ -1,2453 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`RunDataSchema.vue > renders its own data for AI tools in debug mode 1`] = `
-<div
-  class="schema"
-  data-test-id="run-data-schema-node-schema"
-  data-v-46dade00=""
->
-  <div
-    class="item"
-    data-test-id="run-data-schema-item"
-    data-v-46dade00=""
-  >
-    <div
-      class="itemContent"
-    >
-      <!--v-if-->
-      <!--v-if-->
-    </div>
-    <!--v-if-->
-    <!--v-if-->
-    <div
-      class="sub"
-    >
-      <div
-        class="innerSub"
-      >
-        
-        <div
-          class="item"
-          data-test-id="run-data-schema-item"
-        >
-          <div
-            class="itemContent"
-          >
-            <div
-              class="pill mappable"
-              title="string"
-            >
-              <span
-                class="label"
-                data-depth="1"
-                data-name="output"
-                data-path=".output"
-                data-target="mappable"
-                data-value="{{ $json.output }}"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                  data-icon="font"
-                  data-prefix="fas"
-                  focusable="false"
-                  role="img"
-                  viewBox="0 0 448 512"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    class=""
-                    d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                    fill="currentColor"
-                  />
-                </svg>
-                <!--v-if-->
-                <span
-                  class="content"
-                >
-                  
-                  <span>
-                    <!--v-if-->
-                    output
-                  </span>
-                  
-                </span>
-              </span>
-            </div>
-            <span
-              class="text"
-              data-test-id="run-data-schema-item-value"
-            >
-              
-              
-              <!--v-if-->
-              <span
-                class="content"
-              >
-                
-                <span>
-                  <!--v-if-->
-                  AI tool output
-                </span>
-                
-              </span>
-              
-              
-            </span>
-          </div>
-          <!--v-if-->
-          <!--v-if-->
-          <!--v-if-->
-        </div>
-        
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`RunDataSchema.vue > renders previous nodes schema for AI tools 1`] = `
-<div
-  class="schema animated"
-  data-test-id="run-data-schema-node-schema"
-  data-v-46dade00=""
->
-  <div
-    class="innerSchema"
-    data-v-46dade00=""
-  >
-    <div
-      class="item"
-      data-test-id="run-data-schema-item"
-      data-v-46dade00=""
-    >
-      <div
-        class="itemContent"
-      >
-        <!--v-if-->
-        <!--v-if-->
-      </div>
-      <!--v-if-->
-      <!--v-if-->
-      <div
-        class="sub"
-      >
-        <div
-          class="innerSub"
-        >
-          
-          <div
-            class="item"
-            data-test-id="run-data-schema-item"
-          >
-            <div
-              class="itemContent"
-            >
-              <div
-                class="pill mappable"
-                title="number"
-              >
-                <span
-                  class="label"
-                  data-depth="1"
-                  data-name="id"
-                  data-path=".id"
-                  data-target="mappable"
-                  data-value="{{ $('If').item.json.id }}"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="svg-inline--fa fa-hashtag fa-w-14 fa-sm"
-                    data-icon="hashtag"
-                    data-prefix="fas"
-                    focusable="false"
-                    role="img"
-                    viewBox="0 0 448 512"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      class=""
-                      d="M440.667 182.109l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l14.623-81.891C377.123 38.754 371.468 32 363.997 32h-40.632a12 12 0 0 0-11.813 9.891L296.175 128H197.54l14.623-81.891C213.477 38.754 207.822 32 200.35 32h-40.632a12 12 0 0 0-11.813 9.891L132.528 128H53.432a12 12 0 0 0-11.813 9.891l-7.143 40C33.163 185.246 38.818 192 46.289 192h74.81L98.242 320H19.146a12 12 0 0 0-11.813 9.891l-7.143 40C-1.123 377.246 4.532 384 12.003 384h74.81L72.19 465.891C70.877 473.246 76.532 480 84.003 480h40.632a12 12 0 0 0 11.813-9.891L151.826 384h98.634l-14.623 81.891C234.523 473.246 240.178 480 247.65 480h40.632a12 12 0 0 0 11.813-9.891L315.472 384h79.096a12 12 0 0 0 11.813-9.891l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l22.857-128h79.096a12 12 0 0 0 11.813-9.891zM261.889 320h-98.634l22.857-128h98.634l-22.857 128z"
-                      fill="currentColor"
-                    />
-                  </svg>
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      id
-                    </span>
-                    
-                  </span>
-                </span>
-              </div>
-              <span
-                class="text"
-                data-test-id="run-data-schema-item-value"
-              >
-                
-                
-                <!--v-if-->
-                <span
-                  class="content"
-                >
-                  
-                  <span>
-                    <!--v-if-->
-                    1
-                  </span>
-                  
-                </span>
-                
-                
-              </span>
-            </div>
-            <!--v-if-->
-            <!--v-if-->
-            <!--v-if-->
-          </div>
-          <div
-            class="item"
-            data-test-id="run-data-schema-item"
-          >
-            <div
-              class="itemContent"
-            >
-              <div
-                class="pill mappable"
-                title="string"
-              >
-                <span
-                  class="label"
-                  data-depth="1"
-                  data-name="name"
-                  data-path=".name"
-                  data-target="mappable"
-                  data-value="{{ $('If').item.json.name }}"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                    data-icon="font"
-                    data-prefix="fas"
-                    focusable="false"
-                    role="img"
-                    viewBox="0 0 448 512"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      class=""
-                      d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                      fill="currentColor"
-                    />
-                  </svg>
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      name
-                    </span>
-                    
-                  </span>
-                </span>
-              </div>
-              <span
-                class="text"
-                data-test-id="run-data-schema-item-value"
-              >
-                
-                
-                <!--v-if-->
-                <span
-                  class="content"
-                >
-                  
-                  <span>
-                    <!--v-if-->
-                    John
-                  </span>
-                  
-                </span>
-                
-                
-              </span>
-            </div>
-            <!--v-if-->
-            <!--v-if-->
-            <!--v-if-->
-          </div>
-          
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`RunDataSchema.vue > renders schema for correct output branch 1`] = `
-<div
-  class="schema animated"
-  data-test-id="run-data-schema-node-schema"
-  data-v-46dade00=""
->
-  <div
-    class="innerSchema"
-    data-v-46dade00=""
-  >
-    <div
-      class="item"
-      data-test-id="run-data-schema-item"
-      data-v-46dade00=""
-    >
-      <div
-        class="itemContent"
-      >
-        <!--v-if-->
-        <!--v-if-->
-      </div>
-      <!--v-if-->
-      <!--v-if-->
-      <div
-        class="sub"
-      >
-        <div
-          class="innerSub"
-        >
-          
-          <div
-            class="item"
-            data-test-id="run-data-schema-item"
-          >
-            <div
-              class="itemContent"
-            >
-              <div
-                class="pill mappable"
-                title="number"
-              >
-                <span
-                  class="label"
-                  data-depth="1"
-                  data-name="id"
-                  data-path=".id"
-                  data-target="mappable"
-                  data-value="{{ $('If').item.json.id }}"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="svg-inline--fa fa-hashtag fa-w-14 fa-sm"
-                    data-icon="hashtag"
-                    data-prefix="fas"
-                    focusable="false"
-                    role="img"
-                    viewBox="0 0 448 512"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      class=""
-                      d="M440.667 182.109l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l14.623-81.891C377.123 38.754 371.468 32 363.997 32h-40.632a12 12 0 0 0-11.813 9.891L296.175 128H197.54l14.623-81.891C213.477 38.754 207.822 32 200.35 32h-40.632a12 12 0 0 0-11.813 9.891L132.528 128H53.432a12 12 0 0 0-11.813 9.891l-7.143 40C33.163 185.246 38.818 192 46.289 192h74.81L98.242 320H19.146a12 12 0 0 0-11.813 9.891l-7.143 40C-1.123 377.246 4.532 384 12.003 384h74.81L72.19 465.891C70.877 473.246 76.532 480 84.003 480h40.632a12 12 0 0 0 11.813-9.891L151.826 384h98.634l-14.623 81.891C234.523 473.246 240.178 480 247.65 480h40.632a12 12 0 0 0 11.813-9.891L315.472 384h79.096a12 12 0 0 0 11.813-9.891l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l22.857-128h79.096a12 12 0 0 0 11.813-9.891zM261.889 320h-98.634l22.857-128h98.634l-22.857 128z"
-                      fill="currentColor"
-                    />
-                  </svg>
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      id
-                    </span>
-                    
-                  </span>
-                </span>
-              </div>
-              <span
-                class="text"
-                data-test-id="run-data-schema-item-value"
-              >
-                
-                
-                <!--v-if-->
-                <span
-                  class="content"
-                >
-                  
-                  <span>
-                    <!--v-if-->
-                    1
-                  </span>
-                  
-                </span>
-                
-                
-              </span>
-            </div>
-            <!--v-if-->
-            <!--v-if-->
-            <!--v-if-->
-          </div>
-          <div
-            class="item"
-            data-test-id="run-data-schema-item"
-          >
-            <div
-              class="itemContent"
-            >
-              <div
-                class="pill mappable"
-                title="string"
-              >
-                <span
-                  class="label"
-                  data-depth="1"
-                  data-name="name"
-                  data-path=".name"
-                  data-target="mappable"
-                  data-value="{{ $('If').item.json.name }}"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                    data-icon="font"
-                    data-prefix="fas"
-                    focusable="false"
-                    role="img"
-                    viewBox="0 0 448 512"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      class=""
-                      d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                      fill="currentColor"
-                    />
-                  </svg>
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      name
-                    </span>
-                    
-                  </span>
-                </span>
-              </div>
-              <span
-                class="text"
-                data-test-id="run-data-schema-item-value"
-              >
-                
-                
-                <!--v-if-->
-                <span
-                  class="content"
-                >
-                  
-                  <span>
-                    <!--v-if-->
-                    John
-                  </span>
-                  
-                </span>
-                
-                
-              </span>
-            </div>
-            <!--v-if-->
-            <!--v-if-->
-            <!--v-if-->
-          </div>
-          
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`RunDataSchema.vue > renders schema for data 1`] = `
-<div
-  class="schema animated"
-  data-test-id="run-data-schema-node-schema"
-  data-v-46dade00=""
->
-  <div
-    class="innerSchema"
-    data-v-46dade00=""
-  >
-    <div
-      class="item"
-      data-test-id="run-data-schema-item"
-      data-v-46dade00=""
-    >
-      <div
-        class="itemContent"
-      >
-        <!--v-if-->
-        <!--v-if-->
-      </div>
-      <!--v-if-->
-      <!--v-if-->
-      <div
-        class="sub"
-      >
-        <div
-          class="innerSub"
-        >
-          
-          <div
-            class="item"
-            data-test-id="run-data-schema-item"
-          >
-            <div
-              class="itemContent"
-            >
-              <div
-                class="pill mappable"
-                title="string"
-              >
-                <span
-                  class="label"
-                  data-depth="1"
-                  data-name="name"
-                  data-path=".name"
-                  data-target="mappable"
-                  data-value="{{ $json.name }}"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                    data-icon="font"
-                    data-prefix="fas"
-                    focusable="false"
-                    role="img"
-                    viewBox="0 0 448 512"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      class=""
-                      d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                      fill="currentColor"
-                    />
-                  </svg>
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      name
-                    </span>
-                    
-                  </span>
-                </span>
-              </div>
-              <span
-                class="text"
-                data-test-id="run-data-schema-item-value"
-              >
-                
-                
-                <!--v-if-->
-                <span
-                  class="content"
-                >
-                  
-                  <span>
-                    <!--v-if-->
-                    John
-                  </span>
-                  
-                </span>
-                
-                
-              </span>
-            </div>
-            <!--v-if-->
-            <!--v-if-->
-            <!--v-if-->
-          </div>
-          <div
-            class="item"
-            data-test-id="run-data-schema-item"
-          >
-            <div
-              class="itemContent"
-            >
-              <div
-                class="pill mappable"
-                title="number"
-              >
-                <span
-                  class="label"
-                  data-depth="1"
-                  data-name="age"
-                  data-path=".age"
-                  data-target="mappable"
-                  data-value="{{ $json.age }}"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="svg-inline--fa fa-hashtag fa-w-14 fa-sm"
-                    data-icon="hashtag"
-                    data-prefix="fas"
-                    focusable="false"
-                    role="img"
-                    viewBox="0 0 448 512"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      class=""
-                      d="M440.667 182.109l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l14.623-81.891C377.123 38.754 371.468 32 363.997 32h-40.632a12 12 0 0 0-11.813 9.891L296.175 128H197.54l14.623-81.891C213.477 38.754 207.822 32 200.35 32h-40.632a12 12 0 0 0-11.813 9.891L132.528 128H53.432a12 12 0 0 0-11.813 9.891l-7.143 40C33.163 185.246 38.818 192 46.289 192h74.81L98.242 320H19.146a12 12 0 0 0-11.813 9.891l-7.143 40C-1.123 377.246 4.532 384 12.003 384h74.81L72.19 465.891C70.877 473.246 76.532 480 84.003 480h40.632a12 12 0 0 0 11.813-9.891L151.826 384h98.634l-14.623 81.891C234.523 473.246 240.178 480 247.65 480h40.632a12 12 0 0 0 11.813-9.891L315.472 384h79.096a12 12 0 0 0 11.813-9.891l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l22.857-128h79.096a12 12 0 0 0 11.813-9.891zM261.889 320h-98.634l22.857-128h98.634l-22.857 128z"
-                      fill="currentColor"
-                    />
-                  </svg>
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      age
-                    </span>
-                    
-                  </span>
-                </span>
-              </div>
-              <span
-                class="text"
-                data-test-id="run-data-schema-item-value"
-              >
-                
-                
-                <!--v-if-->
-                <span
-                  class="content"
-                >
-                  
-                  <span>
-                    <!--v-if-->
-                    22
-                  </span>
-                  
-                </span>
-                
-                
-              </span>
-            </div>
-            <!--v-if-->
-            <!--v-if-->
-            <!--v-if-->
-          </div>
-          <div
-            class="item"
-            data-test-id="run-data-schema-item"
-          >
-            <div
-              class="itemContent"
-            >
-              <div
-                class="pill mappable"
-                title="array"
-              >
-                <span
-                  class="label"
-                  data-depth="1"
-                  data-name="hobbies"
-                  data-path=".hobbies"
-                  data-target="mappable"
-                  data-value="{{ $json.hobbies }}"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="svg-inline--fa fa-list fa-w-16 fa-sm"
-                    data-icon="list"
-                    data-prefix="fas"
-                    focusable="false"
-                    role="img"
-                    viewBox="0 0 512 512"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      class=""
-                      d="M80 368H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm0-320H16A16 16 0 0 0 0 64v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16V64a16 16 0 0 0-16-16zm0 160H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm416 176H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zm0-320H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16V80a16 16 0 0 0-16-16zm0 160H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16z"
-                      fill="currentColor"
-                    />
-                  </svg>
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      hobbies
-                    </span>
-                    
-                  </span>
-                </span>
-              </div>
-              <!--v-if-->
-            </div>
-            <input
-              checked=""
-              id="ndv_set_1-hobbies"
-              inert=""
-              type="checkbox"
-            />
-            <label
-              class="toggle"
-              for="ndv_set_1-hobbies"
-            >
-              <svg
-                aria-hidden="true"
-                class="svg-inline--fa fa-angle-right fa-w-8"
-                data-icon="angle-right"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                viewBox="0 0 256 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  class=""
-                  d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-                  fill="currentColor"
-                />
-              </svg>
-            </label>
-            <div
-              class="sub"
-            >
-              <div
-                class="innerSub"
-              >
-                
-                <div
-                  class="item"
-                  data-test-id="run-data-schema-item"
-                >
-                  <div
-                    class="itemContent"
-                  >
-                    <div
-                      class="pill mappable"
-                      title="string"
-                    >
-                      <span
-                        class="label"
-                        data-depth="2"
-                        data-name="string[0]"
-                        data-path=".hobbies[0]"
-                        data-target="mappable"
-                        data-value="{{ $json.hobbies[0] }}"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                          data-icon="font"
-                          data-prefix="fas"
-                          focusable="false"
-                          role="img"
-                          viewBox="0 0 448 512"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            class=""
-                            d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                            fill="currentColor"
-                          />
-                        </svg>
-                        <span
-                          class="content"
-                        >
-                          
-                          <span>
-                            <!--v-if-->
-                            hobbies
-                          </span>
-                          
-                        </span>
-                        <span
-                          class="content arrayIndex"
-                        >
-                          
-                          <span>
-                            <!--v-if-->
-                            [0]
-                          </span>
-                          
-                        </span>
-                      </span>
-                    </div>
-                    <span
-                      class="text"
-                      data-test-id="run-data-schema-item-value"
-                    >
-                      
-                      
-                      <!--v-if-->
-                      <span
-                        class="content"
-                      >
-                        
-                        <span>
-                          <!--v-if-->
-                          surfing
-                        </span>
-                        
-                      </span>
-                      
-                      
-                    </span>
-                  </div>
-                  <!--v-if-->
-                  <!--v-if-->
-                  <!--v-if-->
-                </div>
-                <div
-                  class="item"
-                  data-test-id="run-data-schema-item"
-                >
-                  <div
-                    class="itemContent"
-                  >
-                    <div
-                      class="pill mappable"
-                      title="string"
-                    >
-                      <span
-                        class="label"
-                        data-depth="2"
-                        data-name="string[1]"
-                        data-path=".hobbies[1]"
-                        data-target="mappable"
-                        data-value="{{ $json.hobbies[1] }}"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                          data-icon="font"
-                          data-prefix="fas"
-                          focusable="false"
-                          role="img"
-                          viewBox="0 0 448 512"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            class=""
-                            d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                            fill="currentColor"
-                          />
-                        </svg>
-                        <span
-                          class="content"
-                        >
-                          
-                          <span>
-                            <!--v-if-->
-                            hobbies
-                          </span>
-                          
-                        </span>
-                        <span
-                          class="content arrayIndex"
-                        >
-                          
-                          <span>
-                            <!--v-if-->
-                            [1]
-                          </span>
-                          
-                        </span>
-                      </span>
-                    </div>
-                    <span
-                      class="text"
-                      data-test-id="run-data-schema-item-value"
-                    >
-                      
-                      
-                      <!--v-if-->
-                      <span
-                        class="content"
-                      >
-                        
-                        <span>
-                          <!--v-if-->
-                          traveling
-                        </span>
-                        
-                      </span>
-                      
-                      
-                    </span>
-                  </div>
-                  <!--v-if-->
-                  <!--v-if-->
-                  <!--v-if-->
-                </div>
-                
-              </div>
-            </div>
-          </div>
-          
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`RunDataSchema.vue > renders schema for data 2`] = `
-<div
-  class="schema animated"
-  data-test-id="run-data-schema-node-schema"
-  data-v-46dade00=""
->
-  <div
-    class="innerSchema"
-    data-v-46dade00=""
-  >
-    <div
-      class="item"
-      data-test-id="run-data-schema-item"
-      data-v-46dade00=""
-    >
-      <div
-        class="itemContent"
-      >
-        <!--v-if-->
-        <!--v-if-->
-      </div>
-      <!--v-if-->
-      <!--v-if-->
-      <div
-        class="sub"
-      >
-        <div
-          class="innerSub"
-        >
-          
-          <div
-            class="item"
-            data-test-id="run-data-schema-item"
-          >
-            <div
-              class="itemContent"
-            >
-              <div
-                class="pill mappable"
-                title="string"
-              >
-                <span
-                  class="label"
-                  data-depth="1"
-                  data-name="name"
-                  data-path=".name"
-                  data-target="mappable"
-                  data-value="{{ $('Set2').item.json.name }}"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                    data-icon="font"
-                    data-prefix="fas"
-                    focusable="false"
-                    role="img"
-                    viewBox="0 0 448 512"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      class=""
-                      d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                      fill="currentColor"
-                    />
-                  </svg>
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      name
-                    </span>
-                    
-                  </span>
-                </span>
-              </div>
-              <span
-                class="text"
-                data-test-id="run-data-schema-item-value"
-              >
-                
-                
-                <!--v-if-->
-                <span
-                  class="content"
-                >
-                  
-                  <span>
-                    <!--v-if-->
-                    John
-                  </span>
-                  
-                </span>
-                
-                
-              </span>
-            </div>
-            <!--v-if-->
-            <!--v-if-->
-            <!--v-if-->
-          </div>
-          <div
-            class="item"
-            data-test-id="run-data-schema-item"
-          >
-            <div
-              class="itemContent"
-            >
-              <div
-                class="pill mappable"
-                title="number"
-              >
-                <span
-                  class="label"
-                  data-depth="1"
-                  data-name="age"
-                  data-path=".age"
-                  data-target="mappable"
-                  data-value="{{ $('Set2').item.json.age }}"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="svg-inline--fa fa-hashtag fa-w-14 fa-sm"
-                    data-icon="hashtag"
-                    data-prefix="fas"
-                    focusable="false"
-                    role="img"
-                    viewBox="0 0 448 512"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      class=""
-                      d="M440.667 182.109l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l14.623-81.891C377.123 38.754 371.468 32 363.997 32h-40.632a12 12 0 0 0-11.813 9.891L296.175 128H197.54l14.623-81.891C213.477 38.754 207.822 32 200.35 32h-40.632a12 12 0 0 0-11.813 9.891L132.528 128H53.432a12 12 0 0 0-11.813 9.891l-7.143 40C33.163 185.246 38.818 192 46.289 192h74.81L98.242 320H19.146a12 12 0 0 0-11.813 9.891l-7.143 40C-1.123 377.246 4.532 384 12.003 384h74.81L72.19 465.891C70.877 473.246 76.532 480 84.003 480h40.632a12 12 0 0 0 11.813-9.891L151.826 384h98.634l-14.623 81.891C234.523 473.246 240.178 480 247.65 480h40.632a12 12 0 0 0 11.813-9.891L315.472 384h79.096a12 12 0 0 0 11.813-9.891l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l22.857-128h79.096a12 12 0 0 0 11.813-9.891zM261.889 320h-98.634l22.857-128h98.634l-22.857 128z"
-                      fill="currentColor"
-                    />
-                  </svg>
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      age
-                    </span>
-                    
-                  </span>
-                </span>
-              </div>
-              <span
-                class="text"
-                data-test-id="run-data-schema-item-value"
-              >
-                
-                
-                <!--v-if-->
-                <span
-                  class="content"
-                >
-                  
-                  <span>
-                    <!--v-if-->
-                    22
-                  </span>
-                  
-                </span>
-                
-                
-              </span>
-            </div>
-            <!--v-if-->
-            <!--v-if-->
-            <!--v-if-->
-          </div>
-          <div
-            class="item"
-            data-test-id="run-data-schema-item"
-          >
-            <div
-              class="itemContent"
-            >
-              <div
-                class="pill mappable"
-                title="array"
-              >
-                <span
-                  class="label"
-                  data-depth="1"
-                  data-name="hobbies"
-                  data-path=".hobbies"
-                  data-target="mappable"
-                  data-value="{{ $('Set2').item.json.hobbies }}"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="svg-inline--fa fa-list fa-w-16 fa-sm"
-                    data-icon="list"
-                    data-prefix="fas"
-                    focusable="false"
-                    role="img"
-                    viewBox="0 0 512 512"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      class=""
-                      d="M80 368H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm0-320H16A16 16 0 0 0 0 64v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16V64a16 16 0 0 0-16-16zm0 160H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm416 176H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zm0-320H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16V80a16 16 0 0 0-16-16zm0 160H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16z"
-                      fill="currentColor"
-                    />
-                  </svg>
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      hobbies
-                    </span>
-                    
-                  </span>
-                </span>
-              </div>
-              <!--v-if-->
-            </div>
-            <input
-              checked=""
-              id="ndv_set_2-hobbies"
-              inert=""
-              type="checkbox"
-            />
-            <label
-              class="toggle"
-              for="ndv_set_2-hobbies"
-            >
-              <svg
-                aria-hidden="true"
-                class="svg-inline--fa fa-angle-right fa-w-8"
-                data-icon="angle-right"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                viewBox="0 0 256 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  class=""
-                  d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-                  fill="currentColor"
-                />
-              </svg>
-            </label>
-            <div
-              class="sub"
-            >
-              <div
-                class="innerSub"
-              >
-                
-                <div
-                  class="item"
-                  data-test-id="run-data-schema-item"
-                >
-                  <div
-                    class="itemContent"
-                  >
-                    <div
-                      class="pill mappable"
-                      title="string"
-                    >
-                      <span
-                        class="label"
-                        data-depth="2"
-                        data-name="string[0]"
-                        data-path=".hobbies[0]"
-                        data-target="mappable"
-                        data-value="{{ $('Set2').item.json.hobbies[0] }}"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                          data-icon="font"
-                          data-prefix="fas"
-                          focusable="false"
-                          role="img"
-                          viewBox="0 0 448 512"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            class=""
-                            d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                            fill="currentColor"
-                          />
-                        </svg>
-                        <span
-                          class="content"
-                        >
-                          
-                          <span>
-                            <!--v-if-->
-                            hobbies
-                          </span>
-                          
-                        </span>
-                        <span
-                          class="content arrayIndex"
-                        >
-                          
-                          <span>
-                            <!--v-if-->
-                            [0]
-                          </span>
-                          
-                        </span>
-                      </span>
-                    </div>
-                    <span
-                      class="text"
-                      data-test-id="run-data-schema-item-value"
-                    >
-                      
-                      
-                      <!--v-if-->
-                      <span
-                        class="content"
-                      >
-                        
-                        <span>
-                          <!--v-if-->
-                          surfing
-                        </span>
-                        
-                      </span>
-                      
-                      
-                    </span>
-                  </div>
-                  <!--v-if-->
-                  <!--v-if-->
-                  <!--v-if-->
-                </div>
-                <div
-                  class="item"
-                  data-test-id="run-data-schema-item"
-                >
-                  <div
-                    class="itemContent"
-                  >
-                    <div
-                      class="pill mappable"
-                      title="string"
-                    >
-                      <span
-                        class="label"
-                        data-depth="2"
-                        data-name="string[1]"
-                        data-path=".hobbies[1]"
-                        data-target="mappable"
-                        data-value="{{ $('Set2').item.json.hobbies[1] }}"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                          data-icon="font"
-                          data-prefix="fas"
-                          focusable="false"
-                          role="img"
-                          viewBox="0 0 448 512"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            class=""
-                            d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                            fill="currentColor"
-                          />
-                        </svg>
-                        <span
-                          class="content"
-                        >
-                          
-                          <span>
-                            <!--v-if-->
-                            hobbies
-                          </span>
-                          
-                        </span>
-                        <span
-                          class="content arrayIndex"
-                        >
-                          
-                          <span>
-                            <!--v-if-->
-                            [1]
-                          </span>
-                          
-                        </span>
-                      </span>
-                    </div>
-                    <span
-                      class="text"
-                      data-test-id="run-data-schema-item-value"
-                    >
-                      
-                      
-                      <!--v-if-->
-                      <span
-                        class="content"
-                      >
-                        
-                        <span>
-                          <!--v-if-->
-                          traveling
-                        </span>
-                        
-                      </span>
-                      
-                      
-                    </span>
-                  </div>
-                  <!--v-if-->
-                  <!--v-if-->
-                  <!--v-if-->
-                </div>
-                
-              </div>
-            </div>
-          </div>
-          
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`RunDataSchema.vue > renders schema in output pane 1`] = `
-<div>
-  <div
-    class="schemaWrapper"
-    data-v-46dade00=""
-  >
-    <div
-      class="schema"
-      data-test-id="run-data-schema-node-schema"
-      data-v-46dade00=""
-    >
-      <div
-        class="item"
-        data-test-id="run-data-schema-item"
-        data-v-46dade00=""
-      >
-        <div
-          class="itemContent"
-        >
-          <!--v-if-->
-          <!--v-if-->
-        </div>
-        <!--v-if-->
-        <!--v-if-->
-        <div
-          class="sub"
-        >
-          <div
-            class="innerSub"
-          >
-            
-            <div
-              class="item"
-              data-test-id="run-data-schema-item"
-            >
-              <div
-                class="itemContent"
-              >
-                <div
-                  class="pill mappable"
-                  title="string"
-                >
-                  <span
-                    class="label"
-                    data-depth="1"
-                    data-name="name"
-                    data-path=".name"
-                    data-target="mappable"
-                    data-value="{{ $json.name }}"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                      data-icon="font"
-                      data-prefix="fas"
-                      focusable="false"
-                      role="img"
-                      viewBox="0 0 448 512"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        class=""
-                        d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                        fill="currentColor"
-                      />
-                    </svg>
-                    <!--v-if-->
-                    <span
-                      class="content"
-                    >
-                      
-                      <span>
-                        <!--v-if-->
-                        name
-                      </span>
-                      
-                    </span>
-                  </span>
-                </div>
-                <span
-                  class="text"
-                  data-test-id="run-data-schema-item-value"
-                >
-                  
-                  
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      John
-                    </span>
-                    
-                  </span>
-                  
-                  
-                </span>
-              </div>
-              <!--v-if-->
-              <!--v-if-->
-              <!--v-if-->
-            </div>
-            <div
-              class="item"
-              data-test-id="run-data-schema-item"
-            >
-              <div
-                class="itemContent"
-              >
-                <div
-                  class="pill mappable"
-                  title="number"
-                >
-                  <span
-                    class="label"
-                    data-depth="1"
-                    data-name="age"
-                    data-path=".age"
-                    data-target="mappable"
-                    data-value="{{ $json.age }}"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="svg-inline--fa fa-hashtag fa-w-14 fa-sm"
-                      data-icon="hashtag"
-                      data-prefix="fas"
-                      focusable="false"
-                      role="img"
-                      viewBox="0 0 448 512"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        class=""
-                        d="M440.667 182.109l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l14.623-81.891C377.123 38.754 371.468 32 363.997 32h-40.632a12 12 0 0 0-11.813 9.891L296.175 128H197.54l14.623-81.891C213.477 38.754 207.822 32 200.35 32h-40.632a12 12 0 0 0-11.813 9.891L132.528 128H53.432a12 12 0 0 0-11.813 9.891l-7.143 40C33.163 185.246 38.818 192 46.289 192h74.81L98.242 320H19.146a12 12 0 0 0-11.813 9.891l-7.143 40C-1.123 377.246 4.532 384 12.003 384h74.81L72.19 465.891C70.877 473.246 76.532 480 84.003 480h40.632a12 12 0 0 0 11.813-9.891L151.826 384h98.634l-14.623 81.891C234.523 473.246 240.178 480 247.65 480h40.632a12 12 0 0 0 11.813-9.891L315.472 384h79.096a12 12 0 0 0 11.813-9.891l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l22.857-128h79.096a12 12 0 0 0 11.813-9.891zM261.889 320h-98.634l22.857-128h98.634l-22.857 128z"
-                        fill="currentColor"
-                      />
-                    </svg>
-                    <!--v-if-->
-                    <span
-                      class="content"
-                    >
-                      
-                      <span>
-                        <!--v-if-->
-                        age
-                      </span>
-                      
-                    </span>
-                  </span>
-                </div>
-                <span
-                  class="text"
-                  data-test-id="run-data-schema-item-value"
-                >
-                  
-                  
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      22
-                    </span>
-                    
-                  </span>
-                  
-                  
-                </span>
-              </div>
-              <!--v-if-->
-              <!--v-if-->
-              <!--v-if-->
-            </div>
-            <div
-              class="item"
-              data-test-id="run-data-schema-item"
-            >
-              <div
-                class="itemContent"
-              >
-                <div
-                  class="pill mappable"
-                  title="array"
-                >
-                  <span
-                    class="label"
-                    data-depth="1"
-                    data-name="hobbies"
-                    data-path=".hobbies"
-                    data-target="mappable"
-                    data-value="{{ $json.hobbies }}"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="svg-inline--fa fa-list fa-w-16 fa-sm"
-                      data-icon="list"
-                      data-prefix="fas"
-                      focusable="false"
-                      role="img"
-                      viewBox="0 0 512 512"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        class=""
-                        d="M80 368H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm0-320H16A16 16 0 0 0 0 64v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16V64a16 16 0 0 0-16-16zm0 160H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm416 176H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zm0-320H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16V80a16 16 0 0 0-16-16zm0 160H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16z"
-                        fill="currentColor"
-                      />
-                    </svg>
-                    <!--v-if-->
-                    <span
-                      class="content"
-                    >
-                      
-                      <span>
-                        <!--v-if-->
-                        hobbies
-                      </span>
-                      
-                    </span>
-                  </span>
-                </div>
-                <!--v-if-->
-              </div>
-              <input
-                checked=""
-                id="ndv_output_object-0-0-hobbies"
-                inert=""
-                type="checkbox"
-              />
-              <label
-                class="toggle"
-                for="ndv_output_object-0-0-hobbies"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="svg-inline--fa fa-angle-right fa-w-8"
-                  data-icon="angle-right"
-                  data-prefix="fas"
-                  focusable="false"
-                  role="img"
-                  viewBox="0 0 256 512"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    class=""
-                    d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-                    fill="currentColor"
-                  />
-                </svg>
-              </label>
-              <div
-                class="sub"
-              >
-                <div
-                  class="innerSub"
-                >
-                  
-                  <div
-                    class="item"
-                    data-test-id="run-data-schema-item"
-                  >
-                    <div
-                      class="itemContent"
-                    >
-                      <div
-                        class="pill mappable"
-                        title="string"
-                      >
-                        <span
-                          class="label"
-                          data-depth="2"
-                          data-name="string[0]"
-                          data-path=".hobbies[0]"
-                          data-target="mappable"
-                          data-value="{{ $json.hobbies[0] }}"
-                        >
-                          <svg
-                            aria-hidden="true"
-                            class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                            data-icon="font"
-                            data-prefix="fas"
-                            focusable="false"
-                            role="img"
-                            viewBox="0 0 448 512"
-                            xmlns="http://www.w3.org/2000/svg"
-                          >
-                            <path
-                              class=""
-                              d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                              fill="currentColor"
-                            />
-                          </svg>
-                          <span
-                            class="content"
-                          >
-                            
-                            <span>
-                              <!--v-if-->
-                              hobbies
-                            </span>
-                            
-                          </span>
-                          <span
-                            class="content arrayIndex"
-                          >
-                            
-                            <span>
-                              <!--v-if-->
-                              [0]
-                            </span>
-                            
-                          </span>
-                        </span>
-                      </div>
-                      <span
-                        class="text"
-                        data-test-id="run-data-schema-item-value"
-                      >
-                        
-                        
-                        <!--v-if-->
-                        <span
-                          class="content"
-                        >
-                          
-                          <span>
-                            <!--v-if-->
-                            surfing
-                          </span>
-                          
-                        </span>
-                        
-                        
-                      </span>
-                    </div>
-                    <!--v-if-->
-                    <!--v-if-->
-                    <!--v-if-->
-                  </div>
-                  <div
-                    class="item"
-                    data-test-id="run-data-schema-item"
-                  >
-                    <div
-                      class="itemContent"
-                    >
-                      <div
-                        class="pill mappable"
-                        title="string"
-                      >
-                        <span
-                          class="label"
-                          data-depth="2"
-                          data-name="string[1]"
-                          data-path=".hobbies[1]"
-                          data-target="mappable"
-                          data-value="{{ $json.hobbies[1] }}"
-                        >
-                          <svg
-                            aria-hidden="true"
-                            class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                            data-icon="font"
-                            data-prefix="fas"
-                            focusable="false"
-                            role="img"
-                            viewBox="0 0 448 512"
-                            xmlns="http://www.w3.org/2000/svg"
-                          >
-                            <path
-                              class=""
-                              d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                              fill="currentColor"
-                            />
-                          </svg>
-                          <span
-                            class="content"
-                          >
-                            
-                            <span>
-                              <!--v-if-->
-                              hobbies
-                            </span>
-                            
-                          </span>
-                          <span
-                            class="content arrayIndex"
-                          >
-                            
-                            <span>
-                              <!--v-if-->
-                              [1]
-                            </span>
-                            
-                          </span>
-                        </span>
-                      </div>
-                      <span
-                        class="text"
-                        data-test-id="run-data-schema-item-value"
-                      >
-                        
-                        
-                        <!--v-if-->
-                        <span
-                          class="content"
-                        >
-                          
-                          <span>
-                            <!--v-if-->
-                            traveling
-                          </span>
-                          
-                        </span>
-                        
-                        
-                      </span>
-                    </div>
-                    <!--v-if-->
-                    <!--v-if-->
-                    <!--v-if-->
-                  </div>
-                  
-                </div>
-              </div>
-            </div>
-            
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`RunDataSchema.vue > renders schema with spaces and dots 1`] = `
-<div>
-  <div
-    class="schemaWrapper"
-    data-v-46dade00=""
-  >
-    <!--v-if-->
-    
-    <div
-      class="node"
-      data-test-id="run-data-schema-node"
-      data-v-46dade00=""
-    >
-      <div
-        class="header"
-        data-test-id="run-data-schema-node-header"
-        data-v-46dade00=""
-      >
-        <div
-          class="expand"
-          data-v-46dade00=""
-        >
-          <svg
-            aria-hidden="true"
-            class="svg-inline--fa fa-angle-right fa-w-8 expandIcon"
-            data-icon="angle-right"
-            data-prefix="fas"
-            data-v-46dade00=""
-            focusable="false"
-            role="img"
-            viewBox="0 0 256 512"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              class=""
-              d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-              fill="currentColor"
-            />
-          </svg>
-        </div>
-        <div
-          class="titleContainer"
-          data-test-id="run-data-schema-node-name"
-          data-v-46dade00=""
-        >
-          <div
-            class="nodeIcon"
-            data-v-46dade00=""
-          >
-            <div
-              class="n8n-node-icon"
-              data-v-46dade00=""
-            >
-              <div
-                class="nodeIconWrapper"
-                style="width: 12px; height: 12px; font-size: 12px; line-height: 12px;"
-              >
-                <!-- ElementUI tooltip is prone to memory-leaking so we only render it if we really need it -->
-                
-                <div
-                  class="icon"
-                >
-                  <img
-                    class="nodeIconImage"
-                  />
-                  <!--v-if-->
-                </div>
-                
-              </div>
-            </div>
-          </div>
-          <div
-            class="title"
-            data-v-46dade00=""
-          >
-            Set1 
-            <!--v-if-->
-          </div>
-          <!--v-if-->
-        </div>
-        <transition-stub
-          appear="false"
-          css="true"
-          data-v-46dade00=""
-          name="items"
-          persisted="false"
-        >
-          <!--v-if-->
-        </transition-stub>
-      </div>
-      <div
-        class=""
-        data-v-46dade00=""
-      >
-        
-        <transition-stub
-          appear="false"
-          css="true"
-          data-v-46dade00=""
-          name="schema"
-          persisted="false"
-        >
-          <div
-            class="schema animated"
-            data-test-id="run-data-schema-node-schema"
-            data-v-46dade00=""
-          >
-            <div
-              class="innerSchema"
-              data-v-46dade00=""
-            >
-              <div
-                class="item"
-                data-test-id="run-data-schema-item"
-                data-v-46dade00=""
-              >
-                <div
-                  class="itemContent"
-                >
-                  <!--v-if-->
-                  <!--v-if-->
-                </div>
-                <!--v-if-->
-                <!--v-if-->
-                <div
-                  class="sub"
-                >
-                  <div
-                    class="innerSub"
-                  >
-                    
-                    <div
-                      class="item"
-                      data-test-id="run-data-schema-item"
-                    >
-                      <div
-                        class="itemContent"
-                      >
-                        <div
-                          class="pill mappable"
-                          title="array"
-                        >
-                          <span
-                            class="label"
-                            data-depth="1"
-                            data-name="hello world"
-                            data-path="['hello world']"
-                            data-target="mappable"
-                            data-value="{{ $json['hello world'] }}"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="svg-inline--fa fa-list fa-w-16 fa-sm"
-                              data-icon="list"
-                              data-prefix="fas"
-                              focusable="false"
-                              role="img"
-                              viewBox="0 0 512 512"
-                              xmlns="http://www.w3.org/2000/svg"
-                            >
-                              <path
-                                class=""
-                                d="M80 368H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm0-320H16A16 16 0 0 0 0 64v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16V64a16 16 0 0 0-16-16zm0 160H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm416 176H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zm0-320H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16V80a16 16 0 0 0-16-16zm0 160H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16z"
-                                fill="currentColor"
-                              />
-                            </svg>
-                            <!--v-if-->
-                            <span
-                              class="content"
-                            >
-                              
-                              <span>
-                                <!--v-if-->
-                                hello world
-                              </span>
-                              
-                            </span>
-                          </span>
-                        </div>
-                        <!--v-if-->
-                      </div>
-                      <input
-                        checked=""
-                        id="ndv_set_1-hello world"
-                        inert=""
-                        type="checkbox"
-                      />
-                      <label
-                        class="toggle"
-                        for="ndv_set_1-hello world"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="svg-inline--fa fa-angle-right fa-w-8"
-                          data-icon="angle-right"
-                          data-prefix="fas"
-                          focusable="false"
-                          role="img"
-                          viewBox="0 0 256 512"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            class=""
-                            d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-                            fill="currentColor"
-                          />
-                        </svg>
-                      </label>
-                      <div
-                        class="sub"
-                      >
-                        <div
-                          class="innerSub"
-                        >
-                          
-                          <div
-                            class="item"
-                            data-test-id="run-data-schema-item"
-                          >
-                            <div
-                              class="itemContent"
-                            >
-                              <div
-                                class="pill mappable"
-                                title="object"
-                              >
-                                <span
-                                  class="label"
-                                  data-depth="2"
-                                  data-name="object[0]"
-                                  data-path="['hello world'][0]"
-                                  data-target="mappable"
-                                  data-value="{{ $json['hello world'][0] }}"
-                                >
-                                  <svg
-                                    aria-hidden="true"
-                                    class="svg-inline--fa fa-cube fa-w-16 fa-sm"
-                                    data-icon="cube"
-                                    data-prefix="fas"
-                                    focusable="false"
-                                    role="img"
-                                    viewBox="0 0 512 512"
-                                    xmlns="http://www.w3.org/2000/svg"
-                                  >
-                                    <path
-                                      class=""
-                                      d="M239.1 6.3l-208 78c-18.7 7-31.1 25-31.1 45v225.1c0 18.2 10.3 34.8 26.5 42.9l208 104c13.5 6.8 29.4 6.8 42.9 0l208-104c16.3-8.1 26.5-24.8 26.5-42.9V129.3c0-20-12.4-37.9-31.1-44.9l-208-78C262 2.2 250 2.2 239.1 6.3zM256 68.4l192 72v1.1l-192 78-192-78v-1.1l192-72zm32 356V275.5l160-65v133.9l-160 80z"
-                                      fill="currentColor"
-                                    />
-                                  </svg>
-                                  <span
-                                    class="content"
-                                  >
-                                    
-                                    <span>
-                                      <!--v-if-->
-                                      hello world
-                                    </span>
-                                    
-                                  </span>
-                                  <span
-                                    class="content arrayIndex"
-                                  >
-                                    
-                                    <span>
-                                      <!--v-if-->
-                                      [0]
-                                    </span>
-                                    
-                                  </span>
-                                </span>
-                              </div>
-                              <!--v-if-->
-                            </div>
-                            <input
-                              checked=""
-                              id="ndv_set_1-hello world-0"
-                              inert=""
-                              type="checkbox"
-                            />
-                            <label
-                              class="toggle"
-                              for="ndv_set_1-hello world-0"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="svg-inline--fa fa-angle-right fa-w-8"
-                                data-icon="angle-right"
-                                data-prefix="fas"
-                                focusable="false"
-                                role="img"
-                                viewBox="0 0 256 512"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  class=""
-                                  d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-                                  fill="currentColor"
-                                />
-                              </svg>
-                            </label>
-                            <div
-                              class="sub"
-                            >
-                              <div
-                                class="innerSub"
-                              >
-                                
-                                <div
-                                  class="item"
-                                  data-test-id="run-data-schema-item"
-                                >
-                                  <div
-                                    class="itemContent"
-                                  >
-                                    <div
-                                      class="pill mappable"
-                                      title="object"
-                                    >
-                                      <span
-                                        class="label"
-                                        data-depth="3"
-                                        data-name="test"
-                                        data-path="['hello world'][0].test"
-                                        data-target="mappable"
-                                        data-value="{{ $json['hello world'][0].test }}"
-                                      >
-                                        <svg
-                                          aria-hidden="true"
-                                          class="svg-inline--fa fa-cube fa-w-16 fa-sm"
-                                          data-icon="cube"
-                                          data-prefix="fas"
-                                          focusable="false"
-                                          role="img"
-                                          viewBox="0 0 512 512"
-                                          xmlns="http://www.w3.org/2000/svg"
-                                        >
-                                          <path
-                                            class=""
-                                            d="M239.1 6.3l-208 78c-18.7 7-31.1 25-31.1 45v225.1c0 18.2 10.3 34.8 26.5 42.9l208 104c13.5 6.8 29.4 6.8 42.9 0l208-104c16.3-8.1 26.5-24.8 26.5-42.9V129.3c0-20-12.4-37.9-31.1-44.9l-208-78C262 2.2 250 2.2 239.1 6.3zM256 68.4l192 72v1.1l-192 78-192-78v-1.1l192-72zm32 356V275.5l160-65v133.9l-160 80z"
-                                            fill="currentColor"
-                                          />
-                                        </svg>
-                                        <!--v-if-->
-                                        <span
-                                          class="content"
-                                        >
-                                          
-                                          <span>
-                                            <!--v-if-->
-                                            test
-                                          </span>
-                                          
-                                        </span>
-                                      </span>
-                                    </div>
-                                    <!--v-if-->
-                                  </div>
-                                  <input
-                                    checked=""
-                                    id="ndv_set_1-hello world-0-test"
-                                    inert=""
-                                    type="checkbox"
-                                  />
-                                  <label
-                                    class="toggle"
-                                    for="ndv_set_1-hello world-0-test"
-                                  >
-                                    <svg
-                                      aria-hidden="true"
-                                      class="svg-inline--fa fa-angle-right fa-w-8"
-                                      data-icon="angle-right"
-                                      data-prefix="fas"
-                                      focusable="false"
-                                      role="img"
-                                      viewBox="0 0 256 512"
-                                      xmlns="http://www.w3.org/2000/svg"
-                                    >
-                                      <path
-                                        class=""
-                                        d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-                                        fill="currentColor"
-                                      />
-                                    </svg>
-                                  </label>
-                                  <div
-                                    class="sub"
-                                  >
-                                    <div
-                                      class="innerSub"
-                                    >
-                                      
-                                      <div
-                                        class="item"
-                                        data-test-id="run-data-schema-item"
-                                      >
-                                        <div
-                                          class="itemContent"
-                                        >
-                                          <div
-                                            class="pill mappable"
-                                            title="number"
-                                          >
-                                            <span
-                                              class="label"
-                                              data-depth="4"
-                                              data-name="more to think about"
-                                              data-path="['hello world'][0].test['more to think about']"
-                                              data-target="mappable"
-                                              data-value="{{ $json['hello world'][0].test['more to think about'] }}"
-                                            >
-                                              <svg
-                                                aria-hidden="true"
-                                                class="svg-inline--fa fa-hashtag fa-w-14 fa-sm"
-                                                data-icon="hashtag"
-                                                data-prefix="fas"
-                                                focusable="false"
-                                                role="img"
-                                                viewBox="0 0 448 512"
-                                                xmlns="http://www.w3.org/2000/svg"
-                                              >
-                                                <path
-                                                  class=""
-                                                  d="M440.667 182.109l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l14.623-81.891C377.123 38.754 371.468 32 363.997 32h-40.632a12 12 0 0 0-11.813 9.891L296.175 128H197.54l14.623-81.891C213.477 38.754 207.822 32 200.35 32h-40.632a12 12 0 0 0-11.813 9.891L132.528 128H53.432a12 12 0 0 0-11.813 9.891l-7.143 40C33.163 185.246 38.818 192 46.289 192h74.81L98.242 320H19.146a12 12 0 0 0-11.813 9.891l-7.143 40C-1.123 377.246 4.532 384 12.003 384h74.81L72.19 465.891C70.877 473.246 76.532 480 84.003 480h40.632a12 12 0 0 0 11.813-9.891L151.826 384h98.634l-14.623 81.891C234.523 473.246 240.178 480 247.65 480h40.632a12 12 0 0 0 11.813-9.891L315.472 384h79.096a12 12 0 0 0 11.813-9.891l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l22.857-128h79.096a12 12 0 0 0 11.813-9.891zM261.889 320h-98.634l22.857-128h98.634l-22.857 128z"
-                                                  fill="currentColor"
-                                                />
-                                              </svg>
-                                              <!--v-if-->
-                                              <span
-                                                class="content"
-                                              >
-                                                
-                                                <span>
-                                                  <!--v-if-->
-                                                  more to think about
-                                                </span>
-                                                
-                                              </span>
-                                            </span>
-                                          </div>
-                                          <span
-                                            class="text"
-                                            data-test-id="run-data-schema-item-value"
-                                          >
-                                            
-                                            
-                                            <!--v-if-->
-                                            <span
-                                              class="content"
-                                            >
-                                              
-                                              <span>
-                                                <!--v-if-->
-                                                1
-                                              </span>
-                                              
-                                            </span>
-                                            
-                                            
-                                          </span>
-                                        </div>
-                                        <!--v-if-->
-                                        <!--v-if-->
-                                        <!--v-if-->
-                                      </div>
-                                      
-                                    </div>
-                                  </div>
-                                </div>
-                                <div
-                                  class="item"
-                                  data-test-id="run-data-schema-item"
-                                >
-                                  <div
-                                    class="itemContent"
-                                  >
-                                    <div
-                                      class="pill mappable"
-                                      title="string"
-                                    >
-                                      <span
-                                        class="label"
-                                        data-depth="3"
-                                        data-name="test.how"
-                                        data-path="['hello world'][0]['test.how']"
-                                        data-target="mappable"
-                                        data-value="{{ $json['hello world'][0]['test.how'] }}"
-                                      >
-                                        <svg
-                                          aria-hidden="true"
-                                          class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                                          data-icon="font"
-                                          data-prefix="fas"
-                                          focusable="false"
-                                          role="img"
-                                          viewBox="0 0 448 512"
-                                          xmlns="http://www.w3.org/2000/svg"
-                                        >
-                                          <path
-                                            class=""
-                                            d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                                            fill="currentColor"
-                                          />
-                                        </svg>
-                                        <!--v-if-->
-                                        <span
-                                          class="content"
-                                        >
-                                          
-                                          <span>
-                                            <!--v-if-->
-                                            test.how
-                                          </span>
-                                          
-                                        </span>
-                                      </span>
-                                    </div>
-                                    <span
-                                      class="text"
-                                      data-test-id="run-data-schema-item-value"
-                                    >
-                                      
-                                      
-                                      <!--v-if-->
-                                      <span
-                                        class="content"
-                                      >
-                                        
-                                        <span>
-                                          <!--v-if-->
-                                          ignore
-                                        </span>
-                                        
-                                      </span>
-                                      
-                                      
-                                    </span>
-                                  </div>
-                                  <!--v-if-->
-                                  <!--v-if-->
-                                  <!--v-if-->
-                                </div>
-                                
-                              </div>
-                            </div>
-                          </div>
-                          
-                        </div>
-                      </div>
-                    </div>
-                    
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </transition-stub>
-        
-        <!--teleport start-->
-        <!--teleport end-->
-      </div>
-    </div>
-    <div
-      class="node"
-      data-test-id="run-data-schema-node"
-      data-v-46dade00=""
-    >
-      <div
-        class="header"
-        data-test-id="run-data-schema-node-header"
-        data-v-46dade00=""
-      >
-        <div
-          class="expand"
-          data-v-46dade00=""
-        >
-          <svg
-            aria-hidden="true"
-            class="svg-inline--fa fa-angle-right fa-w-8 expandIcon"
-            data-icon="angle-right"
-            data-prefix="fas"
-            data-v-46dade00=""
-            focusable="false"
-            role="img"
-            viewBox="0 0 256 512"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              class=""
-              d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-              fill="currentColor"
-            />
-          </svg>
-        </div>
-        <div
-          class="titleContainer"
-          data-test-id="run-data-schema-node-name"
-          data-v-46dade00=""
-        >
-          <div
-            class="nodeIcon"
-            data-v-46dade00=""
-          >
-            <div
-              class="n8n-node-icon"
-              data-v-46dade00=""
-            >
-              <div
-                class="nodeIconWrapper"
-                style="width: 12px; height: 12px; font-size: 12px; line-height: 12px;"
-              >
-                <!-- ElementUI tooltip is prone to memory-leaking so we only render it if we really need it -->
-                
-                <div
-                  class="icon"
-                >
-                  <img
-                    class="nodeIconImage"
-                  />
-                  <!--v-if-->
-                </div>
-                
-              </div>
-            </div>
-          </div>
-          <div
-            class="title"
-            data-v-46dade00=""
-          >
-            Set2 
-            <!--v-if-->
-          </div>
-          <!--v-if-->
-        </div>
-        <transition-stub
-          appear="false"
-          css="true"
-          data-v-46dade00=""
-          name="items"
-          persisted="false"
-        >
-          <!--v-if-->
-        </transition-stub>
-      </div>
-      <div
-        class=""
-        data-v-46dade00=""
-      >
-        
-        <transition-stub
-          appear="false"
-          css="true"
-          data-v-46dade00=""
-          name="schema"
-          persisted="false"
-        >
-          <!--v-if-->
-        </transition-stub>
-        
-        <!--teleport start-->
-        <!--teleport end-->
-      </div>
-    </div>
-    
-  </div>
-</div>
-`;
diff --git a/packages/editor-ui/src/components/__snapshots__/VirtualSchema.test.ts.snap b/packages/editor-ui/src/components/__snapshots__/VirtualSchema.test.ts.snap
index 7c1fa631396af..d7d666d2bbbf8 100644
--- a/packages/editor-ui/src/components/__snapshots__/VirtualSchema.test.ts.snap
+++ b/packages/editor-ui/src/components/__snapshots__/VirtualSchema.test.ts.snap
@@ -1,6 +1,6 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`RunDataSchema.vue > renders previous nodes schema for AI tools 1`] = `
+exports[`VirtualSchema.vue > renders previous nodes schema for AI tools 1`] = `
 <div
   class="schema-header"
   data-test-id="run-data-schema-header"
@@ -75,7 +75,7 @@ exports[`RunDataSchema.vue > renders previous nodes schema for AI tools 1`] = `
 </div>
 `;
 
-exports[`RunDataSchema.vue > renders schema for correct output branch 1`] = `
+exports[`VirtualSchema.vue > renders schema for correct output branch 1`] = `
 <div
   class="schema-header"
   data-test-id="run-data-schema-header"
@@ -150,7 +150,7 @@ exports[`RunDataSchema.vue > renders schema for correct output branch 1`] = `
 </div>
 `;
 
-exports[`RunDataSchema.vue > renders schema in output pane 1`] = `
+exports[`VirtualSchema.vue > renders schema in output pane 1`] = `
 <div>
   <div
     class="run-data-schema full-height"
@@ -584,7 +584,7 @@ exports[`RunDataSchema.vue > renders schema in output pane 1`] = `
 </div>
 `;
 
-exports[`RunDataSchema.vue > renders schema with spaces and dots 1`] = `
+exports[`VirtualSchema.vue > renders schema with spaces and dots 1`] = `
 <div>
   <div
     class="run-data-schema full-height"
diff --git a/packages/editor-ui/src/components/canvas/Canvas.vue b/packages/editor-ui/src/components/canvas/Canvas.vue
index 6826259b7ee83..372b95370ba98 100644
--- a/packages/editor-ui/src/components/canvas/Canvas.vue
+++ b/packages/editor-ui/src/components/canvas/Canvas.vue
@@ -8,7 +8,6 @@ import type {
 } from '@/types';
 import type { Connection, XYPosition, NodeDragEvent, GraphNode } from '@vue-flow/core';
 import { useVueFlow, VueFlow, PanelPosition, MarkerType } from '@vue-flow/core';
-import { Background } from '@vue-flow/background';
 import { MiniMap } from '@vue-flow/minimap';
 import Node from './elements/nodes/CanvasNode.vue';
 import Edge from './elements/edges/CanvasEdge.vue';
@@ -25,7 +24,7 @@ import { GRID_SIZE } from '@/utils/nodeViewUtils';
 import { CanvasKey } from '@/constants';
 import { onKeyDown, onKeyUp, useThrottleFn } from '@vueuse/core';
 import CanvasArrowHeadMarker from './elements/edges/CanvasArrowHeadMarker.vue';
-import CanvasBackgroundStripedPattern from './elements/CanvasBackgroundStripedPattern.vue';
+import CanvasBackground from './elements/background/CanvasBackground.vue';
 import { useCanvasTraversal } from '@/composables/useCanvasTraversal';
 import { NodeConnectionType } from 'n8n-workflow';
 
@@ -40,6 +39,8 @@ const emit = defineEmits<{
 	'update:node:selected': [id: string];
 	'update:node:name': [id: string];
 	'update:node:parameters': [id: string, parameters: Record<string, unknown>];
+	'update:node:inputs': [id: string];
+	'update:node:outputs': [id: string];
 	'click:node:add': [id: string, handle: string];
 	'run:node': [id: string];
 	'delete:node': [id: string];
@@ -65,6 +66,7 @@ const emit = defineEmits<{
 	'run:workflow': [];
 	'save:workflow': [];
 	'create:workflow': [];
+	'drag-and-drop': [position: XYPosition, event: DragEvent];
 }>();
 
 const props = withDefaults(
@@ -147,10 +149,12 @@ const selectionKeyCode = ref<true | null>(true);
 
 onKeyDown(panningKeyCode.value, () => {
 	selectionKeyCode.value = null;
+	panningMouseButton.value = [0, 1];
 });
 
 onKeyUp(panningKeyCode.value, () => {
 	selectionKeyCode.value = true;
+	panningMouseButton.value = [1];
 });
 
 function selectLeftNode(id: string) {
@@ -300,6 +304,14 @@ function onUpdateNodeParameters(id: string, parameters: Record<string, unknown>)
 	emit('update:node:parameters', id, parameters);
 }
 
+function onUpdateNodeInputs(id: string) {
+	emit('update:node:inputs', id);
+}
+
+function onUpdateNodeOutputs(id: string) {
+	emit('update:node:outputs', id);
+}
+
 /**
  * Connections / Edges
  */
@@ -533,6 +545,20 @@ function onContextMenuAction(action: ContextMenuAction, nodeIds: string[]) {
 	}
 }
 
+/**
+ * Drag and drop
+ */
+
+function onDragOver(event: DragEvent) {
+	event.preventDefault();
+}
+
+function onDrop(event: DragEvent) {
+	const position = getProjectedPosition(event);
+
+	emit('drag-and-drop', position, event);
+}
+
 /**
  * Minimap
  */
@@ -624,6 +650,7 @@ provide(CanvasKey, {
 		:id="id"
 		:nodes="nodes"
 		:edges="connections"
+		:class="classes"
 		:apply-changes="false"
 		:connection-line-options="{ markerEnd: MarkerType.ArrowClosed }"
 		:connection-radius="60"
@@ -633,7 +660,6 @@ provide(CanvasKey, {
 		:snap-grid="[GRID_SIZE, GRID_SIZE]"
 		:min-zoom="0"
 		:max-zoom="4"
-		:class="classes"
 		:selection-key-code="selectionKeyCode"
 		:pan-activation-key-code="panningKeyCode"
 		:disable-keyboard-a11y="true"
@@ -642,11 +668,13 @@ provide(CanvasKey, {
 		@connect="onConnect"
 		@connect-end="onConnectEnd"
 		@pane-click="onClickPane"
-		@contextmenu="onOpenContextMenu"
+		@pane-context-menu="onOpenContextMenu"
 		@move-start="onPaneMoveStart"
 		@move-end="onPaneMoveEnd"
 		@node-drag-stop="onNodeDragStop"
 		@selection-drag-stop="onSelectionDragStop"
+		@dragover="onDragOver"
+		@drop="onDrop"
 	>
 		<template #node-canvas-node="nodeProps">
 			<Node
@@ -661,6 +689,8 @@ provide(CanvasKey, {
 				@activate="onSetNodeActive"
 				@open:contextmenu="onOpenNodeContextMenu"
 				@update="onUpdateNodeParameters"
+				@update:inputs="onUpdateNodeInputs"
+				@update:outputs="onUpdateNodeOutputs"
 				@move="onUpdateNodePosition"
 				@add="onClickNodeAdd"
 			/>
@@ -685,16 +715,7 @@ provide(CanvasKey, {
 
 		<CanvasArrowHeadMarker :id="arrowHeadMarkerId" />
 
-		<Background data-test-id="canvas-background" pattern-color="#aaa" :gap="GRID_SIZE">
-			<template v-if="readOnly" #pattern-container="patternProps">
-				<CanvasBackgroundStripedPattern
-					:id="patternProps.id"
-					:x="viewport.x"
-					:y="viewport.y"
-					:zoom="viewport.zoom"
-				/>
-			</template>
-		</Background>
+		<CanvasBackground :viewport="viewport" :striped="readOnly" />
 
 		<Transition name="minimap">
 			<MiniMap
@@ -734,7 +755,10 @@ provide(CanvasKey, {
 
 <style lang="scss" module>
 .canvas {
+	width: 100%;
+	height: 100%;
 	opacity: 0;
+	transition: opacity 300ms ease;
 
 	&.ready {
 		opacity: 1;
diff --git a/packages/editor-ui/src/components/canvas/elements/background/CanvasBackground.test.ts b/packages/editor-ui/src/components/canvas/elements/background/CanvasBackground.test.ts
new file mode 100644
index 0000000000000..cef24134a83df
--- /dev/null
+++ b/packages/editor-ui/src/components/canvas/elements/background/CanvasBackground.test.ts
@@ -0,0 +1,33 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import CanvasBackground from '@/components/canvas/elements/background/CanvasBackground.vue';
+
+const renderComponent = createComponentRenderer(CanvasBackground);
+
+describe('CanvasBackground', () => {
+	it('should render the background with the correct gap', () => {
+		const { getByTestId, html } = renderComponent({
+			props: { striped: false, viewport: { x: 0, y: 0, zoom: 1 } },
+		});
+		const background = getByTestId('canvas-background');
+
+		expect(background).toBeInTheDocument();
+		expect(html()).toMatchSnapshot();
+	});
+
+	it('should render the striped pattern when striped is true', () => {
+		const { getByTestId } = renderComponent({
+			props: { striped: true, viewport: { x: 0, y: 0, zoom: 1 } },
+		});
+		const pattern = getByTestId('canvas-background-striped-pattern');
+
+		expect(pattern).toBeInTheDocument();
+	});
+
+	it('should not render the striped pattern when striped is false', () => {
+		const { getByTestId } = renderComponent({
+			props: { striped: false, viewport: { x: 0, y: 0, zoom: 1 } },
+		});
+
+		expect(() => getByTestId('canvas-background-striped-pattern')).toThrow();
+	});
+});
diff --git a/packages/editor-ui/src/components/canvas/elements/background/CanvasBackground.vue b/packages/editor-ui/src/components/canvas/elements/background/CanvasBackground.vue
new file mode 100644
index 0000000000000..a15ff96a9bc8c
--- /dev/null
+++ b/packages/editor-ui/src/components/canvas/elements/background/CanvasBackground.vue
@@ -0,0 +1,24 @@
+<script setup lang="ts">
+import { GRID_SIZE } from '@/utils/nodeViewUtils';
+import CanvasBackgroundStripedPattern from './CanvasBackgroundStripedPattern.vue';
+import { Background } from '@vue-flow/background';
+import type { ViewportTransform } from '@vue-flow/core';
+
+defineProps<{
+	striped: boolean;
+	viewport: ViewportTransform;
+}>();
+</script>
+<template>
+	<Background data-test-id="canvas-background" pattern-color="#aaa" :gap="GRID_SIZE">
+		<template v-if="striped" #pattern-container="patternProps">
+			<CanvasBackgroundStripedPattern
+				:id="patternProps.id"
+				data-test-id="canvas-background-striped-pattern"
+				:x="viewport.x"
+				:y="viewport.y"
+				:zoom="viewport.zoom"
+			/>
+		</template>
+	</Background>
+</template>
diff --git a/packages/editor-ui/src/components/canvas/elements/CanvasBackgroundStripedPattern.vue b/packages/editor-ui/src/components/canvas/elements/background/CanvasBackgroundStripedPattern.vue
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/CanvasBackgroundStripedPattern.vue
rename to packages/editor-ui/src/components/canvas/elements/background/CanvasBackgroundStripedPattern.vue
diff --git a/packages/editor-ui/src/components/canvas/elements/background/__snapshots__/CanvasBackground.test.ts.snap b/packages/editor-ui/src/components/canvas/elements/background/__snapshots__/CanvasBackground.test.ts.snap
new file mode 100644
index 0000000000000..fa764fae2fae2
--- /dev/null
+++ b/packages/editor-ui/src/components/canvas/elements/background/__snapshots__/CanvasBackground.test.ts.snap
@@ -0,0 +1,11 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`CanvasBackground > should render the background with the correct gap 1`] = `
+"<svg class="vue-flow__background vue-flow__container" style="height: 100%; width: 100%;" data-test-id="canvas-background">
+  <pattern id="pattern-vue-flow-0" x="0" y="0" width="20" height="20" patternTransform="translate(-11,-11)" patternUnits="userSpaceOnUse">
+    <circle cx="0.5" cy="0.5" r="0.5" fill="#aaa"></circle>
+    <!---->
+  </pattern>
+  <rect x="0" y="0" width="100%" height="100%" fill="url(#pattern-vue-flow-0)"></rect>
+</svg>"
+`;
diff --git a/packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.test.ts b/packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.test.ts
index 8b99a45090e37..85d8771109516 100644
--- a/packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.test.ts
+++ b/packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.test.ts
@@ -5,6 +5,7 @@ import { setActivePinia } from 'pinia';
 import type { ConnectionLineProps } from '@vue-flow/core';
 import { Position } from '@vue-flow/core';
 import { createCanvasProvide } from '@/__tests__/data';
+import { waitFor } from '@testing-library/vue';
 
 const DEFAULT_PROPS = {
 	sourceX: 0,
@@ -63,4 +64,19 @@ describe('CanvasConnectionLine', () => {
 			'M-50 130L-90 130L -124,130Q -140,130 -140,114L -140,-84Q -140,-100 -124,-100L-100 -100',
 		);
 	});
+
+	it('should show the connection line after a short delay', async () => {
+		vi.useFakeTimers();
+		const { container } = renderComponent({
+			props: DEFAULT_PROPS,
+		});
+
+		const edge = container.querySelector('.vue-flow__edge-path');
+
+		expect(edge).not.toHaveClass('visible');
+
+		vi.advanceTimersByTime(300);
+
+		await waitFor(() => expect(edge).toHaveClass('visible'));
+	});
 });
diff --git a/packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.vue b/packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.vue
index dddf41c9593df..e4833cb4c2d72 100644
--- a/packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.vue
+++ b/packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.vue
@@ -2,7 +2,7 @@
 /* eslint-disable vue/no-multiple-template-root */
 import type { ConnectionLineProps } from '@vue-flow/core';
 import { BaseEdge } from '@vue-flow/core';
-import { computed, useCssModule } from 'vue';
+import { computed, onMounted, ref, useCssModule } from 'vue';
 import { getEdgeRenderData } from './utils';
 import { useCanvas } from '@/composables/useCanvas';
 import { NodeConnectionType } from 'n8n-workflow';
@@ -18,6 +18,13 @@ const connectionType = computed(
 	() => parseCanvasConnectionHandleString(connectingHandle.value?.handleId).type,
 );
 
+const classes = computed(() => {
+	return {
+		[$style.edge]: true,
+		[$style.visible]: isVisible.value,
+	};
+});
+
 const edgeColor = computed(() => {
 	if (connectionType.value !== NodeConnectionType.Main) {
 		return 'var(--node-type-supplemental-color)';
@@ -37,13 +44,25 @@ const renderData = computed(() =>
 );
 
 const segments = computed(() => renderData.value.segments);
+
+/**
+ * Used to delay the visibility of the connection line to prevent flickering
+ * when the actual user intent is to click the plus button
+ */
+const isVisible = ref(false);
+
+onMounted(() => {
+	setTimeout(() => {
+		isVisible.value = true;
+	}, 300);
+});
 </script>
 
 <template>
 	<BaseEdge
 		v-for="segment in segments"
 		:key="segment[0]"
-		:class="$style.edge"
+		:class="classes"
 		:style="edgeStyle"
 		:path="segment[0]"
 		:marker-end="markerEnd"
@@ -52,6 +71,13 @@ const segments = computed(() => renderData.value.segments);
 
 <style lang="scss" module>
 .edge {
-	transition: stroke 0.3s ease;
+	transition-property: stroke, opacity;
+	transition-duration: 300ms;
+	transition-timing-function: ease;
+	opacity: 0;
+
+	&.visible {
+		opacity: 1;
+	}
 }
 </style>
diff --git a/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.test.ts b/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.test.ts
index 6e5e1ca87654c..3a2defc6a016d 100644
--- a/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.test.ts
+++ b/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.test.ts
@@ -81,18 +81,6 @@ describe('CanvasEdge', () => {
 		});
 	});
 
-	it('should correctly style a running connection', () => {
-		const { container } = renderComponent({
-			props: { ...DEFAULT_PROPS, data: { ...DEFAULT_PROPS.data, status: 'running' } },
-		});
-
-		const edge = container.querySelector('.vue-flow__edge-path');
-
-		expect(edge).toHaveStyle({
-			stroke: 'var(--color-primary)',
-		});
-	});
-
 	it('should correctly style a pinned connection', () => {
 		const { container } = renderComponent({
 			props: { ...DEFAULT_PROPS, data: { ...DEFAULT_PROPS.data, status: 'pinned' } },
diff --git a/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.vue b/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.vue
index 056878636e16b..feb15a8cbf756 100644
--- a/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.vue
+++ b/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.vue
@@ -44,8 +44,6 @@ const edgeColor = computed(() => {
 		return 'var(--color-success)';
 	} else if (status.value === 'pinned') {
 		return 'var(--color-secondary)';
-	} else if (status.value === 'running') {
-		return 'var(--color-primary)';
 	} else if (!isMainConnection.value) {
 		return 'var(--node-type-supplemental-color)';
 	} else if (props.selected) {
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
index e62046d5d7a9e..dd558bbef5365 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
@@ -31,6 +31,7 @@ import { useCanvas } from '@/composables/useCanvas';
 import { createCanvasConnectionHandleString } from '@/utils/canvasUtilsV2';
 import type { EventBus } from 'n8n-design-system';
 import { createEventBus } from 'n8n-design-system';
+import { isEqual } from 'lodash-es';
 
 type Props = NodeProps<CanvasNodeData> & {
 	readOnly?: boolean;
@@ -47,6 +48,8 @@ const emit = defineEmits<{
 	activate: [id: string];
 	'open:contextmenu': [id: string, event: MouseEvent, source: 'node-button' | 'node-right-click'];
 	update: [id: string, parameters: Record<string, unknown>];
+	'update:inputs': [id: string];
+	'update:outputs': [id: string];
 	move: [id: string, position: XYPosition];
 }>();
 
@@ -265,6 +268,18 @@ watch(
 	},
 );
 
+watch(inputs, (newValue, oldValue) => {
+	if (!isEqual(newValue, oldValue)) {
+		emit('update:inputs', props.id);
+	}
+});
+
+watch(outputs, (newValue, oldValue) => {
+	if (!isEqual(newValue, oldValue)) {
+		emit('update:outputs', props.id);
+	}
+});
+
 onMounted(() => {
 	props.eventBus?.on('nodes:action', emitCanvasNodeEvent);
 });
@@ -310,7 +325,6 @@ onBeforeUnmount(() => {
 
 		<CanvasNodeToolbar
 			v-if="nodeTypeDescription"
-			data-test-id="canvas-node-toolbar"
 			:read-only="readOnly"
 			:class="$style.canvasNodeToolbar"
 			@delete="onDelete"
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.test.ts b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.test.ts
index 619457e9034c8..54680b1347092 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.test.ts
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.test.ts
@@ -1,4 +1,4 @@
-import { fireEvent } from '@testing-library/vue';
+import { fireEvent, waitFor } from '@testing-library/vue';
 import CanvasNodeToolbar from '@/components/canvas/elements/nodes/CanvasNodeToolbar.vue';
 import { createComponentRenderer } from '@/__tests__/render';
 import { createCanvasNodeProvide, createCanvasProvide } from '@/__tests__/data';
@@ -137,4 +137,45 @@ describe('CanvasNodeToolbar', () => {
 
 		expect(emitted('update')[0]).toEqual([{ color: 1 }]);
 	});
+
+	it('should have "forceVisible" class when hovered', async () => {
+		const { getByTestId } = renderComponent({
+			global: {
+				provide: {
+					...createCanvasNodeProvide(),
+					...createCanvasProvide(),
+				},
+			},
+		});
+
+		const toolbar = getByTestId('canvas-node-toolbar');
+
+		await fireEvent.mouseEnter(toolbar);
+
+		expect(toolbar).toHaveClass('forceVisible');
+	});
+
+	it('should have "forceVisible" class when sticky color picker is visible', async () => {
+		const { getByTestId } = renderComponent({
+			global: {
+				provide: {
+					...createCanvasNodeProvide({
+						data: {
+							render: {
+								type: CanvasNodeRenderType.StickyNote,
+								options: { color: 3 },
+							},
+						},
+					}),
+					...createCanvasProvide(),
+				},
+			},
+		});
+
+		const toolbar = getByTestId('canvas-node-toolbar');
+
+		await fireEvent.click(getByTestId('change-sticky-color'));
+
+		await waitFor(() => expect(toolbar).toHaveClass('forceVisible'));
+	});
 });
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.vue b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.vue
index 4cb940b7576b4..d85a85b159a45 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, useCssModule } from 'vue';
+import { computed, ref, useCssModule } from 'vue';
 import { useI18n } from '@/composables/useI18n';
 import { useCanvasNode } from '@/composables/useCanvasNode';
 import { CanvasNodeRenderType } from '@/types';
@@ -27,9 +27,13 @@ const nodeDisabledTitle = computed(() => {
 	return isDisabled.value ? i18n.baseText('node.disable') : i18n.baseText('node.enable');
 });
 
+const isStickyColorSelectorOpen = ref(false);
+const isHovered = ref(false);
+
 const classes = computed(() => ({
 	[$style.canvasNodeToolbar]: true,
 	[$style.readOnly]: props.readOnly,
+	[$style.forceVisible]: isHovered.value || isStickyColorSelectorOpen.value,
 }));
 
 const isExecuteNodeVisible = computed(() => {
@@ -72,10 +76,23 @@ function onChangeStickyColor(color: number) {
 function onOpenContextMenu(event: MouseEvent) {
 	emit('open:contextmenu', event);
 }
+
+function onMouseEnter() {
+	isHovered.value = true;
+}
+
+function onMouseLeave() {
+	isHovered.value = false;
+}
 </script>
 
 <template>
-	<div :class="classes">
+	<div
+		data-test-id="canvas-node-toolbar"
+		:class="classes"
+		@mouseenter="onMouseEnter"
+		@mouseleave="onMouseLeave"
+	>
 		<div :class="$style.canvasNodeToolbarItems">
 			<N8nIconButton
 				v-if="isExecuteNodeVisible"
@@ -110,6 +127,7 @@ function onOpenContextMenu(event: MouseEvent) {
 			/>
 			<CanvasNodeStickyColorSelector
 				v-if="isStickyNoteChangeColorVisible"
+				v-model:visible="isStickyColorSelectorOpen"
 				@update="onChangeStickyColor"
 			/>
 			<N8nIconButton
@@ -143,4 +161,8 @@ function onOpenContextMenu(event: MouseEvent) {
 		--button-font-color: var(--color-text-light);
 	}
 }
+
+.forceVisible {
+	opacity: 1 !important;
+}
 </style>
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue
index 70a9005adcfaf..9c9f864a8601f 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue
@@ -158,7 +158,7 @@ function openContextMenu(event: MouseEvent) {
 	--configurable-node--icon-offset: 40px;
 	--configurable-node--icon-size: 30px;
 	--trigger-node--border-radius: 36px;
-	--canvas-node--status-icons-offset: var(--spacing-2xs);
+	--canvas-node--status-icons-offset: var(--spacing-3xs);
 
 	position: relative;
 	height: var(--canvas-node--height);
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.vue b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.vue
index 1fb597be690b2..969c97311f8d5 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.vue
@@ -103,12 +103,13 @@ onBeforeUnmount(() => {
 		v-bind="$attrs"
 		:id="id"
 		:class="classes"
-		data-test-id="canvas-sticky-note-node"
+		data-test-id="sticky"
 		:height="renderOptions.height"
 		:width="renderOptions.width"
 		:model-value="renderOptions.content"
 		:background-color="renderOptions.color"
 		:edit-mode="isActive"
+		:read-only="isReadOnly"
 		@edit="onEdit"
 		@dblclick="onDoubleClick"
 		@update:model-value="onInputChange"
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeStickyNote.test.ts.snap b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeStickyNote.test.ts.snap
index 211bab169fefe..658e31dc1e579 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeStickyNote.test.ts.snap
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeStickyNote.test.ts.snap
@@ -9,7 +9,7 @@ exports[`CanvasNodeStickyNote > should render node correctly 1`] = `
 <div class="vue-flow__resize-control nodrag top right handle"></div>
 <div class="vue-flow__resize-control nodrag bottom left handle"></div>
 <div class="vue-flow__resize-control nodrag bottom right handle"></div>
-<div class="n8n-sticky sticky clickable color-1 sticky" style="height: 180px; width: 240px;" data-test-id="canvas-sticky-note-node">
+<div class="n8n-sticky sticky clickable color-1 sticky" style="height: 180px; width: 240px;" data-test-id="sticky">
   <div class="wrapper">
     <div class="n8n-markdown">
       <div class="sticky"></div>
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/toolbar/CanvasNodeStickyColorSelector.vue b/packages/editor-ui/src/components/canvas/elements/nodes/toolbar/CanvasNodeStickyColorSelector.vue
index 3b05bb530257e..1e11fe6d98460 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/toolbar/CanvasNodeStickyColorSelector.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/toolbar/CanvasNodeStickyColorSelector.vue
@@ -14,13 +14,10 @@ const { render, eventBus } = useCanvasNode();
 const renderOptions = computed(() => render.value.options as CanvasNodeStickyNoteRender['options']);
 
 const autoHideTimeout = ref<NodeJS.Timeout | null>(null);
-const isPopoverVisible = ref(false);
 
 const colors = computed(() => Array.from({ length: 7 }).map((_, index) => index + 1));
 
-function togglePopover() {
-	isPopoverVisible.value = !isPopoverVisible.value;
-}
+const isPopoverVisible = defineModel<boolean>('visible');
 
 function hidePopover() {
 	isPopoverVisible.value = false;
@@ -59,22 +56,21 @@ onBeforeUnmount(() => {
 
 <template>
 	<N8nPopover
+		v-model:visible="isPopoverVisible"
 		effect="dark"
 		trigger="click"
 		placement="top"
 		:popper-class="$style.popover"
 		:popper-style="{ width: '208px' }"
-		:visible="isPopoverVisible"
-		:teleported="false"
-		@mouseenter="onMouseEnter"
-		@mouseleave="onMouseLeave"
+		:teleported="true"
+		@before-enter="onMouseEnter"
+		@after-leave="onMouseLeave"
 	>
 		<template #reference>
 			<div
 				:class="$style.option"
 				data-test-id="change-sticky-color"
 				:title="i18n.baseText('node.changeColor')"
-				@click.stop="togglePopover"
 			>
 				<FontAwesomeIcon icon="palette" />
 			</div>
diff --git a/packages/editor-ui/src/components/executions/ConcurrentExecutionsHeader.test.ts b/packages/editor-ui/src/components/executions/ConcurrentExecutionsHeader.test.ts
index 7e7c45b8d42ba..9089fa2934ca7 100644
--- a/packages/editor-ui/src/components/executions/ConcurrentExecutionsHeader.test.ts
+++ b/packages/editor-ui/src/components/executions/ConcurrentExecutionsHeader.test.ts
@@ -46,13 +46,12 @@ describe('ConcurrentExecutionsHeader', () => {
 		},
 	);
 
-	it('should show tooltip on hover and call "goToUpgrade" on click', async () => {
-		const windowOpenSpy = vi.spyOn(window, 'open').mockImplementation(() => null);
-
-		const { container, getByText, getByRole, queryByRole } = renderComponent({
+	it('should show tooltip on hover with Upgrade link and emit "goToUpgrade" on click when on cloud', async () => {
+		const { container, getByText, getByRole, queryByRole, emitted } = renderComponent({
 			props: {
 				runningExecutionsCount: 2,
 				concurrencyCap: 5,
+				isCloudDeployment: true,
 			},
 		});
 
@@ -68,6 +67,25 @@ describe('ConcurrentExecutionsHeader', () => {
 
 		await userEvent.click(getByText('Upgrade now'));
 
-		expect(windowOpenSpy).toHaveBeenCalled();
+		expect(emitted().goToUpgrade).toHaveLength(1);
+	});
+
+	it('should show tooltip on hover with Viev docs link when self-hosted', async () => {
+		const { container, getByText, getByRole, queryByRole } = renderComponent({
+			props: {
+				runningExecutionsCount: 2,
+				concurrencyCap: 5,
+			},
+		});
+
+		const tooltipTrigger = container.querySelector('svg') as SVGSVGElement;
+
+		expect(tooltipTrigger).toBeVisible();
+		expect(queryByRole('tooltip')).not.toBeInTheDocument();
+
+		await userEvent.hover(tooltipTrigger);
+
+		expect(getByRole('tooltip')).toBeVisible();
+		expect(getByText('View docs')).toBeVisible();
 	});
 });
diff --git a/packages/editor-ui/src/components/executions/ConcurrentExecutionsHeader.vue b/packages/editor-ui/src/components/executions/ConcurrentExecutionsHeader.vue
index 9ff46005461ce..0cf3c220ffd35 100644
--- a/packages/editor-ui/src/components/executions/ConcurrentExecutionsHeader.vue
+++ b/packages/editor-ui/src/components/executions/ConcurrentExecutionsHeader.vue
@@ -1,15 +1,18 @@
 <script lang="ts" setup>
-import { computed, defineProps } from 'vue';
+import { computed } from 'vue';
 import { useI18n } from '@/composables/useI18n';
-import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 
 const props = defineProps<{
 	runningExecutionsCount: number;
 	concurrencyCap: number;
+	isCloudDeployment?: boolean;
+}>();
+
+const emit = defineEmits<{
+	goToUpgrade: [];
 }>();
 
 const i18n = useI18n();
-const pageRedirectionHelper = usePageRedirectionHelper();
 
 const tooltipText = computed(() =>
 	i18n.baseText('executionsList.activeExecutions.tooltip', {
@@ -31,10 +34,6 @@ const headerText = computed(() => {
 		},
 	});
 });
-
-const goToUpgrade = () => {
-	void pageRedirectionHelper.goToUpgrade('concurrency', 'upgrade-concurrency');
-};
 </script>
 
 <template>
@@ -43,9 +42,22 @@ const goToUpgrade = () => {
 			<template #content>
 				<div :class="$style.tooltip">
 					{{ tooltipText }}
-					<n8n-link bold size="small" :class="$style.upgrade" @click="goToUpgrade">
+					<N8nLink
+						v-if="props.isCloudDeployment"
+						bold
+						size="small"
+						:class="$style.link"
+						@click="emit('goToUpgrade')"
+					>
 						{{ i18n.baseText('generic.upgradeNow') }}
-					</n8n-link>
+					</N8nLink>
+					<N8nLink
+						v-else
+						:class="$style.link"
+						:href="i18n.baseText('executions.concurrency.docsLink')"
+						target="_blank"
+						>{{ i18n.baseText('generic.viewDocs') }}</N8nLink
+					>
 				</div>
 			</template>
 			<font-awesome-icon icon="info-circle" class="mr-2xs" />
@@ -54,12 +66,12 @@ const goToUpgrade = () => {
 	</div>
 </template>
 
-<style module scoped>
+<style lang="scss" module>
 .tooltip {
 	display: flex;
 	flex-direction: column;
 }
-.upgrade {
+.link {
 	margin-top: var(--spacing-xs);
 }
 </style>
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue b/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue
index 38aeddda8046c..01b72dde508b6 100644
--- a/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue
+++ b/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue
@@ -16,6 +16,7 @@ import { getResourcePermissions } from '@/permissions';
 import { useSettingsStore } from '@/stores/settings.store';
 import ProjectHeader from '@/components/Projects/ProjectHeader.vue';
 import ConcurrentExecutionsHeader from '@/components/executions/ConcurrentExecutionsHeader.vue';
+import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 
 const props = withDefaults(
 	defineProps<{
@@ -40,6 +41,7 @@ const telemetry = useTelemetry();
 const workflowsStore = useWorkflowsStore();
 const executionsStore = useExecutionsStore();
 const settingsStore = useSettingsStore();
+const pageRedirectionHelper = usePageRedirectionHelper();
 
 const isMounted = ref(false);
 const allVisibleSelected = ref(false);
@@ -317,6 +319,10 @@ async function onAutoRefreshToggle(value: boolean) {
 		executionsStore.stopAutoRefreshInterval();
 	}
 }
+
+const goToUpgrade = () => {
+	void pageRedirectionHelper.goToUpgrade('concurrency', 'upgrade-concurrency');
+};
 </script>
 
 <template>
@@ -330,6 +336,8 @@ async function onAutoRefreshToggle(value: boolean) {
 						class="mr-xl"
 						:running-executions-count="runningExecutionsCount"
 						:concurrency-cap="settingsStore.concurrency"
+						:is-cloud-deployment="settingsStore.isCloudDeployment"
+						@go-to-upgrade="goToUpgrade"
 					/>
 					<N8nLoading v-if="!isMounted" :class="$style.filterLoader" variant="custom" />
 					<ElCheckbox
@@ -400,12 +408,14 @@ async function onAutoRefreshToggle(value: boolean) {
 						:workflow-permissions="getExecutionWorkflowPermissions(execution)"
 						:selected="selectedItems[execution.id] || allExistingSelected"
 						:concurrency-cap="settingsStore.concurrency"
+						:is-cloud-deployment="settingsStore.isCloudDeployment"
 						data-test-id="global-execution-list-item"
 						@stop="stopExecution"
 						@delete="deleteExecution"
 						@select="toggleSelectExecution"
 						@retry-saved="retrySavedExecution"
 						@retry-original="retryOriginalExecution"
+						@go-to-upgrade="goToUpgrade"
 					/>
 				</TransitionGroup>
 			</table>
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.test.ts b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.test.ts
index 5f15c9534f8c7..47e89f871498f 100644
--- a/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.test.ts
+++ b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.test.ts
@@ -1,6 +1,7 @@
-import { describe, it, expect, vi } from 'vitest';
+import { vi } from 'vitest';
 import { fireEvent } from '@testing-library/vue';
-import GlobalExecutionsListItem from './GlobalExecutionsListItem.vue';
+import { WAIT_INDEFINITELY } from 'n8n-workflow';
+import GlobalExecutionsListItem from '@/components/executions/global/GlobalExecutionsListItem.vue';
 import { createComponentRenderer } from '@/__tests__/render';
 import { DateTime } from 'luxon';
 
@@ -15,9 +16,20 @@ vi.mock('vue-router', async () => {
 	};
 });
 
+const globalExecutionsListItemQueuedTooltipRenderSpy = vi.fn();
+
 const renderComponent = createComponentRenderer(GlobalExecutionsListItem, {
 	global: {
-		stubs: ['font-awesome-icon', 'n8n-tooltip', 'n8n-button', 'i18n-t'],
+		//stubs: ['font-awesome-icon', 'n8n-tooltip', 'n8n-button', 'i18n-t'],
+		stubs: {
+			'font-awesome-icon': true,
+			'n8n-tooltip': true,
+			'n8n-button': true,
+			'i18n-t': true,
+			GlobalExecutionsListItemQueuedTooltip: {
+				render: globalExecutionsListItemQueuedTooltipRenderSpy,
+			},
+		},
 	},
 });
 
@@ -98,6 +110,7 @@ describe('GlobalExecutionsListItem', () => {
 
 		await fireEvent.click(getByText('TestWorkflow'));
 		expect(window.open).toHaveBeenCalledWith('mockedRoute', '_blank');
+		expect(globalExecutionsListItemQueuedTooltipRenderSpy).not.toHaveBeenCalled();
 	});
 
 	it('should show formatted start date', () => {
@@ -113,4 +126,50 @@ describe('GlobalExecutionsListItem', () => {
 			getByText(`1 Jan, 2022 at ${DateTime.fromJSDate(new Date(testDate)).toFormat('HH')}:00:00`),
 		).toBeInTheDocument();
 	});
+
+	it('should not render queued tooltip for a not indefinitely waiting execution', async () => {
+		renderComponent({
+			props: {
+				execution: {
+					status: 'waiting',
+					waitTill: new Date(Date.now() + 10000000).toISOString(),
+					id: 123,
+					workflowName: 'Test Workflow',
+				},
+				workflowPermissions: {},
+				concurrencyCap: 5,
+			},
+		});
+
+		expect(globalExecutionsListItemQueuedTooltipRenderSpy).not.toHaveBeenCalled();
+	});
+
+	it('should render queued tooltip for an indefinitely waiting execution', async () => {
+		renderComponent({
+			props: {
+				execution: {
+					status: 'waiting',
+					waitTill: WAIT_INDEFINITELY,
+					id: 123,
+					workflowName: 'Test Workflow',
+				},
+				workflowPermissions: {},
+				concurrencyCap: 5,
+			},
+		});
+
+		expect(globalExecutionsListItemQueuedTooltipRenderSpy).toHaveBeenCalled();
+	});
+
+	it('should render queued tooltip for a new execution', async () => {
+		renderComponent({
+			props: {
+				execution: { status: 'new', id: 123, workflowName: 'Test Workflow' },
+				workflowPermissions: {},
+				concurrencyCap: 5,
+			},
+		});
+
+		expect(globalExecutionsListItemQueuedTooltipRenderSpy).toHaveBeenCalled();
+	});
 });
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue
index d179476531a73..db8e7a6ef44f4 100644
--- a/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue
+++ b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue
@@ -8,6 +8,7 @@ import { i18n as locale } from '@/plugins/i18n';
 import ExecutionsTime from '@/components/executions/ExecutionsTime.vue';
 import { useExecutionHelpers } from '@/composables/useExecutionHelpers';
 import type { PermissionsRecord } from '@/permissions';
+import GlobalExecutionsListItemQueuedTooltip from '@/components/executions/global/GlobalExecutionsListItemQueuedTooltip.vue';
 
 type Command = 'retrySaved' | 'retryOriginal' | 'delete';
 
@@ -17,6 +18,7 @@ const emit = defineEmits<{
 	retrySaved: [data: ExecutionSummary];
 	retryOriginal: [data: ExecutionSummary];
 	delete: [data: ExecutionSummary];
+	goToUpgrade: [];
 }>();
 
 const props = withDefaults(
@@ -26,6 +28,7 @@ const props = withDefaults(
 		workflowName?: string;
 		workflowPermissions: PermissionsRecord['workflow'];
 		concurrencyCap: number;
+		isCloudDeployment?: boolean;
 	}>(),
 	{
 		selected: false,
@@ -84,19 +87,6 @@ const formattedStoppedAtDate = computed(() => {
 		: '';
 });
 
-const statusTooltipText = computed(() => {
-	if (isQueued.value) {
-		return i18n.baseText('executionsList.statusTooltipText.waitingForConcurrencyCapacity', {
-			interpolate: { concurrencyCap: props.concurrencyCap },
-		});
-	}
-
-	if (props.execution.status === 'waiting' && isWaitTillIndefinite.value) {
-		return i18n.baseText('executionsList.statusTooltipText.theWorkflowIsWaitingIndefinitely');
-	}
-	return '';
-});
-
 const statusText = computed(() => {
 	switch (props.execution.status) {
 		case 'waiting':
@@ -208,12 +198,15 @@ async function handleActionItemClick(commandData: Command) {
 						/>
 					</template>
 				</i18n-t>
-				<N8nTooltip v-else placement="top">
-					<template #content>
-						<span>{{ statusTooltipText }}</span>
-					</template>
+				<GlobalExecutionsListItemQueuedTooltip
+					v-else
+					:status="props.execution.status"
+					:concurrency-cap="props.concurrencyCap"
+					:is-cloud-deployment="props.isCloudDeployment"
+					@go-to-upgrade="emit('goToUpgrade')"
+				>
 					<span :class="$style.status">{{ statusText }}</span>
-				</N8nTooltip>
+				</GlobalExecutionsListItemQueuedTooltip>
 			</div>
 		</td>
 		<td>
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItemQueuedTooltip.test.ts b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItemQueuedTooltip.test.ts
new file mode 100644
index 0000000000000..b2008227999de
--- /dev/null
+++ b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItemQueuedTooltip.test.ts
@@ -0,0 +1,76 @@
+import userEvent from '@testing-library/user-event';
+import { createComponentRenderer } from '@/__tests__/render';
+import GlobalExecutionsListItemQueuedTooltip from '@/components/executions/global/GlobalExecutionsListItemQueuedTooltip.vue';
+
+const renderComponent = createComponentRenderer(GlobalExecutionsListItemQueuedTooltip);
+
+describe('GlobalExecutionsListItemQueuedTooltip', () => {
+	it('should not throw error when rendered', async () => {
+		expect(() =>
+			renderComponent({
+				props: {
+					status: 'waiting',
+					concurrencyCap: 0,
+				},
+				slots: {
+					default: 'Waiting',
+				},
+			}),
+		).not.toThrow();
+	});
+
+	it('should show waiting indefinitely tooltip', async () => {
+		const { getByText } = renderComponent({
+			props: {
+				status: 'waiting',
+				concurrencyCap: 0,
+			},
+			slots: {
+				default: 'Waiting',
+			},
+		});
+
+		await userEvent.hover(getByText('Waiting'));
+
+		expect(getByText(/waiting indefinitely/)).toBeVisible();
+	});
+
+	it('should show queued tooltip for self-hosted', async () => {
+		const { getByText } = renderComponent({
+			props: {
+				status: 'new',
+				concurrencyCap: 0,
+			},
+			slots: {
+				default: 'Queued',
+			},
+		});
+
+		await userEvent.hover(getByText('Queued'));
+
+		expect(getByText(/instance is limited/)).toBeVisible();
+		expect(getByText('View docs')).toBeVisible();
+	});
+
+	it('should show queued tooltip for cloud', async () => {
+		const { getByText, emitted } = renderComponent({
+			props: {
+				status: 'new',
+				concurrencyCap: 0,
+				isCloudDeployment: true,
+			},
+			slots: {
+				default: 'Queued',
+			},
+		});
+
+		await userEvent.hover(getByText('Queued'));
+
+		expect(getByText(/plan is limited/)).toBeVisible();
+		expect(getByText('Upgrade now')).toBeVisible();
+
+		await userEvent.click(getByText('Upgrade now'));
+
+		expect(emitted().goToUpgrade).toHaveLength(1);
+	});
+});
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItemQueuedTooltip.vue b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItemQueuedTooltip.vue
new file mode 100644
index 0000000000000..666f9b766831f
--- /dev/null
+++ b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItemQueuedTooltip.vue
@@ -0,0 +1,67 @@
+<script lang="ts" setup="">
+import type { ExecutionStatus } from 'n8n-workflow';
+import { useI18n } from '@/composables/useI18n';
+
+const props = defineProps<{
+	status: ExecutionStatus;
+	concurrencyCap: number;
+	isCloudDeployment?: boolean;
+}>();
+
+const emit = defineEmits<{
+	goToUpgrade: [];
+}>();
+
+const i18n = useI18n();
+</script>
+
+<template>
+	<N8nTooltip placement="top">
+		<template #content>
+			<i18n-t
+				v-if="props.status === 'waiting'"
+				keypath="executionsList.statusTooltipText.theWorkflowIsWaitingIndefinitely"
+			/>
+			<i18n-t
+				v-if="props.status === 'new'"
+				keypath="executionsList.statusTooltipText.waitingForConcurrencyCapacity"
+			>
+				<template #instance>
+					<i18n-t
+						v-if="props.isCloudDeployment"
+						keypath="executionsList.statusTooltipText.waitingForConcurrencyCapacity.cloud"
+					>
+						<template #concurrencyCap>{{ props.concurrencyCap }}</template>
+						<template #link>
+							<N8nLink bold size="small" :class="$style.link" @click="emit('goToUpgrade')">
+								{{ i18n.baseText('generic.upgradeNow') }}
+							</N8nLink>
+						</template>
+					</i18n-t>
+					<i18n-t
+						v-else
+						keypath="executionsList.statusTooltipText.waitingForConcurrencyCapacity.self"
+					>
+						<template #concurrencyCap>{{ props.concurrencyCap }}</template>
+						<template #link>
+							<N8nLink
+								:class="$style.link"
+								:href="i18n.baseText('executions.concurrency.docsLink')"
+								target="_blank"
+								>{{ i18n.baseText('generic.viewDocs') }}</N8nLink
+							>
+						</template>
+					</i18n-t>
+				</template>
+			</i18n-t>
+		</template>
+		<slot />
+	</N8nTooltip>
+</template>
+
+<style lang="scss" module>
+.link {
+	display: inline-block;
+	margin-top: var(--spacing-xs);
+}
+</style>
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue
index 443a3d0f5d485..b43f67708d1f4 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue
@@ -15,6 +15,7 @@ import { getResourcePermissions } from '@/permissions';
 import { useI18n } from '@/composables/useI18n';
 import { useSettingsStore } from '@/stores/settings.store';
 import ConcurrentExecutionsHeader from '@/components/executions/ConcurrentExecutionsHeader.vue';
+import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 
 type AutoScrollDeps = { activeExecutionSet: boolean; cardsMounted: boolean; scroll: boolean };
 
@@ -39,6 +40,7 @@ const i18n = useI18n();
 
 const executionsStore = useExecutionsStore();
 const settingsStore = useSettingsStore();
+const pageRedirectionHelper = usePageRedirectionHelper();
 
 const mountedItems = ref<string[]>([]);
 const autoScrollDeps = ref<AutoScrollDeps>({
@@ -169,6 +171,10 @@ function scrollToActiveCard(): void {
 		}
 	}
 }
+
+const goToUpgrade = () => {
+	void pageRedirectionHelper.goToUpgrade('concurrency', 'upgrade-concurrency');
+};
 </script>
 
 <template>
@@ -186,6 +192,8 @@ function scrollToActiveCard(): void {
 				v-if="settingsStore.isConcurrencyEnabled"
 				:running-executions-count="runningExecutionsCount"
 				:concurrency-cap="settingsStore.concurrency"
+				:is-cloud-deployment="settingsStore.isCloudDeployment"
+				@go-to-upgrade="goToUpgrade"
 			/>
 		</div>
 		<div :class="$style.controls">
diff --git a/packages/editor-ui/src/composables/useCanvasMapping.test.ts b/packages/editor-ui/src/composables/useCanvasMapping.test.ts
index a37f836cca899..49ea69506f035 100644
--- a/packages/editor-ui/src/composables/useCanvasMapping.test.ts
+++ b/packages/editor-ui/src/composables/useCanvasMapping.test.ts
@@ -1161,13 +1161,14 @@ describe('useCanvasMapping', () => {
 			expect(mappedConnections.value).toEqual([
 				{
 					data: {
-						fromNodeName: manualTriggerNode.name,
 						source: {
+							node: manualTriggerNode.name,
 							index: 0,
 							type: NodeConnectionType.Main,
 						},
 						status: undefined,
 						target: {
+							node: setNode.name,
 							index: 0,
 							type: NodeConnectionType.Main,
 						},
@@ -1249,13 +1250,14 @@ describe('useCanvasMapping', () => {
 			expect(mappedConnections.value).toEqual([
 				{
 					data: {
-						fromNodeName: manualTriggerNode.name,
 						source: {
+							node: manualTriggerNode.name,
 							index: 0,
 							type: NodeConnectionType.AiTool,
 						},
 						status: undefined,
 						target: {
+							node: setNode.name,
 							index: 0,
 							type: NodeConnectionType.AiTool,
 						},
@@ -1271,13 +1273,14 @@ describe('useCanvasMapping', () => {
 				},
 				{
 					data: {
-						fromNodeName: manualTriggerNode.name,
 						source: {
+							node: manualTriggerNode.name,
 							index: 0,
 							type: NodeConnectionType.AiDocument,
 						},
 						status: undefined,
 						target: {
+							node: setNode.name,
 							index: 1,
 							type: NodeConnectionType.AiDocument,
 						},
diff --git a/packages/editor-ui/src/composables/useCanvasMapping.ts b/packages/editor-ui/src/composables/useCanvasMapping.ts
index 205b4f7cbbe2e..517463fc6c11c 100644
--- a/packages/editor-ui/src/composables/useCanvasMapping.ts
+++ b/packages/editor-ui/src/composables/useCanvasMapping.ts
@@ -614,7 +614,7 @@ export function useCanvasMapping({
 	}
 
 	function getConnectionLabel(connection: CanvasConnection): string {
-		const fromNode = nodes.value.find((node) => node.name === connection.data?.fromNodeName);
+		const fromNode = nodes.value.find((node) => node.name === connection.data?.source.node);
 		if (!fromNode) {
 			return '';
 		}
diff --git a/packages/editor-ui/src/composables/useCanvasOperations.test.ts b/packages/editor-ui/src/composables/useCanvasOperations.test.ts
index 5858bb6ca5622..1d20a020e0424 100644
--- a/packages/editor-ui/src/composables/useCanvasOperations.test.ts
+++ b/packages/editor-ui/src/composables/useCanvasOperations.test.ts
@@ -32,6 +32,7 @@ import { waitFor } from '@testing-library/vue';
 import { createTestingPinia } from '@pinia/testing';
 import { mockedStore } from '@/__tests__/utils';
 import {
+	AGENT_NODE_TYPE,
 	FORM_TRIGGER_NODE_TYPE,
 	SET_NODE_TYPE,
 	STICKY_NODE_TYPE,
@@ -41,6 +42,7 @@ import {
 import type { Connection } from '@vue-flow/core';
 import { useClipboard } from '@/composables/useClipboard';
 import { createCanvasConnectionHandleString } from '@/utils/canvasUtilsV2';
+import { nextTick } from 'vue';
 
 vi.mock('vue-router', async (importOriginal) => {
 	const actual = await importOriginal<{}>();
@@ -1934,6 +1936,304 @@ describe('useCanvasOperations', () => {
 		});
 	});
 
+	describe('revalidateNodeInputConnections', () => {
+		it('should not delete connections when target node does not exist', () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const nonexistentId = 'nonexistent';
+			workflowsStore.getNodeById.mockReturnValue(undefined);
+
+			const { revalidateNodeInputConnections } = useCanvasOperations({ router });
+			revalidateNodeInputConnections(nonexistentId);
+
+			expect(workflowsStore.removeConnection).not.toHaveBeenCalled();
+		});
+
+		it('should not delete connections when node type description is not found', () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const nodeTypesStore = mockedStore(useNodeTypesStore);
+			const nodeId = 'test-node';
+			const node = createTestNode({ id: nodeId, type: 'unknown-type' });
+
+			workflowsStore.getNodeById.mockReturnValue(node);
+			nodeTypesStore.getNodeType = () => null;
+
+			const { revalidateNodeInputConnections } = useCanvasOperations({ router });
+			revalidateNodeInputConnections(nodeId);
+
+			expect(workflowsStore.removeConnection).not.toHaveBeenCalled();
+		});
+
+		it('should remove invalid connections that do not match input type', async () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const nodeTypesStore = mockedStore(useNodeTypesStore);
+
+			workflowsStore.removeConnection = vi.fn();
+
+			const targetNodeId = 'target';
+			const targetNode = createTestNode({
+				id: targetNodeId,
+				name: 'Target Node',
+				type: SET_NODE_TYPE,
+			});
+			const targetNodeType = mockNodeTypeDescription({
+				name: SET_NODE_TYPE,
+				inputs: [NodeConnectionType.Main],
+			});
+
+			const sourceNodeId = 'source';
+			const sourceNode = createTestNode({
+				id: sourceNodeId,
+				name: 'Source Node',
+				type: AGENT_NODE_TYPE,
+			});
+			const sourceNodeType = mockNodeTypeDescription({
+				name: AGENT_NODE_TYPE,
+				outputs: [NodeConnectionType.AiTool],
+			});
+
+			workflowsStore.workflow.nodes = [sourceNode, targetNode];
+			workflowsStore.workflow.connections = {
+				[sourceNode.name]: {
+					[NodeConnectionType.AiTool]: [
+						[{ node: targetNode.name, type: NodeConnectionType.Main, index: 0 }],
+					],
+				},
+			};
+
+			workflowsStore.getNodeById
+				.mockReturnValueOnce(sourceNode)
+				.mockReturnValueOnce(targetNode)
+				.mockReturnValueOnce(sourceNode)
+				.mockReturnValueOnce(targetNode);
+
+			nodeTypesStore.getNodeType = vi
+				.fn()
+				.mockReturnValueOnce(targetNodeType)
+				.mockReturnValueOnce(sourceNodeType);
+
+			const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
+			workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
+
+			const { revalidateNodeInputConnections } = useCanvasOperations({ router });
+			revalidateNodeInputConnections(targetNodeId);
+
+			await nextTick();
+
+			expect(workflowsStore.removeConnection).toHaveBeenCalledWith({
+				connection: [
+					{ node: sourceNode.name, type: NodeConnectionType.AiTool, index: 0 },
+					{ node: targetNode.name, type: NodeConnectionType.Main, index: 0 },
+				],
+			});
+		});
+
+		it('should keep valid connections that match input type', () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const nodeTypesStore = mockedStore(useNodeTypesStore);
+
+			workflowsStore.removeConnection = vi.fn();
+
+			const targetNodeId = 'target';
+			const targetNode = createTestNode({
+				id: targetNodeId,
+				name: 'Target Node',
+				type: SET_NODE_TYPE,
+			});
+			const targetNodeType = mockNodeTypeDescription({
+				name: SET_NODE_TYPE,
+				inputs: [NodeConnectionType.Main],
+			});
+
+			const sourceNodeId = 'source';
+			const sourceNode = createTestNode({
+				id: sourceNodeId,
+				name: 'Source Node',
+				type: AGENT_NODE_TYPE,
+			});
+			const sourceNodeType = mockNodeTypeDescription({
+				name: AGENT_NODE_TYPE,
+				outputs: [NodeConnectionType.Main],
+			});
+
+			workflowsStore.workflow.nodes = [sourceNode, targetNode];
+			workflowsStore.workflow.connections = {
+				[sourceNode.name]: {
+					[NodeConnectionType.Main]: [
+						[{ node: targetNode.name, type: NodeConnectionType.Main, index: 0 }],
+					],
+				},
+			};
+
+			workflowsStore.getNodeById
+				.mockReturnValueOnce(sourceNode)
+				.mockReturnValueOnce(targetNode)
+				.mockReturnValueOnce(sourceNode)
+				.mockReturnValueOnce(targetNode);
+
+			nodeTypesStore.getNodeType = vi
+				.fn()
+				.mockReturnValueOnce(targetNodeType)
+				.mockReturnValueOnce(sourceNodeType);
+
+			const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
+			workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
+
+			const { revalidateNodeInputConnections } = useCanvasOperations({ router });
+			revalidateNodeInputConnections(targetNodeId);
+
+			expect(workflowsStore.removeConnection).not.toHaveBeenCalled();
+		});
+	});
+
+	describe('revalidateNodeOutputConnections', () => {
+		it('should not delete connections when source node does not exist', () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const nonexistentId = 'nonexistent';
+			workflowsStore.getNodeById.mockReturnValue(undefined);
+
+			const { revalidateNodeOutputConnections } = useCanvasOperations({ router });
+			revalidateNodeOutputConnections(nonexistentId);
+
+			expect(workflowsStore.removeConnection).not.toHaveBeenCalled();
+		});
+
+		it('should not delete connections when node type description is not found', () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const nodeTypesStore = mockedStore(useNodeTypesStore);
+			const nodeId = 'test-node';
+			const node = createTestNode({ id: nodeId, type: 'unknown-type' });
+
+			workflowsStore.getNodeById.mockReturnValue(node);
+			nodeTypesStore.getNodeType = () => null;
+
+			const { revalidateNodeOutputConnections } = useCanvasOperations({ router });
+			revalidateNodeOutputConnections(nodeId);
+
+			expect(workflowsStore.removeConnection).not.toHaveBeenCalled();
+		});
+
+		it('should remove invalid connections that do not match output type', async () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const nodeTypesStore = mockedStore(useNodeTypesStore);
+
+			workflowsStore.removeConnection = vi.fn();
+
+			const targetNodeId = 'target';
+			const targetNode = createTestNode({
+				id: targetNodeId,
+				name: 'Target Node',
+				type: SET_NODE_TYPE,
+			});
+			const targetNodeType = mockNodeTypeDescription({
+				name: SET_NODE_TYPE,
+				inputs: [NodeConnectionType.Main],
+			});
+
+			const sourceNodeId = 'source';
+			const sourceNode = createTestNode({
+				id: sourceNodeId,
+				name: 'Source Node',
+				type: AGENT_NODE_TYPE,
+			});
+			const sourceNodeType = mockNodeTypeDescription({
+				name: AGENT_NODE_TYPE,
+				outputs: [NodeConnectionType.AiTool],
+			});
+
+			workflowsStore.workflow.nodes = [sourceNode, targetNode];
+			workflowsStore.workflow.connections = {
+				[sourceNode.name]: {
+					[NodeConnectionType.AiTool]: [
+						[{ node: targetNode.name, type: NodeConnectionType.Main, index: 0 }],
+					],
+				},
+			};
+
+			workflowsStore.getNodeById
+				.mockReturnValueOnce(sourceNode)
+				.mockReturnValueOnce(targetNode)
+				.mockReturnValueOnce(sourceNode)
+				.mockReturnValueOnce(targetNode);
+
+			nodeTypesStore.getNodeType = vi
+				.fn()
+				.mockReturnValueOnce(targetNodeType)
+				.mockReturnValueOnce(sourceNodeType);
+
+			const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
+			workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
+
+			const { revalidateNodeOutputConnections } = useCanvasOperations({ router });
+			revalidateNodeOutputConnections(sourceNodeId);
+
+			await nextTick();
+
+			expect(workflowsStore.removeConnection).toHaveBeenCalledWith({
+				connection: [
+					{ node: sourceNode.name, type: NodeConnectionType.AiTool, index: 0 },
+					{ node: targetNode.name, type: NodeConnectionType.Main, index: 0 },
+				],
+			});
+		});
+
+		it('should keep valid connections that match output type', () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const nodeTypesStore = mockedStore(useNodeTypesStore);
+
+			workflowsStore.removeConnection = vi.fn();
+
+			const targetNodeId = 'target';
+			const targetNode = createTestNode({
+				id: targetNodeId,
+				name: 'Target Node',
+				type: SET_NODE_TYPE,
+			});
+			const targetNodeType = mockNodeTypeDescription({
+				name: SET_NODE_TYPE,
+				inputs: [NodeConnectionType.Main],
+			});
+
+			const sourceNodeId = 'source';
+			const sourceNode = createTestNode({
+				id: sourceNodeId,
+				name: 'Source Node',
+				type: AGENT_NODE_TYPE,
+			});
+			const sourceNodeType = mockNodeTypeDescription({
+				name: AGENT_NODE_TYPE,
+				outputs: [NodeConnectionType.Main],
+			});
+
+			workflowsStore.workflow.nodes = [sourceNode, targetNode];
+			workflowsStore.workflow.connections = {
+				[sourceNode.name]: {
+					[NodeConnectionType.AiTool]: [
+						[{ node: targetNode.name, type: NodeConnectionType.Main, index: 0 }],
+					],
+				},
+			};
+
+			workflowsStore.getNodeById
+				.mockReturnValueOnce(sourceNode)
+				.mockReturnValueOnce(targetNode)
+				.mockReturnValueOnce(sourceNode)
+				.mockReturnValueOnce(targetNode);
+
+			nodeTypesStore.getNodeType = vi
+				.fn()
+				.mockReturnValueOnce(targetNodeType)
+				.mockReturnValueOnce(sourceNodeType);
+
+			const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
+			workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
+
+			const { revalidateNodeOutputConnections } = useCanvasOperations({ router });
+			revalidateNodeOutputConnections(sourceNodeId);
+
+			expect(workflowsStore.removeConnection).not.toHaveBeenCalled();
+		});
+	});
+
 	describe('deleteConnectionsByNodeId', () => {
 		it('should delete all connections for a given node ID', () => {
 			const workflowsStore = mockedStore(useWorkflowsStore);
diff --git a/packages/editor-ui/src/composables/useCanvasOperations.ts b/packages/editor-ui/src/composables/useCanvasOperations.ts
index 939d2132b8697..38db98fe01672 100644
--- a/packages/editor-ui/src/composables/useCanvasOperations.ts
+++ b/packages/editor-ui/src/composables/useCanvasOperations.ts
@@ -52,6 +52,7 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
 import type {
 	CanvasConnection,
 	CanvasConnectionCreateData,
+	CanvasConnectionPort,
 	CanvasNode,
 	CanvasNodeMoveEvent,
 } from '@/types';
@@ -1230,11 +1231,63 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		});
 	}
 
+	function revalidateNodeConnections(id: string, connectionMode: CanvasConnectionMode) {
+		const node = workflowsStore.getNodeById(id);
+		const isInput = connectionMode === CanvasConnectionMode.Input;
+		if (!node) {
+			return;
+		}
+
+		const nodeType = nodeTypesStore.getNodeType(node.type, node.typeVersion);
+		if (!nodeType) {
+			return;
+		}
+
+		const connections = mapLegacyConnectionsToCanvasConnections(
+			workflowsStore.workflow.connections,
+			workflowsStore.workflow.nodes,
+		);
+
+		connections.forEach((connection) => {
+			const isRelevantConnection = isInput ? connection.target === id : connection.source === id;
+
+			if (isRelevantConnection) {
+				const otherNodeId = isInput ? connection.source : connection.target;
+
+				const otherNode = workflowsStore.getNodeById(otherNodeId);
+				if (!otherNode || !connection.data) {
+					return;
+				}
+
+				const [firstNode, secondNode] = isInput ? [otherNode, node] : [node, otherNode];
+
+				if (
+					!isConnectionAllowed(
+						firstNode,
+						secondNode,
+						connection.data.source,
+						connection.data.target,
+					)
+				) {
+					void nextTick(() => deleteConnection(connection));
+				}
+			}
+		});
+	}
+
+	function revalidateNodeInputConnections(id: string) {
+		return revalidateNodeConnections(id, CanvasConnectionMode.Input);
+	}
+
+	function revalidateNodeOutputConnections(id: string) {
+		return revalidateNodeConnections(id, CanvasConnectionMode.Output);
+	}
+
 	function isConnectionAllowed(
 		sourceNode: INodeUi,
 		targetNode: INodeUi,
-		sourceConnection: IConnection,
-		targetConnection: IConnection,
+		sourceConnection: IConnection | CanvasConnectionPort,
+		targetConnection: IConnection | CanvasConnectionPort,
 	): boolean {
 		const blocklist = [STICKY_NODE_TYPE];
 
@@ -1908,6 +1961,8 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		deleteConnection,
 		revertDeleteConnection,
 		deleteConnectionsByNodeId,
+		revalidateNodeInputConnections,
+		revalidateNodeOutputConnections,
 		isConnectionAllowed,
 		filterConnectionsByNodes,
 		importWorkflowData,
diff --git a/packages/editor-ui/src/composables/useDocumentVisibility.ts b/packages/editor-ui/src/composables/useDocumentVisibility.ts
new file mode 100644
index 0000000000000..47af96309f7b0
--- /dev/null
+++ b/packages/editor-ui/src/composables/useDocumentVisibility.ts
@@ -0,0 +1,52 @@
+import type { Ref } from 'vue';
+import { ref, onMounted, onUnmounted } from 'vue';
+
+type VisibilityHandler = () => void;
+
+type DocumentVisibilityResult = {
+	isVisible: Ref<boolean>;
+	onDocumentVisible: (handler: VisibilityHandler) => void;
+	onDocumentHidden: (handler: VisibilityHandler) => void;
+};
+
+export function useDocumentVisibility(): DocumentVisibilityResult {
+	const isVisible = ref<boolean>(!document.hidden);
+	const visibleHandlers = ref<VisibilityHandler[]>([]);
+	const hiddenHandlers = ref<VisibilityHandler[]>([]);
+
+	const onVisibilityChange = (): void => {
+		const newVisibilityState = !document.hidden;
+		isVisible.value = newVisibilityState;
+
+		if (newVisibilityState) {
+			visibleHandlers.value.forEach((handler) => handler());
+		} else {
+			hiddenHandlers.value.forEach((handler) => handler());
+		}
+	};
+
+	const onDocumentVisible = (handler: VisibilityHandler): void => {
+		visibleHandlers.value.push(handler);
+	};
+
+	const onDocumentHidden = (handler: VisibilityHandler): void => {
+		hiddenHandlers.value.push(handler);
+	};
+
+	onMounted((): void => {
+		document.addEventListener('visibilitychange', onVisibilityChange);
+	});
+
+	onUnmounted((): void => {
+		document.removeEventListener('visibilitychange', onVisibilityChange);
+		// Clear handlers on unmount
+		visibleHandlers.value = [];
+		hiddenHandlers.value = [];
+	});
+
+	return {
+		isVisible,
+		onDocumentVisible,
+		onDocumentHidden,
+	};
+}
diff --git a/packages/editor-ui/src/composables/useExecutionDebugging.ts b/packages/editor-ui/src/composables/useExecutionDebugging.ts
index 632eac195b863..19bb660d38e5a 100644
--- a/packages/editor-ui/src/composables/useExecutionDebugging.ts
+++ b/packages/editor-ui/src/composables/useExecutionDebugging.ts
@@ -76,7 +76,7 @@ export const useExecutionDebugging = () => {
 					type: 'warning',
 					confirmButtonText: i18n.baseText('nodeView.confirmMessage.debug.confirmButtonText'),
 					cancelButtonText: i18n.baseText('nodeView.confirmMessage.debug.cancelButtonText'),
-					dangerouslyUseHTMLString: true,
+
 					customClass: 'matching-pinned-nodes-confirmation',
 				},
 			);
diff --git a/packages/editor-ui/src/composables/useGlobalEntityCreation.test.ts b/packages/editor-ui/src/composables/useGlobalEntityCreation.test.ts
index b889a0fb95786..9842ee3cbfde0 100644
--- a/packages/editor-ui/src/composables/useGlobalEntityCreation.test.ts
+++ b/packages/editor-ui/src/composables/useGlobalEntityCreation.test.ts
@@ -1,7 +1,6 @@
 import { createTestingPinia } from '@pinia/testing';
 import { setActivePinia } from 'pinia';
 import { useProjectsStore } from '@/stores/projects.store';
-import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { mockedStore } from '@/__tests__/utils';
 import type router from 'vue-router';
 import { flushPromises } from '@vue/test-utils';
@@ -80,79 +79,6 @@ describe('useGlobalEntityCreation', () => {
 		);
 	});
 
-	describe('single project', () => {
-		const currentProjectId = 'current-project';
-
-		it('should use currentProject', () => {
-			const projectsStore = mockedStore(useProjectsStore);
-
-			projectsStore.isTeamProjectFeatureEnabled = true;
-			projectsStore.currentProject = { id: currentProjectId } as Project;
-
-			const { menu } = useGlobalEntityCreation(false);
-
-			expect(menu.value[0]).toStrictEqual(
-				expect.objectContaining({
-					route: { name: VIEWS.NEW_WORKFLOW, query: { projectId: currentProjectId } },
-				}),
-			);
-
-			expect(menu.value[1]).toStrictEqual(
-				expect.objectContaining({
-					route: {
-						name: VIEWS.PROJECTS_CREDENTIALS,
-						params: { projectId: currentProjectId, credentialId: 'create' },
-					},
-				}),
-			);
-		});
-
-		it('should be disabled in readOnly', () => {
-			const projectsStore = mockedStore(useProjectsStore);
-
-			projectsStore.isTeamProjectFeatureEnabled = true;
-			projectsStore.currentProject = { id: currentProjectId } as Project;
-
-			const sourceControl = mockedStore(useSourceControlStore);
-			sourceControl.preferences.branchReadOnly = true;
-
-			const { menu } = useGlobalEntityCreation(false);
-
-			expect(menu.value[0]).toStrictEqual(
-				expect.objectContaining({
-					disabled: true,
-				}),
-			);
-
-			expect(menu.value[1]).toStrictEqual(
-				expect.objectContaining({
-					disabled: true,
-				}),
-			);
-		});
-
-		it('should be disabled based in scopes', () => {
-			const projectsStore = mockedStore(useProjectsStore);
-
-			projectsStore.isTeamProjectFeatureEnabled = true;
-			projectsStore.currentProject = { id: currentProjectId, scopes: [] } as unknown as Project;
-
-			const { menu } = useGlobalEntityCreation(false);
-
-			expect(menu.value[0]).toStrictEqual(
-				expect.objectContaining({
-					disabled: true,
-				}),
-			);
-
-			expect(menu.value[1]).toStrictEqual(
-				expect.objectContaining({
-					disabled: true,
-				}),
-			);
-		});
-	});
-
 	describe('global', () => {
 		it('should show personal + all team projects', () => {
 			const projectsStore = mockedStore(useProjectsStore);
@@ -167,7 +93,7 @@ describe('useGlobalEntityCreation', () => {
 				{ id: '3', name: '3', type: 'team' },
 			] as ProjectListItem[];
 
-			const { menu } = useGlobalEntityCreation(true);
+			const { menu } = useGlobalEntityCreation();
 
 			expect(menu.value[0].submenu?.length).toBe(4);
 			expect(menu.value[1].submenu?.length).toBe(4);
@@ -178,7 +104,7 @@ describe('useGlobalEntityCreation', () => {
 		it('should only handle create-project', () => {
 			const projectsStore = mockedStore(useProjectsStore);
 			projectsStore.isTeamProjectFeatureEnabled = true;
-			const { handleSelect } = useGlobalEntityCreation(true);
+			const { handleSelect } = useGlobalEntityCreation();
 			handleSelect('dummy');
 			expect(projectsStore.createProject).not.toHaveBeenCalled();
 		});
@@ -190,7 +116,7 @@ describe('useGlobalEntityCreation', () => {
 			projectsStore.canCreateProjects = true;
 			projectsStore.createProject.mockResolvedValueOnce({ name: 'test', id: '1' } as Project);
 
-			const { handleSelect } = useGlobalEntityCreation(true);
+			const { handleSelect } = useGlobalEntityCreation();
 
 			handleSelect('create-project');
 			await flushPromises();
@@ -207,7 +133,7 @@ describe('useGlobalEntityCreation', () => {
 			projectsStore.canCreateProjects = true;
 			projectsStore.createProject.mockRejectedValueOnce(new Error('error'));
 
-			const { handleSelect } = useGlobalEntityCreation(true);
+			const { handleSelect } = useGlobalEntityCreation();
 
 			handleSelect('create-project');
 			await flushPromises();
@@ -220,7 +146,7 @@ describe('useGlobalEntityCreation', () => {
 			projectsStore.isTeamProjectFeatureEnabled = true;
 			const redirect = usePageRedirectionHelper();
 
-			const { handleSelect } = useGlobalEntityCreation(true);
+			const { handleSelect } = useGlobalEntityCreation();
 
 			handleSelect('create-project');
 			expect(redirect.goToUpgrade).toHaveBeenCalled();
@@ -237,14 +163,20 @@ describe('useGlobalEntityCreation', () => {
 		projectsStore.teamProjectsLimit = 10;
 
 		settingsStore.isCloudDeployment = true;
-		const { projectsLimitReachedMessage } = useGlobalEntityCreation(true);
+		const { projectsLimitReachedMessage, upgradeLabel } = useGlobalEntityCreation();
 		expect(projectsLimitReachedMessage.value).toContain(
 			'You have reached the Pro plan limit of 10.',
 		);
+		expect(upgradeLabel.value).toBe('Upgrade');
 
 		settingsStore.isCloudDeployment = false;
+		expect(projectsLimitReachedMessage.value).toContain('You have reached the  plan limit of');
+		expect(upgradeLabel.value).toBe('Upgrade');
+
+		projectsStore.isTeamProjectFeatureEnabled = false;
 		expect(projectsLimitReachedMessage.value).toContain(
 			'Upgrade to unlock projects for more granular control over sharing, access and organisation of workflows',
 		);
+		expect(upgradeLabel.value).toBe('Enterprise');
 	});
 });
diff --git a/packages/editor-ui/src/composables/useGlobalEntityCreation.ts b/packages/editor-ui/src/composables/useGlobalEntityCreation.ts
index d5bd229dafcdb..bf1efb66918b6 100644
--- a/packages/editor-ui/src/composables/useGlobalEntityCreation.ts
+++ b/packages/editor-ui/src/composables/useGlobalEntityCreation.ts
@@ -1,4 +1,4 @@
-import { computed, toValue, type ComputedRef, type Ref } from 'vue';
+import { computed, ref } from 'vue';
 import { VIEWS } from '@/constants';
 import { useRouter } from 'vue-router';
 import { useI18n } from '@/composables/useI18n';
@@ -25,9 +25,7 @@ type Item = BaseItem & {
 	submenu?: BaseItem[];
 };
 
-export const useGlobalEntityCreation = (
-	multipleProjects: Ref<boolean> | ComputedRef<boolean> | boolean = true,
-) => {
+export const useGlobalEntityCreation = () => {
 	const CREATE_PROJECT_ID = 'create-project';
 
 	const settingsStore = useSettingsStore();
@@ -37,6 +35,9 @@ export const useGlobalEntityCreation = (
 	const router = useRouter();
 	const i18n = useI18n();
 	const toast = useToast();
+
+	const isCreatingProject = ref(false);
+
 	const displayProjects = computed(() =>
 		sortByProperty(
 			'name',
@@ -77,34 +78,10 @@ export const useGlobalEntityCreation = (
 						},
 					},
 				},
-			];
-		}
-
-		// single project
-		if (!toValue(multipleProjects)) {
-			return [
-				{
-					id: 'workflow',
-					title: 'Workflow',
-					disabled: disabledWorkflow(projectsStore.currentProject?.scopes),
-					route: {
-						name: VIEWS.NEW_WORKFLOW,
-						query: {
-							projectId: projectsStore.currentProject?.id,
-						},
-					},
-				},
 				{
-					id: 'credential',
-					title: 'Credential',
-					disabled: disabledCredential(projectsStore.currentProject?.scopes),
-					route: {
-						name: VIEWS.PROJECTS_CREDENTIALS,
-						params: {
-							projectId: projectsStore.currentProject?.id,
-							credentialId: 'create',
-						},
-					},
+					id: CREATE_PROJECT_ID,
+					title: 'Project',
+					disabled: true,
 				},
 			];
 		}
@@ -182,6 +159,8 @@ export const useGlobalEntityCreation = (
 	});
 
 	const createProject = async () => {
+		isCreatingProject.value = true;
+
 		try {
 			const newProject = await projectsStore.createProject({
 				name: i18n.baseText('projects.settings.newProjectName'),
@@ -195,6 +174,8 @@ export const useGlobalEntityCreation = (
 			});
 		} catch (error) {
 			toast.showError(error, i18n.baseText('projects.error.title'));
+		} finally {
+			isCreatingProject.value = false;
 		}
 	};
 
@@ -211,7 +192,7 @@ export const useGlobalEntityCreation = (
 
 	const projectsLimitReachedMessage = computed(() => {
 		if (settingsStore.isCloudDeployment) {
-			return i18n.baseText('projects.create.limitReached', {
+			return i18n.baseText('projects.create.limitReached.cloud', {
 				adjustToNumber: projectsStore.teamProjectsLimit,
 				interpolate: {
 					planName: cloudPlanStore.currentPlanData?.displayName ?? '',
@@ -220,10 +201,40 @@ export const useGlobalEntityCreation = (
 			});
 		}
 
-		return i18n.baseText('projects.create.limitReached.self');
+		if (!projectsStore.isTeamProjectFeatureEnabled) {
+			return i18n.baseText('projects.create.limitReached.self');
+		}
+
+		return i18n.baseText('projects.create.limitReached', {
+			adjustToNumber: projectsStore.teamProjectsLimit,
+			interpolate: {
+				limit: projectsStore.teamProjectsLimit,
+			},
+		});
 	});
 
 	const createProjectAppendSlotName = computed(() => `item.append.${CREATE_PROJECT_ID}`);
 
-	return { menu, handleSelect, createProjectAppendSlotName, projectsLimitReachedMessage };
+	const upgradeLabel = computed(() => {
+		if (settingsStore.isCloudDeployment) {
+			return i18n.baseText('generic.upgrade');
+		}
+
+		if (!projectsStore.isTeamProjectFeatureEnabled) {
+			return i18n.baseText('generic.enterprise');
+		}
+
+		return i18n.baseText('generic.upgrade');
+	});
+
+	return {
+		menu,
+		handleSelect,
+		createProjectAppendSlotName,
+		projectsLimitReachedMessage,
+		upgradeLabel,
+		createProject,
+		isCreatingProject,
+		displayProjects,
+	};
 };
diff --git a/packages/editor-ui/src/composables/useMessage.ts b/packages/editor-ui/src/composables/useMessage.ts
index 22bb50fc698c4..9f5e2742ac75a 100644
--- a/packages/editor-ui/src/composables/useMessage.ts
+++ b/packages/editor-ui/src/composables/useMessage.ts
@@ -26,6 +26,7 @@ export function useMessage() {
 			...(config ?? (typeof configOrTitle === 'object' ? configOrTitle : {})),
 			cancelButtonClass: 'btn--cancel',
 			confirmButtonClass: 'btn--confirm',
+			dangerouslyUseHTMLString: true,
 		};
 
 		if (typeof configOrTitle === 'string') {
@@ -49,6 +50,7 @@ export function useMessage() {
 			distinguishCancelAndClose: true,
 			showClose: config?.showClose ?? false,
 			closeOnClickModal: false,
+			dangerouslyUseHTMLString: true,
 			...(config ?? (typeof configOrTitle === 'object' ? configOrTitle : {})),
 		};
 
@@ -74,6 +76,7 @@ export function useMessage() {
 			...(config ?? (typeof configOrTitle === 'object' ? configOrTitle : {})),
 			cancelButtonClass: 'btn--cancel',
 			confirmButtonClass: 'btn--confirm',
+			dangerouslyUseHTMLString: true,
 		};
 
 		if (typeof configOrTitle === 'string') {
diff --git a/packages/editor-ui/src/composables/useNodeHelpers.test.ts b/packages/editor-ui/src/composables/useNodeHelpers.test.ts
index 538a40c5e2021..c5ba6dc1f3c74 100644
--- a/packages/editor-ui/src/composables/useNodeHelpers.test.ts
+++ b/packages/editor-ui/src/composables/useNodeHelpers.test.ts
@@ -234,4 +234,37 @@ describe('useNodeHelpers()', () => {
 			expect(webhook.webhookId).toMatch(/\w+(-\w+)+/);
 		});
 	});
+
+	describe('isSingleExecution', () => {
+		let isSingleExecution: ReturnType<typeof useNodeHelpers>['isSingleExecution'];
+		beforeEach(() => {
+			isSingleExecution = useNodeHelpers().isSingleExecution;
+		});
+
+		test('should determine based on node parameters if it would be executed once', () => {
+			expect(isSingleExecution('n8n-nodes-base.code', {})).toEqual(true);
+			expect(isSingleExecution('n8n-nodes-base.code', { mode: 'runOnceForEachItem' })).toEqual(
+				false,
+			);
+			expect(isSingleExecution('n8n-nodes-base.executeWorkflow', {})).toEqual(true);
+			expect(isSingleExecution('n8n-nodes-base.executeWorkflow', { mode: 'each' })).toEqual(false);
+			expect(isSingleExecution('n8n-nodes-base.crateDb', {})).toEqual(true);
+			expect(isSingleExecution('n8n-nodes-base.crateDb', { operation: 'update' })).toEqual(true);
+			expect(isSingleExecution('n8n-nodes-base.timescaleDb', {})).toEqual(true);
+			expect(isSingleExecution('n8n-nodes-base.timescaleDb', { operation: 'update' })).toEqual(
+				true,
+			);
+			expect(isSingleExecution('n8n-nodes-base.microsoftSql', {})).toEqual(true);
+			expect(isSingleExecution('n8n-nodes-base.microsoftSql', { operation: 'update' })).toEqual(
+				true,
+			);
+			expect(isSingleExecution('n8n-nodes-base.microsoftSql', { operation: 'delete' })).toEqual(
+				true,
+			);
+			expect(isSingleExecution('n8n-nodes-base.questDb', {})).toEqual(true);
+			expect(isSingleExecution('n8n-nodes-base.mongoDb', { operation: 'insert' })).toEqual(true);
+			expect(isSingleExecution('n8n-nodes-base.mongoDb', { operation: 'update' })).toEqual(true);
+			expect(isSingleExecution('n8n-nodes-base.redis', {})).toEqual(true);
+		});
+	});
 });
diff --git a/packages/editor-ui/src/composables/useNodeHelpers.ts b/packages/editor-ui/src/composables/useNodeHelpers.ts
index 95ab27d7ec472..461f550212eba 100644
--- a/packages/editor-ui/src/composables/useNodeHelpers.ts
+++ b/packages/editor-ui/src/composables/useNodeHelpers.ts
@@ -35,6 +35,7 @@ import type {
 	INodeTypeNameVersion,
 	IConnection,
 	IPinData,
+	NodeParameterValue,
 } from 'n8n-workflow';
 
 import type {
@@ -1268,6 +1269,50 @@ export function useNodeHelpers() {
 		return id;
 	}
 
+	/** nodes that would execute only once with such parameters add 'undefined' to parameters values if it is parameter's default value */
+	const SINGLE_EXECUTION_NODES: { [key: string]: { [key: string]: NodeParameterValue[] } } = {
+		'n8n-nodes-base.code': {
+			mode: [undefined, 'runOnceForAllItems'],
+		},
+		'n8n-nodes-base.executeWorkflow': {
+			mode: [undefined, 'once'],
+		},
+		'n8n-nodes-base.crateDb': {
+			operation: [undefined, 'update'], // default insert
+		},
+		'n8n-nodes-base.timescaleDb': {
+			operation: [undefined, 'update'], // default insert
+		},
+		'n8n-nodes-base.microsoftSql': {
+			operation: [undefined, 'update', 'delete'], // default insert
+		},
+		'n8n-nodes-base.questDb': {
+			operation: [undefined], // default insert
+		},
+		'n8n-nodes-base.mongoDb': {
+			operation: ['insert', 'update'],
+		},
+		'n8n-nodes-base.redis': {
+			operation: [undefined], // default info
+		},
+	};
+
+	function isSingleExecution(type: string, parameters: INodeParameters): boolean {
+		const singleExecutionCase = SINGLE_EXECUTION_NODES[type];
+
+		if (singleExecutionCase) {
+			for (const parameter of Object.keys(singleExecutionCase)) {
+				if (!singleExecutionCase[parameter].includes(parameters[parameter] as NodeParameterValue)) {
+					return false;
+				}
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+
 	return {
 		hasProxyAuth,
 		isCustomApiCallSelected,
@@ -1305,5 +1350,6 @@ export function useNodeHelpers() {
 		getNodeTaskData,
 		assignNodeId,
 		assignWebhookId,
+		isSingleExecution,
 	};
 }
diff --git a/packages/editor-ui/src/composables/usePushConnection.test.ts b/packages/editor-ui/src/composables/usePushConnection.test.ts
index c2901249d63c4..63592afd795af 100644
--- a/packages/editor-ui/src/composables/usePushConnection.test.ts
+++ b/packages/editor-ui/src/composables/usePushConnection.test.ts
@@ -202,7 +202,6 @@ describe('usePushConnection()', () => {
 					title: 'Problem in node ‘Last Node‘',
 					type: 'error',
 					duration: 0,
-					dangerouslyUseHTMLString: true,
 				});
 
 				expect(result).toBeTruthy();
diff --git a/packages/editor-ui/src/composables/usePushConnection.ts b/packages/editor-ui/src/composables/usePushConnection.ts
index 86ffbf358baec..e3b976a8acbec 100644
--- a/packages/editor-ui/src/composables/usePushConnection.ts
+++ b/packages/editor-ui/src/composables/usePushConnection.ts
@@ -37,6 +37,7 @@ import { useAssistantStore } from '@/stores/assistant.store';
 import NodeExecutionErrorMessage from '@/components/NodeExecutionErrorMessage.vue';
 import type { IExecutionResponse } from '@/Interface';
 import { EASY_AI_WORKFLOW_JSON } from '@/constants.workflows';
+import { clearPopupWindowState } from '../utils/executionUtils';
 
 export function usePushConnection({ router }: { router: ReturnType<typeof useRouter> }) {
 	const workflowHelpers = useWorkflowHelpers({ router });
@@ -201,6 +202,7 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 			}
 
 			if (receivedData.type === 'executionFinished') {
+				clearPopupWindowState();
 				const workflow = workflowsStore.getWorkflowById(receivedData.data.workflowId);
 				if (workflow?.meta?.templateId) {
 					const isEasyAIWorkflow =
@@ -397,7 +399,6 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 							message: runDataExecutedErrorMessage,
 							type: 'error',
 							duration: 0,
-							dangerouslyUseHTMLString: true,
 						});
 					}
 				}
diff --git a/packages/editor-ui/src/composables/useToast.test.ts b/packages/editor-ui/src/composables/useToast.test.ts
index f476a29d70cd8..b4a7f2a7e3c8e 100644
--- a/packages/editor-ui/src/composables/useToast.test.ts
+++ b/packages/editor-ui/src/composables/useToast.test.ts
@@ -1,55 +1,90 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { screen, waitFor, within } from '@testing-library/vue';
+import { createTestingPinia } from '@pinia/testing';
+import { h, defineComponent } from 'vue';
 import { useToast } from './useToast';
-import { createPinia, setActivePinia } from 'pinia';
-import { ElNotification as Notification } from 'element-plus';
-
-vi.mock('element-plus', async () => {
-	const original = await vi.importActual('element-plus');
-	return {
-		...original,
-		ElNotification: vi.fn(),
-		ElTooltip: vi.fn(),
-	};
-});
 
 describe('useToast', () => {
 	let toast: ReturnType<typeof useToast>;
 
 	beforeEach(() => {
-		setActivePinia(createPinia());
+		document.body.innerHTML = '<div id="app-grid"></div>';
+		createTestingPinia();
 
 		toast = useToast();
 	});
 
-	afterEach(() => {
-		vi.restoreAllMocks();
-	});
-
-	it('should show a message', () => {
+	it('should show a message', async () => {
 		const messageData = { message: 'Test message', title: 'Test title' };
 		toast.showMessage(messageData);
 
-		expect(Notification).toHaveBeenCalledWith(
-			expect.objectContaining({
-				message: 'Test message',
-				title: 'Test title',
-			}),
-		);
+		await waitFor(() => {
+			expect(screen.getByRole('alert')).toBeVisible();
+			expect(
+				within(screen.getByRole('alert')).getByRole('heading', { level: 2 }),
+			).toHaveTextContent('Test title');
+			expect(screen.getByRole('alert')).toContainHTML('<p>Test message</p>');
+		});
 	});
 
-	it('should sanitize message and title', () => {
+	it('should sanitize message and title', async () => {
 		const messageData = {
 			message: '<script>alert("xss")</script>',
 			title: '<script>alert("xss")</script>',
 		};
+		toast.showMessage(messageData);
+
+		await waitFor(() => {
+			expect(screen.getByRole('alert')).toBeVisible();
+			expect(
+				within(screen.getByRole('alert')).getByRole('heading', { level: 2 }),
+			).toHaveTextContent('alert("xss")');
+			expect(screen.getByRole('alert')).toContainHTML('<p>alert("xss")</p>');
+		});
+	});
+
+	it('should sanitize but keep valid, allowed HTML tags', async () => {
+		const messageData = {
+			message:
+				'<a data-action="reload">Refresh</a> to see the <strong>latest status</strong>.<br/> <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.wait/" target="_blank">More info</a> or go to the <a href="/settings/usage">Usage and plan</a> settings page.',
+			title: '<strong>Title</strong>',
+		};
+
+		toast.showMessage(messageData);
+
+		await waitFor(() => {
+			expect(screen.getByRole('alert')).toBeVisible();
+			expect(
+				within(screen.getByRole('alert')).getByRole('heading', { level: 2 }),
+			).toHaveTextContent('Title');
+			expect(
+				within(screen.getByRole('alert')).getByRole('heading', { level: 2 }).querySelectorAll('*'),
+			).toHaveLength(0);
+			expect(screen.getByRole('alert')).toContainHTML(
+				'<a data-action="reload">Refresh</a> to see the <strong>latest status</strong>.<br /> <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.wait/" target="_blank">More info</a> or go to the <a href="/settings/usage">Usage and plan</a> settings page.',
+			);
+		});
+	});
+
+	it('should render component as message, sanitized as well', async () => {
+		const messageData = {
+			message: h(
+				defineComponent({
+					template: '<p>Test <strong>content</strong><script>alert("xss")</script></p>',
+				}),
+			),
+		};
 
 		toast.showMessage(messageData);
 
-		expect(Notification).toHaveBeenCalledWith(
-			expect.objectContaining({
-				message: 'alert("xss")',
-				title: 'alert("xss")',
-			}),
-		);
+		await waitFor(() => {
+			expect(screen.getByRole('alert')).toBeVisible();
+			expect(
+				within(screen.getByRole('alert')).queryByRole('heading', { level: 2 }),
+			).toHaveTextContent('');
+			expect(
+				within(screen.getByRole('alert')).getByRole('heading', { level: 2 }).querySelectorAll('*'),
+			).toHaveLength(0);
+			expect(screen.getByRole('alert')).toContainHTML('<p>Test <strong>content</strong></p>');
+		});
 	});
 });
diff --git a/packages/editor-ui/src/composables/useToast.ts b/packages/editor-ui/src/composables/useToast.ts
index 365a72e3fe043..764215cf70802 100644
--- a/packages/editor-ui/src/composables/useToast.ts
+++ b/packages/editor-ui/src/composables/useToast.ts
@@ -33,7 +33,7 @@ export function useToast() {
 	const canvasStore = useCanvasStore();
 
 	const messageDefaults: Partial<Omit<NotificationOptions, 'message'>> = {
-		dangerouslyUseHTMLString: false,
+		dangerouslyUseHTMLString: true,
 		position: 'bottom-right',
 		zIndex: APP_Z_INDEXES.TOASTS, // above NDV and modal overlays
 		offset: settingsStore.isAiAssistantEnabled || workflowsStore.isChatPanelOpen ? 64 : 0,
@@ -82,7 +82,6 @@ export function useToast() {
 		customClass?: string;
 		closeOnClick?: boolean;
 		type?: MessageBoxState['type'];
-		dangerouslyUseHTMLString?: boolean;
 	}) {
 		// eslint-disable-next-line prefer-const
 		let notification: NotificationHandle;
@@ -107,7 +106,6 @@ export function useToast() {
 			duration: config.duration,
 			customClass: config.customClass,
 			type: config.type,
-			dangerouslyUseHTMLString: config.dangerouslyUseHTMLString ?? true,
 		});
 
 		return notification;
@@ -145,7 +143,6 @@ export function useToast() {
 					${collapsableDetails(error)}`,
 				type: 'error',
 				duration: 0,
-				dangerouslyUseHTMLString: true,
 			},
 			false,
 		);
@@ -165,12 +162,6 @@ export function useToast() {
 		});
 	}
 
-	function showAlert(config: NotificationOptions): NotificationHandle {
-		return Notification({
-			...config,
-		});
-	}
-
 	function causedByCredential(message: string | undefined) {
 		if (!message || typeof message !== 'string') return false;
 
@@ -209,7 +200,6 @@ export function useToast() {
 		showMessage,
 		showToast,
 		showError,
-		showAlert,
 		clearAllStickyNotifications,
 		showNotificationForViews,
 	};
diff --git a/packages/editor-ui/src/composables/useWorkflowHelpers.ts b/packages/editor-ui/src/composables/useWorkflowHelpers.ts
index ca934cf2cf7bd..39a67b06e0b46 100644
--- a/packages/editor-ui/src/composables/useWorkflowHelpers.ts
+++ b/packages/editor-ui/src/composables/useWorkflowHelpers.ts
@@ -518,7 +518,6 @@ export function useWorkflowHelpers(options: { router: ReturnType<typeof useRoute
 
 		const nodes: INode[] = [];
 		for (let nodeIndex = 0; nodeIndex < workflowNodes.length; nodeIndex++) {
-			// @ts-ignore
 			nodeData = getNodeDataToSave(workflowNodes[nodeIndex]);
 
 			nodes.push(nodeData);
@@ -882,7 +881,6 @@ export function useWorkflowHelpers(options: { router: ReturnType<typeof useRoute
 					}),
 					i18n.baseText('workflows.concurrentChanges.confirmMessage.title'),
 					{
-						dangerouslyUseHTMLString: true,
 						confirmButtonText: i18n.baseText(
 							'workflows.concurrentChanges.confirmMessage.confirmButtonText',
 						),
diff --git a/packages/editor-ui/src/constants.workflows.ts b/packages/editor-ui/src/constants.workflows.ts
index 52a6881df88e7..2116a471f93fe 100644
--- a/packages/editor-ui/src/constants.workflows.ts
+++ b/packages/editor-ui/src/constants.workflows.ts
@@ -175,7 +175,8 @@ export const SAMPLE_SUBWORKFLOW_WORKFLOW: WorkflowDataWithTemplateId = {
 	nodes: [
 		{
 			id: 'c055762a-8fe7-4141-a639-df2372f30060',
-			name: 'Execute Workflow Trigger',
+			typeVersion: 1.1,
+			name: 'Workflow Input Trigger',
 			type: 'n8n-nodes-base.executeWorkflowTrigger',
 			position: [260, 340],
 			parameters: {},
@@ -189,7 +190,7 @@ export const SAMPLE_SUBWORKFLOW_WORKFLOW: WorkflowDataWithTemplateId = {
 		},
 	] as INodeUi[],
 	connections: {
-		'Execute Workflow Trigger': {
+		'Workflow Input Trigger': {
 			main: [
 				[
 					{
diff --git a/packages/editor-ui/src/plugins/i18n/index.ts b/packages/editor-ui/src/plugins/i18n/index.ts
index 6949862c7331a..2a3ff1fe9d32c 100644
--- a/packages/editor-ui/src/plugins/i18n/index.ts
+++ b/packages/editor-ui/src/plugins/i18n/index.ts
@@ -19,9 +19,13 @@ export const i18nInstance = createI18n({
 	locale: 'en',
 	fallbackLocale: 'en',
 	messages: { en: englishBaseText },
+	warnHtmlInMessage: 'off',
 });
 
-type BaseTextOptions = { adjustToNumber?: number; interpolate?: Record<string, string | number> };
+type BaseTextOptions = {
+	adjustToNumber?: number;
+	interpolate?: Record<string, string | number>;
+};
 
 export class I18nClass {
 	private baseTextCache = new Map<string, string>();
@@ -42,6 +46,10 @@ export class I18nClass {
 		return longNodeType.replace('n8n-nodes-base.', '');
 	}
 
+	get locale() {
+		return i18nInstance.global.locale;
+	}
+
 	// ----------------------------------
 	//        render methods
 	// ----------------------------------
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 9c74e92f2e6f7..3af5aa9111d4d 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -46,7 +46,10 @@
 	"generic.copy": "Copy",
 	"generic.delete": "Delete",
 	"generic.dontShowAgain": "Don't show again",
+	"generic.enterprise": "Enterprise",
 	"generic.executions": "Executions",
+	"generic.tag_plural": "Tags",
+	"generic.tag": "Tag | {count} Tags",
 	"generic.tests": "Tests",
 	"generic.or": "or",
 	"generic.clickToCopy": "Click to copy",
@@ -55,6 +58,7 @@
 	"generic.yes": "Yes",
 	"generic.no": "No",
 	"generic.rating": "Rating",
+	"generic.refresh": "Refresh",
 	"generic.retry": "Retry",
 	"generic.error": "Something went wrong",
 	"generic.settings": "Settings",
@@ -67,8 +71,8 @@
 	"generic.unsavedWork.confirmMessage.cancelButtonText": "Leave without saving",
 	"generic.upgrade": "Upgrade",
 	"generic.upgradeNow": "Upgrade now",
-	"generic.credential": "Credential",
-	"generic.workflow": "Workflow",
+	"generic.credential": "Credential | {count} Credential | {count} Credentials",
+	"generic.workflow": "Workflow | {count} Workflow | {count} Workflows",
 	"generic.workflowSaved": "Workflow changes saved",
 	"generic.editor": "Editor",
 	"generic.seePlans": "See plans",
@@ -77,6 +81,10 @@
 	"generic.ownedByMe": "(You)",
 	"generic.moreInfo": "More info",
 	"generic.next": "Next",
+	"generic.pro": "Pro",
+	"generic.variable_plural": "Variables",
+	"generic.variable": "Variable | {count} Variables",
+	"generic.viewDocs": "View docs",
 	"about.aboutN8n": "About n8n",
 	"about.close": "Close",
 	"about.license": "License",
@@ -629,7 +637,7 @@
 	"credentials.noResults.withSearch.switchToShared.preamble": "some credentials may be",
 	"credentials.noResults.withSearch.switchToShared.link": "hidden",
 	"credentials.create.personal.toast.title": "Credential successfully created",
-	"credentials.create.personal.toast.text": "This credential is currently private to you.",
+	"credentials.create.personal.toast.text": "This credential has been created inside your personal space.",
 	"credentials.create.project.toast.title": "Credential successfully created in {projectName}",
 	"credentials.create.project.toast.text": "All members from {projectName} will have access to this credential.",
 	"dataDisplay.needHelp": "Need help?",
@@ -662,6 +670,7 @@
 	"error.goBack": "Go back",
 	"error.pageNotFound": "Oops, couldn’t find that",
 	"executions.ExecutionStatus": "Execution status",
+	"executions.concurrency.docsLink": "https://docs.n8n.io/hosting/scaling/concurrency-control/",
 	"executionDetails.confirmMessage.confirmButtonText": "Yes, delete",
 	"executionDetails.confirmMessage.headline": "Delete Execution?",
 	"executionDetails.confirmMessage.message": "Are you sure that you want to delete the current execution?",
@@ -702,7 +711,7 @@
 	"executionsLandingPage.noResults": "No executions found",
 	"executionsList.activeExecutions.none": "No active executions",
 	"executionsList.activeExecutions.header": "{running}/{cap} active executions",
-	"executionsList.activeExecutions.tooltip": "Current active executions: {running} out of {cap} allowed by your plan. Upgrade to increase the limit.",
+	"executionsList.activeExecutions.tooltip": "Current active executions: {running} out of {cap}. This instance is limited to {cap} concurrent production executions.",
 	"executionsList.allWorkflows": "All Workflows",
 	"executionsList.anyStatus": "Any Status",
 	"executionsList.autoRefresh": "Auto refresh",
@@ -771,7 +780,9 @@
 	"executionsList.view": "View",
 	"executionsList.stop": "Stop",
 	"executionsList.statusTooltipText.waitingForWebhook": "The workflow is waiting indefinitely for an incoming webhook call.",
-	"executionsList.statusTooltipText.waitingForConcurrencyCapacity": "This execution will start once concurrency capacity is available. This instance is limited to {concurrencyCap} concurrent production executions.",
+	"executionsList.statusTooltipText.waitingForConcurrencyCapacity": "This execution will start once concurrency capacity is available. {instance}",
+	"executionsList.statusTooltipText.waitingForConcurrencyCapacity.cloud": "Your plan is limited to {concurrencyCap} concurrent production executions. {link}",
+	"executionsList.statusTooltipText.waitingForConcurrencyCapacity.self": "This instance is limited to {concurrencyCap} concurrent production executions. {link}",
 	"executionsList.statusTooltipText.theWorkflowIsWaitingIndefinitely": "The workflow is waiting indefinitely for an incoming webhook call.",
 	"executionsList.debug.button.copyToEditor": "Copy to editor",
 	"executionsList.debug.button.debugInEditor": "Debug in editor",
@@ -846,6 +857,7 @@
 	"fixedCollectionParameter.choose": "Choose...",
 	"fixedCollectionParameter.currentlyNoItemsExist": "Currently no items exist",
 	"fixedCollectionParameter.deleteItem": "Delete item",
+	"fixedCollectionParameter.dragItem": "Drag item",
 	"fixedCollectionParameter.moveDown": "Move down",
 	"fixedCollectionParameter.moveUp": "Move up",
 	"forgotPassword": "Forgot my password",
@@ -1561,7 +1573,7 @@
 	"resourceMapper.fetchingFields.message": "Fetching {fieldWord}",
 	"resourceMapper.fetchingFields.errorMessage": "Can't get {fieldWord}.",
 	"resourceMapper.fetchingFields.noFieldsFound": "No {fieldWord} found in {serviceName}.",
-	"resourceMapper.columnsToMatchOn.label": "{fieldWord} to Match On",
+	"resourceMapper.columnsToMatchOn.label": "{fieldWord} to match on",
 	"resourceMapper.columnsToMatchOn.multi.description": "The {fieldWord} to use when matching rows in {nodeDisplayName} to the input items of this node. Usually an ID.",
 	"resourceMapper.columnsToMatchOn.single.description": "The {fieldWord} to use when matching rows in {nodeDisplayName} to the input items of this node. Usually an ID.",
 	"resourceMapper.columnsToMatchOn.tooltip": "The {fieldWord} to compare when finding the rows to update",
@@ -1572,11 +1584,17 @@
 	"resourceMapper.usingToMatch.description": "This {fieldWord} won't be updated and can't be removed, as it's used for matching",
 	"resourceMapper.removeField": "Remove {fieldWord}",
 	"resourceMapper.mandatoryField.title": "This {fieldWord} is mandatory and can’t be removed",
-	"resourceMapper.addFieldToSend": "Add {fieldWord} to Send",
+	"resourceMapper.addFieldToSend": "Add {fieldWord} to send",
 	"resourceMapper.matching.title": "This {fieldWord} is used for matching and can’t be removed",
 	"resourceMapper.addAllFields": "Add All {fieldWord}",
 	"resourceMapper.removeAllFields": "Remove All {fieldWord}",
 	"resourceMapper.refreshFieldList": "Refresh {fieldWord} List",
+	"resourceMapper.staleDataWarning.tooltip": "{fieldWord} are outdated. Refresh to see the changes.",
+	"resourceMapper.staleDataWarning.notice": "Refresh to see the updated fields",
+	"resourceMapper.attemptToConvertTypes.displayName": "Attempt to convert types",
+	"resourceMapper.attemptToConvertTypes.description": "Attempt to convert types when mapping fields",
+	"resourceMapper.ignoreTypeMismatchErrors.displayName": "Ignore type mismatch errors",
+	"resourceMapper.ignoreTypeMismatchErrors.description": "Whether type mismatches should be ignored, rather than returning an Error",
 	"runData.openSubExecution": "Inspect Sub-Execution {id}",
 	"runData.openParentExecution": "Inspect Parent Execution {id}",
 	"runData.emptyItemHint": "This is an item, but it's empty.",
@@ -1919,19 +1937,19 @@
 	"settings.sourceControl.button.push": "Push",
 	"settings.sourceControl.button.pull": "Pull",
 	"settings.sourceControl.modals.push.title": "Commit and push changes",
-	"settings.sourceControl.modals.push.description": "Workflows you push will overwrite any existing versions in the repository. ",
+	"settings.sourceControl.modals.push.description": "The following will be committed: ",
 	"settings.sourceControl.modals.push.description.learnMore": "More info",
 	"settings.sourceControl.modals.push.filesToCommit": "Files to commit",
 	"settings.sourceControl.modals.push.workflowsToCommit": "Select workflows",
 	"settings.sourceControl.modals.push.everythingIsUpToDate": "Everything is up to date",
-	"settings.sourceControl.modals.push.noWorkflowChanges": "No workflow changes to push. Only modified credentials, variables, and tags will be pushed. {link}",
+	"settings.sourceControl.modals.push.noWorkflowChanges": "There are no workflow changes but the following will be committed: {link}",
 	"settings.sourceControl.modals.push.noWorkflowChanges.moreInfo": "More info",
 	"settings.sourceControl.modals.push.commitMessage": "Commit message",
 	"settings.sourceControl.modals.push.commitMessage.placeholder": "e.g. My commit",
 	"settings.sourceControl.modals.push.buttons.cancel": "Cancel",
 	"settings.sourceControl.modals.push.buttons.save": "Commit and push",
 	"settings.sourceControl.modals.push.success.title": "Pushed successfully",
-	"settings.sourceControl.modals.push.success.description": "The files you selected were committed and pushed to the remote repository",
+	"settings.sourceControl.modals.push.success.description": "were committed and pushed to your remote repository",
 	"settings.sourceControl.status.modified": "Modified",
 	"settings.sourceControl.status.deleted": "Deleted",
 	"settings.sourceControl.status.created": "New",
@@ -2325,7 +2343,7 @@
 	"workflows.concurrentChanges.confirmMessage.cancelButtonText": "Cancel",
 	"workflows.concurrentChanges.confirmMessage.confirmButtonText": "Overwrite and Save",
 	"workflows.create.personal.toast.title": "Workflow successfully created",
-	"workflows.create.personal.toast.text": "This workflow is currently private to you.",
+	"workflows.create.personal.toast.text": "This workflow has been created inside your personal space.",
 	"workflows.create.project.toast.title": "Workflow successfully created in {projectName}",
 	"workflows.create.project.toast.text": "All members from {projectName} will have access to this workflow.",
 	"importCurlModal.title": "Import cURL command",
@@ -2529,7 +2547,7 @@
 	"projects.menu.overview": "Overview",
 	"projects.menu.title": "Projects",
 	"projects.menu.personal": "Personal",
-	"projects.menu.addProject": "Add project",
+	"projects.menu.addFirstProject": "Add first project",
 	"projects.settings": "Project settings",
 	"projects.settings.newProjectName": "My project",
 	"projects.settings.name": "Project name",
@@ -2567,6 +2585,7 @@
 	"projects.error.title": "Project error",
 	"projects.create.limit": "{num} project | {num} projects",
 	"projects.create.limitReached": "You have reached the {planName} plan limit of {limit}. Upgrade your plan to unlock more projects. {link}",
+	"projects.create.limitReached.cloud": "You have reached the {planName} plan limit of {limit}. Upgrade your plan to unlock more projects.",
 	"projects.create.limitReached.self": "Upgrade to unlock projects for more granular control over sharing, access and organisation of workflows",
 	"projects.create.limitReached.link": "View plans",
 	"projects.move.resource.modal.title": "Choose a project or user to move this {resourceTypeLabel} to",
@@ -2695,6 +2714,7 @@
 	"filter.combinator.and": "AND",
 	"filter.addCondition": "Add condition",
 	"filter.removeCondition": "Remove condition",
+	"filter.dragCondition": "Drag condition",
 	"filter.maxConditions": "Maximum conditions reached",
 	"filter.condition.resolvedTrue": "This condition is true for the first input item",
 	"filter.condition.resolvedFalse": "This condition is false for the first input item",
diff --git a/packages/editor-ui/src/stores/nodeTypes.store.ts b/packages/editor-ui/src/stores/nodeTypes.store.ts
index 7a8e66aab0e3c..06917edfaaf22 100644
--- a/packages/editor-ui/src/stores/nodeTypes.store.ts
+++ b/packages/editor-ui/src/stores/nodeTypes.store.ts
@@ -302,6 +302,16 @@ export const useNodeTypesStore = defineStore(STORES.NODE_TYPES, () => {
 		}
 	};
 
+	const getLocalResourceMapperFields = async (
+		sendData: DynamicNodeParameters.ResourceMapperFieldsRequest,
+	) => {
+		try {
+			return await nodeTypesApi.getLocalResourceMapperFields(rootStore.restApiContext, sendData);
+		} catch (error) {
+			return null;
+		}
+	};
+
 	const getNodeParameterActionResult = async (
 		sendData: DynamicNodeParameters.ActionResultRequest,
 	) => {
@@ -326,6 +336,7 @@ export const useNodeTypesStore = defineStore(STORES.NODE_TYPES, () => {
 		visibleNodeTypesByInputConnectionTypeNames,
 		isConfigurableNode,
 		getResourceMapperFields,
+		getLocalResourceMapperFields,
 		getNodeParameterActionResult,
 		getResourceLocatorResults,
 		getNodeParameterOptions,
diff --git a/packages/editor-ui/src/stores/settings.store.ts b/packages/editor-ui/src/stores/settings.store.ts
index 822c05f4dc1f6..2f9e41a0abf56 100644
--- a/packages/editor-ui/src/stores/settings.store.ts
+++ b/packages/editor-ui/src/stores/settings.store.ts
@@ -278,7 +278,6 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, () => {
 				message: i18n.baseText('startupError.message'),
 				type: 'error',
 				duration: 0,
-				dangerouslyUseHTMLString: true,
 			});
 
 			throw e;
diff --git a/packages/editor-ui/src/stores/ui.store.ts b/packages/editor-ui/src/stores/ui.store.ts
index abd463d57e1d1..3ed595261c755 100644
--- a/packages/editor-ui/src/stores/ui.store.ts
+++ b/packages/editor-ui/src/stores/ui.store.ts
@@ -188,14 +188,6 @@ export const useUIStore = defineStore(STORES.UI, () => {
 		return theme.value === 'system' ? getPreferredTheme() : theme.value;
 	});
 
-	const logo = computed(() => {
-		const { releaseChannel } = settingsStore.settings;
-		const suffix = appliedTheme.value === 'dark' ? '-dark.svg' : '.svg';
-		return `static/logo/${
-			releaseChannel === 'stable' ? 'expanded' : `channel/${releaseChannel}`
-		}${suffix}`;
-	});
-
 	const contextBasedTranslationKeys = computed(() => {
 		const deploymentType = settingsStore.deploymentType;
 
@@ -563,7 +555,6 @@ export const useUIStore = defineStore(STORES.UI, () => {
 	return {
 		appGridWidth,
 		appliedTheme,
-		logo,
 		contextBasedTranslationKeys,
 		getLastSelectedNode,
 		isVersionsOpen,
diff --git a/packages/editor-ui/src/stores/workflows.store.ts b/packages/editor-ui/src/stores/workflows.store.ts
index 2aa8cde9f9255..7e4cb6d95e854 100644
--- a/packages/editor-ui/src/stores/workflows.store.ts
+++ b/packages/editor-ui/src/stores/workflows.store.ts
@@ -85,7 +85,7 @@ import { TelemetryHelpers } from 'n8n-workflow';
 import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
 import { useRouter } from 'vue-router';
 import { useSettingsStore } from './settings.store';
-import { closeFormPopupWindow, openFormPopupWindow } from '@/utils/executionUtils';
+import { clearPopupWindowState, openFormPopupWindow } from '@/utils/executionUtils';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
 import { useUsersStore } from '@/stores/users.store';
 import { updateCurrentUserSettings } from '@/api/users';
@@ -1608,7 +1608,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 		uiStore.removeActiveAction('workflowRunning');
 		workflowHelpers.setDocumentTitle(workflowName.value, 'IDLE');
 
-		closeFormPopupWindow();
+		clearPopupWindowState();
 
 		const runData = workflowExecutionData.value?.data?.resultData.runData ?? {};
 		for (const nodeName in runData) {
diff --git a/packages/editor-ui/src/types/canvas.ts b/packages/editor-ui/src/types/canvas.ts
index ad8d51ba8a6cc..0dcbee1dd0259 100644
--- a/packages/editor-ui/src/types/canvas.ts
+++ b/packages/editor-ui/src/types/canvas.ts
@@ -1,10 +1,5 @@
 /* eslint-disable @typescript-eslint/no-redundant-type-constituents */
-import type {
-	ExecutionStatus,
-	INodeConnections,
-	IConnection,
-	NodeConnectionType,
-} from 'n8n-workflow';
+import type { ExecutionStatus, INodeConnections, NodeConnectionType } from 'n8n-workflow';
 import type {
 	DefaultEdge,
 	Node,
@@ -15,11 +10,8 @@ import type {
 } from '@vue-flow/core';
 import type { IExecutionResponse, INodeUi } from '@/Interface';
 import type { ComputedRef, Ref } from 'vue';
-import type { PartialBy } from '@/utils/typeHelpers';
 import type { EventBus } from 'n8n-design-system';
 
-export type CanvasConnectionPortType = NodeConnectionType;
-
 export const enum CanvasConnectionMode {
 	Input = 'inputs',
 	Output = 'outputs',
@@ -31,10 +23,11 @@ export const canvasConnectionModes = [
 ] as const;
 
 export type CanvasConnectionPort = {
-	type: CanvasConnectionPortType;
+	node?: string;
+	type: NodeConnectionType;
+	index: number;
 	required?: boolean;
 	maxConnections?: number;
-	index: number;
 	label?: string;
 };
 
@@ -124,7 +117,6 @@ export type CanvasNode = Node<CanvasNodeData>;
 export interface CanvasConnectionData {
 	source: CanvasConnectionPort;
 	target: CanvasConnectionPort;
-	fromNodeName?: string;
 	status?: 'success' | 'error' | 'pinned' | 'running';
 	maxConnections?: number;
 }
@@ -137,8 +129,8 @@ export type CanvasConnectionCreateData = {
 	target: string;
 	targetHandle: string;
 	data: {
-		source: PartialBy<IConnection, 'node'>;
-		target: PartialBy<IConnection, 'node'>;
+		source: CanvasConnectionPort;
+		target: CanvasConnectionPort;
 	};
 };
 
diff --git a/packages/editor-ui/src/utils/canvasUtilsV2.test.ts b/packages/editor-ui/src/utils/canvasUtilsV2.test.ts
index 7eab644900a09..61425172b345f 100644
--- a/packages/editor-ui/src/utils/canvasUtilsV2.test.ts
+++ b/packages/editor-ui/src/utils/canvasUtilsV2.test.ts
@@ -77,12 +77,13 @@ describe('mapLegacyConnectionsToCanvasConnections', () => {
 				sourceHandle,
 				targetHandle,
 				data: {
-					fromNodeName: nodes[0].name,
 					source: {
+						node: nodes[0].name,
 						index: 0,
 						type: NodeConnectionType.Main,
 					},
 					target: {
+						node: nodes[1].name,
 						index: 0,
 						type: NodeConnectionType.Main,
 					},
@@ -215,12 +216,13 @@ describe('mapLegacyConnectionsToCanvasConnections', () => {
 				sourceHandle: sourceHandleA,
 				targetHandle: targetHandleA,
 				data: {
-					fromNodeName: nodes[0].name,
 					source: {
+						node: nodes[0].name,
 						index: 0,
 						type: NodeConnectionType.Main,
 					},
 					target: {
+						node: nodes[1].name,
 						index: 0,
 						type: NodeConnectionType.Main,
 					},
@@ -233,12 +235,13 @@ describe('mapLegacyConnectionsToCanvasConnections', () => {
 				sourceHandle: sourceHandleB,
 				targetHandle: targetHandleB,
 				data: {
-					fromNodeName: nodes[0].name,
 					source: {
+						node: nodes[0].name,
 						index: 1,
 						type: NodeConnectionType.Main,
 					},
 					target: {
+						node: nodes[1].name,
 						index: 1,
 						type: NodeConnectionType.Main,
 					},
@@ -334,12 +337,13 @@ describe('mapLegacyConnectionsToCanvasConnections', () => {
 				sourceHandle: sourceHandleA,
 				targetHandle: targetHandleA,
 				data: {
-					fromNodeName: nodes[0].name,
 					source: {
+						node: nodes[0].name,
 						index: 0,
 						type: NodeConnectionType.Main,
 					},
 					target: {
+						node: nodes[1].name,
 						index: 0,
 						type: NodeConnectionType.Main,
 					},
@@ -352,12 +356,13 @@ describe('mapLegacyConnectionsToCanvasConnections', () => {
 				sourceHandle: sourceHandleB,
 				targetHandle: targetHandleB,
 				data: {
-					fromNodeName: nodes[0].name,
 					source: {
+						node: nodes[0].name,
 						index: 1,
 						type: NodeConnectionType.Main,
 					},
 					target: {
+						node: nodes[2].name,
 						index: 0,
 						type: NodeConnectionType.Main,
 					},
@@ -475,12 +480,13 @@ describe('mapLegacyConnectionsToCanvasConnections', () => {
 				sourceHandle: sourceHandleA,
 				targetHandle: targetHandleA,
 				data: {
-					fromNodeName: nodes[0].name,
 					source: {
+						node: nodes[0].name,
 						index: 0,
 						type: NodeConnectionType.Main,
 					},
 					target: {
+						node: nodes[1].name,
 						index: 0,
 						type: NodeConnectionType.Main,
 					},
@@ -493,12 +499,13 @@ describe('mapLegacyConnectionsToCanvasConnections', () => {
 				sourceHandle: sourceHandleB,
 				targetHandle: targetHandleB,
 				data: {
-					fromNodeName: nodes[0].name,
 					source: {
+						node: nodes[0].name,
 						index: 0,
 						type: NodeConnectionType.AiMemory,
 					},
 					target: {
+						node: nodes[2].name,
 						index: 1,
 						type: NodeConnectionType.AiMemory,
 					},
@@ -511,12 +518,13 @@ describe('mapLegacyConnectionsToCanvasConnections', () => {
 				sourceHandle: sourceHandleC,
 				targetHandle: targetHandleC,
 				data: {
-					fromNodeName: nodes[1].name,
 					source: {
+						node: nodes[1].name,
 						index: 0,
 						type: NodeConnectionType.Main,
 					},
 					target: {
+						node: nodes[2].name,
 						index: 0,
 						type: NodeConnectionType.Main,
 					},
@@ -587,12 +595,13 @@ describe('mapLegacyConnectionsToCanvasConnections', () => {
 				sourceHandle,
 				targetHandle,
 				data: {
-					fromNodeName: nodes[0].name,
 					source: {
+						node: nodes[0].name,
 						index: 1,
 						type: NodeConnectionType.Main,
 					},
 					target: {
+						node: nodes[1].name,
 						index: 0,
 						type: NodeConnectionType.Main,
 					},
@@ -662,12 +671,13 @@ describe('mapLegacyConnectionsToCanvasConnections', () => {
 				sourceHandle,
 				targetHandle,
 				data: {
-					fromNodeName: nodes[0].name,
 					source: {
+						node: nodes[0].name,
 						index: 1,
 						type: NodeConnectionType.Main,
 					},
 					target: {
+						node: nodes[1].name,
 						index: 0,
 						type: NodeConnectionType.Main,
 					},
diff --git a/packages/editor-ui/src/utils/canvasUtilsV2.ts b/packages/editor-ui/src/utils/canvasUtilsV2.ts
index c86e4a7f2cc5d..d08f817d8252f 100644
--- a/packages/editor-ui/src/utils/canvasUtilsV2.ts
+++ b/packages/editor-ui/src/utils/canvasUtilsV2.ts
@@ -22,7 +22,8 @@ export function mapLegacyConnectionsToCanvasConnections(
 			const fromPorts = legacyConnections[fromNodeName][fromConnectionType];
 			fromPorts?.forEach((toPorts, fromIndex) => {
 				toPorts?.forEach((toPort) => {
-					const toId = nodes.find((node) => node.name === toPort.node)?.id ?? '';
+					const toNodeName = toPort.node;
+					const toId = nodes.find((node) => node.name === toNodeName)?.id ?? '';
 					const toConnectionType = toPort.type as NodeConnectionType;
 					const toIndex = toPort.index;
 
@@ -53,12 +54,13 @@ export function mapLegacyConnectionsToCanvasConnections(
 							sourceHandle,
 							targetHandle,
 							data: {
-								fromNodeName,
 								source: {
+									node: fromNodeName,
 									index: fromIndex,
 									type: fromConnectionType,
 								},
 								target: {
+									node: toNodeName,
 									index: toIndex,
 									type: toConnectionType,
 								},
diff --git a/packages/editor-ui/src/utils/executionUtils.ts b/packages/editor-ui/src/utils/executionUtils.ts
index d8db7b8f8e950..a6fc615aedab3 100644
--- a/packages/editor-ui/src/utils/executionUtils.ts
+++ b/packages/editor-ui/src/utils/executionUtils.ts
@@ -82,27 +82,22 @@ export const executionFilterToQueryFilter = (
 	return queryFilter;
 };
 
-let formPopupWindow: Window | null = null;
+let formPopupWindow: boolean = false;
 
 export const openFormPopupWindow = (url: string) => {
-	if (!formPopupWindow || formPopupWindow.closed) {
+	if (!formPopupWindow) {
 		const height = 700;
 		const width = window.innerHeight - 50;
 		const left = (window.innerWidth - height) / 2;
 		const top = 50;
 		const features = `width=${height},height=${width},left=${left},top=${top},resizable=yes,scrollbars=yes`;
 		const windowName = `form-waiting-since-${Date.now()}`;
-		formPopupWindow = window.open(url, windowName, features);
-	} else {
-		formPopupWindow.location = url;
-		formPopupWindow.focus();
+		window.open(url, windowName, features);
+		formPopupWindow = true;
 	}
 };
 
-export const closeFormPopupWindow = () => {
-	formPopupWindow?.close();
-	formPopupWindow = null;
-};
+export const clearPopupWindowState = () => (formPopupWindow = false);
 
 export function displayForm({
 	nodes,
diff --git a/packages/editor-ui/src/utils/htmlUtils.ts b/packages/editor-ui/src/utils/htmlUtils.ts
index cf4bb85c6c0f3..f1d6119adbe80 100644
--- a/packages/editor-ui/src/utils/htmlUtils.ts
+++ b/packages/editor-ui/src/utils/htmlUtils.ts
@@ -18,8 +18,8 @@ export function sanitizeHtml(dirtyHtml: string) {
 			}
 
 			if (ALLOWED_HTML_ATTRIBUTES.includes(name) || name.startsWith('data-')) {
-				// href is allowed but we need to sanitize certain protocols
-				if (name === 'href' && !value.match(/^https?:\/\//gm)) {
+				// href is allowed but we allow only https and relative URLs
+				if (name === 'href' && !value.match(/^https?:\/\//gm) && !value.startsWith('/')) {
 					return '';
 				}
 				return `${name}="${escapeAttrValue(value)}"`;
diff --git a/packages/editor-ui/src/utils/nodeTypeUtils.test.ts b/packages/editor-ui/src/utils/nodeTypeUtils.test.ts
new file mode 100644
index 0000000000000..8eb9c471189b4
--- /dev/null
+++ b/packages/editor-ui/src/utils/nodeTypeUtils.test.ts
@@ -0,0 +1,75 @@
+import type { ResourceMapperField } from 'n8n-workflow';
+import { isResourceMapperFieldListStale } from './nodeTypesUtils';
+
+describe('isResourceMapperFieldListStale', () => {
+	const baseField: ResourceMapperField = {
+		id: 'test',
+		displayName: 'test',
+		required: false,
+		defaultMatch: false,
+		display: true,
+		canBeUsedToMatch: true,
+		type: 'string',
+	};
+
+	// Test property changes
+	test.each([
+		[
+			'displayName',
+			{ ...baseField },
+			{ ...baseField, displayName: 'changed' } as ResourceMapperField,
+		],
+		['required', { ...baseField }, { ...baseField, required: true } as ResourceMapperField],
+		['defaultMatch', { ...baseField }, { ...baseField, defaultMatch: true } as ResourceMapperField],
+		['display', { ...baseField }, { ...baseField, display: false }],
+		[
+			'canBeUsedToMatch',
+			{ ...baseField },
+			{ ...baseField, canBeUsedToMatch: false } as ResourceMapperField,
+		],
+		['type', { ...baseField }, { ...baseField, type: 'number' } as ResourceMapperField],
+	])('returns true when %s changes', (_property, oldField, newField) => {
+		expect(isResourceMapperFieldListStale([oldField], [newField])).toBe(true);
+	});
+
+	// Test different array lengths
+	test.each([
+		['empty vs non-empty', [], [baseField]],
+		['non-empty vs empty', [baseField], []],
+		['one vs two fields', [baseField], [baseField, { ...baseField, id: 'test2' }]],
+	])('returns true for different lengths: %s', (_scenario, oldFields, newFields) => {
+		expect(isResourceMapperFieldListStale(oldFields, newFields)).toBe(true);
+	});
+
+	// Test identical cases
+	test.each([
+		['empty arrays', [], []],
+		['single field', [baseField], [{ ...baseField }]],
+		[
+			'multiple fields',
+			[
+				{ ...baseField, id: 'test1' },
+				{ ...baseField, id: 'test2' },
+			],
+			[
+				{ ...baseField, id: 'test1' },
+				{ ...baseField, id: 'test2' },
+			],
+		],
+	])('returns false for identical lists: %s', (_scenario, oldFields, newFields) => {
+		expect(isResourceMapperFieldListStale(oldFields, newFields)).toBe(false);
+	});
+
+	// This test case is complex enough to keep separate
+	test('returns true when field is removed/replaced', () => {
+		const oldFields = [
+			{ ...baseField, id: 'test1' },
+			{ ...baseField, id: 'test2' },
+		];
+		const newFields = [
+			{ ...baseField, id: 'test1' },
+			{ ...baseField, id: 'test3' }, // different id
+		];
+		expect(isResourceMapperFieldListStale(oldFields, newFields)).toBe(true);
+	});
+});
diff --git a/packages/editor-ui/src/utils/nodeTypesUtils.ts b/packages/editor-ui/src/utils/nodeTypesUtils.ts
index 91fe812e4ece5..3b732dcda624b 100644
--- a/packages/editor-ui/src/utils/nodeTypesUtils.ts
+++ b/packages/editor-ui/src/utils/nodeTypesUtils.ts
@@ -440,6 +440,42 @@ export const fieldCannotBeDeleted = (
 	);
 };
 
+export const isResourceMapperFieldListStale = (
+	oldFields: ResourceMapperField[],
+	newFields: ResourceMapperField[],
+): boolean => {
+	if (oldFields.length !== newFields.length) {
+		return true;
+	}
+
+	// Create map for O(1) lookup
+	const newFieldsMap = new Map(newFields.map((field) => [field.id, field]));
+
+	// Check if any fields were removed or modified
+	for (const oldField of oldFields) {
+		const newField = newFieldsMap.get(oldField.id);
+
+		// Field was removed
+		if (!newField) {
+			return true;
+		}
+
+		// Check if any properties changed
+		if (
+			oldField.displayName !== newField.displayName ||
+			oldField.required !== newField.required ||
+			oldField.defaultMatch !== newField.defaultMatch ||
+			oldField.display !== newField.display ||
+			oldField.canBeUsedToMatch !== newField.canBeUsedToMatch ||
+			oldField.type !== newField.type
+		) {
+			return true;
+		}
+	}
+
+	return false;
+};
+
 export const isMatchingField = (
 	field: string,
 	matchingFields: string[],
diff --git a/packages/editor-ui/src/views/AuthView.vue b/packages/editor-ui/src/views/AuthView.vue
index 1bc9267c8c064..426fac034545b 100644
--- a/packages/editor-ui/src/views/AuthView.vue
+++ b/packages/editor-ui/src/views/AuthView.vue
@@ -1,6 +1,8 @@
 <script setup lang="ts">
+import Logo from '@/components/Logo/Logo.vue';
 import SSOLogin from '@/components/SSOLogin.vue';
 import type { IFormBoxConfig } from '@/Interface';
+import { useSettingsStore } from '@/stores/settings.store';
 
 withDefaults(
 	defineProps<{
@@ -32,13 +34,15 @@ const onSubmit = (values: { [key: string]: string }) => {
 const onSecondaryClick = () => {
 	emit('secondaryClick');
 };
+
+const {
+	settings: { releaseChannel },
+} = useSettingsStore();
 </script>
 
 <template>
 	<div :class="$style.container">
-		<div :class="$style.logoContainer">
-			<Logo />
-		</div>
+		<Logo location="authView" :release-channel="releaseChannel" />
 		<div v-if="subtitle" :class="$style.textContainer">
 			<n8n-text size="large">{{ subtitle }}</n8n-text>
 		</div>
@@ -69,16 +73,10 @@ body {
 	padding-top: var(--spacing-2xl);
 
 	> * {
-		margin-bottom: var(--spacing-l);
 		width: 352px;
 	}
 }
 
-.logoContainer {
-	display: flex;
-	justify-content: center;
-}
-
 .textContainer {
 	text-align: center;
 }
diff --git a/packages/editor-ui/src/views/MfaView.vue b/packages/editor-ui/src/views/MfaView.vue
index 0bb386c8bd9de..b17a21dde140d 100644
--- a/packages/editor-ui/src/views/MfaView.vue
+++ b/packages/editor-ui/src/views/MfaView.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { IFormInputs } from '@/Interface';
-import Logo from '../components/Logo.vue';
+import Logo from '@/components/Logo/Logo.vue';
 import {
 	MFA_AUTHENTICATION_RECOVERY_CODE_INPUT_MAX_LENGTH,
 	MFA_AUTHENTICATION_CODE_INPUT_MAX_LENGTH,
@@ -10,6 +10,7 @@ import { mfaEventBus } from '@/event-bus';
 import { onMounted, ref } from 'vue';
 import { useI18n } from '@/composables/useI18n';
 import { toRefs } from '@vueuse/core';
+import { useSettingsStore } from '@/stores/settings.store';
 
 // ---------------------------------------------------------------------------
 // #region Props
@@ -152,6 +153,10 @@ const onSaveClick = () => {
 
 // #endregion
 
+const {
+	settings: { releaseChannel },
+} = useSettingsStore();
+
 // ---------------------------------------------------------------------------
 // #region Lifecycle hooks
 // ---------------------------------------------------------------------------
@@ -165,9 +170,7 @@ onMounted(() => {
 
 <template>
 	<div :class="$style.container">
-		<div :class="$style.logoContainer">
-			<Logo />
-		</div>
+		<Logo location="authView" :release-channel="releaseChannel" />
 		<n8n-card>
 			<div :class="$style.headerContainer">
 				<n8n-heading size="xlarge" color="text-dark">{{
@@ -245,16 +248,10 @@ body {
 	padding-top: var(--spacing-2xl);
 
 	> * {
-		margin-bottom: var(--spacing-l);
 		width: 352px;
 	}
 }
 
-.logoContainer {
-	display: flex;
-	justify-content: center;
-}
-
 .formContainer {
 	padding-bottom: var(--spacing-xl);
 }
diff --git a/packages/editor-ui/src/views/NodeView.v2.vue b/packages/editor-ui/src/views/NodeView.v2.vue
index 4f58b522942b1..06964ad1fb7e8 100644
--- a/packages/editor-ui/src/views/NodeView.v2.vue
+++ b/packages/editor-ui/src/views/NodeView.v2.vue
@@ -49,6 +49,7 @@ import type {
 import { CanvasNodeRenderType, CanvasConnectionMode } from '@/types';
 import {
 	CHAT_TRIGGER_NODE_TYPE,
+	DRAG_EVENT_DATA_KEY,
 	EnterpriseEditionFeature,
 	MAIN_HEADER_TABS,
 	MANUAL_CHAT_TRIGGER_NODE_TYPE,
@@ -179,6 +180,8 @@ const {
 	revertCreateConnection,
 	deleteConnection,
 	revertDeleteConnection,
+	revalidateNodeInputConnections,
+	revalidateNodeOutputConnections,
 	setNodeActiveByName,
 	addConnections,
 	importWorkflowData,
@@ -587,7 +590,6 @@ async function onClipboardPaste(plainTextData: string): Promise<void> {
 				cancelButtonText: i18n.baseText(
 					'nodeView.confirmMessage.onClipboardPasteEvent.cancelButtonText',
 				),
-				dangerouslyUseHTMLString: true,
 			},
 		);
 
@@ -723,6 +725,14 @@ function onUpdateNodeParameters(id: string, parameters: Record<string, unknown>)
 	setNodeParameters(id, parameters);
 }
 
+function onUpdateNodeInputs(id: string) {
+	revalidateNodeInputConnections(id);
+}
+
+function onUpdateNodeOutputs(id: string) {
+	revalidateNodeOutputConnections(id);
+}
+
 function onClickNodeAdd(source: string, sourceHandle: string) {
 	nodeCreatorStore.openNodeCreatorForConnectingNode({
 		connection: {
@@ -1368,7 +1378,6 @@ function checkIfEditingIsAllowed(): boolean {
 					: 'readOnly.showMessage.executions.message',
 			),
 			type: 'info',
-			dangerouslyUseHTMLString: true,
 		}) as unknown as { visible: boolean };
 
 		return false;
@@ -1444,6 +1453,28 @@ function onClickPane(position: CanvasNode['position']) {
 	setNodeSelected();
 }
 
+/**
+ * Drag and Drop events
+ */
+
+async function onDragAndDrop(position: VueFlowXYPosition, event: DragEvent) {
+	if (!event.dataTransfer) {
+		return;
+	}
+
+	const dropData = jsonParse<AddedNodesAndConnections>(
+		event.dataTransfer.getData(DRAG_EVENT_DATA_KEY),
+	);
+
+	if (dropData) {
+		const insertNodePosition: XYPosition = [position.x, position.y];
+
+		await onAddNodesAndConnections(dropData, true, insertNodePosition);
+
+		onToggleNodeCreator({ createNodeActive: false, hasAddedNodes: true });
+	}
+}
+
 /**
  * Custom Actions
  */
@@ -1487,6 +1518,13 @@ function unregisterCustomActions() {
 	unregisterCustomAction('showNodeCreator');
 }
 
+function showAddFirstStepIfEnabled() {
+	if (uiStore.addFirstStepOnLoad) {
+		void onOpenNodeCreatorForTriggerNodes(NODE_CREATOR_OPEN_SOURCES.TRIGGER_PLACEHOLDER_BUTTON);
+		uiStore.addFirstStepOnLoad = false;
+	}
+}
+
 /**
  * Routing
  */
@@ -1549,6 +1587,7 @@ onMounted(() => {
 
 onActivated(async () => {
 	addUndoRedoEventBindings();
+	showAddFirstStepIfEnabled();
 });
 
 onDeactivated(() => {
@@ -1589,6 +1628,8 @@ onBeforeUnmount(() => {
 		@update:node:enabled="onToggleNodeDisabled"
 		@update:node:name="onOpenRenameNodeModal"
 		@update:node:parameters="onUpdateNodeParameters"
+		@update:node:inputs="onUpdateNodeInputs"
+		@update:node:outputs="onUpdateNodeOutputs"
 		@click:node:add="onClickNodeAdd"
 		@run:node="onRunWorkflowToNode"
 		@delete:node="onDeleteNode"
@@ -1609,6 +1650,7 @@ onBeforeUnmount(() => {
 		@save:workflow="onSaveWorkflow"
 		@create:workflow="onCreateWorkflow"
 		@viewport-change="onViewportChange"
+		@drag-and-drop="onDragAndDrop"
 	>
 		<div v-if="!isCanvasReadOnly" :class="$style.executionButtons">
 			<CanvasRunWorkflowButton
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index f802cc3cd1cb8..25daff29f4ba0 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -825,7 +825,7 @@ export default defineComponent({
 							: 'readOnly.showMessage.executions.message',
 					),
 					type: 'info',
-					dangerouslyUseHTMLString: true,
+
 					onClose: () => {
 						this.readOnlyNotification = null;
 					},
@@ -934,7 +934,6 @@ export default defineComponent({
 						// Close the creator panel if user clicked on the link
 						if (this.createNodeActive) notice.close();
 					}, 0),
-				dangerouslyUseHTMLString: true,
 			});
 		},
 		async clearExecutionData() {
@@ -1827,7 +1826,6 @@ export default defineComponent({
 							cancelButtonText: this.i18n.baseText(
 								'nodeView.confirmMessage.onClipboardPasteEvent.cancelButtonText',
 							),
-							dangerouslyUseHTMLString: true,
 						},
 					);
 
@@ -2058,10 +2056,7 @@ export default defineComponent({
 			);
 			if (dropData) {
 				const mousePosition = this.getMousePositionWithinNodeView(event);
-				const insertNodePosition = [
-					mousePosition[0] - NodeViewUtils.NODE_SIZE / 2 + NodeViewUtils.GRID_SIZE,
-					mousePosition[1] - NodeViewUtils.NODE_SIZE / 2,
-				] as XYPosition;
+				const insertNodePosition: XYPosition = [mousePosition[0], mousePosition[1]];
 
 				await this.onAddNodes(dropData, true, insertNodePosition);
 				this.createNodeActive = false;
diff --git a/packages/editor-ui/vite.config.mts b/packages/editor-ui/vite.config.mts
index 3a20ff3eea9f2..e939215aa6778 100644
--- a/packages/editor-ui/vite.config.mts
+++ b/packages/editor-ui/vite.config.mts
@@ -1,16 +1,22 @@
 import vue from '@vitejs/plugin-vue';
 import { resolve } from 'path';
 import { defineConfig, mergeConfig } from 'vite';
+import svgLoader from 'vite-svg-loader';
 
 import { vitestConfig } from '../design-system/vite.config.mts';
 import icons from 'unplugin-icons/vite';
 import iconsResolver from 'unplugin-icons/resolver';
 import components from 'unplugin-vue-components/vite';
+import browserslistToEsbuild from 'browserslist-to-esbuild';
+import legacy from '@vitejs/plugin-legacy';
+import browserslist from 'browserslist';
 
 const publicPath = process.env.VUE_APP_PUBLIC_PATH || '/';
 
 const { NODE_ENV } = process.env;
 
+const browsers = browserslist.loadConfig({ path: process.cwd() });
+
 const alias = [
 	{ find: '@', replacement: resolve(__dirname, 'src') },
 	{ find: 'stream', replacement: 'stream-browserify' },
@@ -54,6 +60,12 @@ const plugins = [
 		],
 	}),
 	vue(),
+	svgLoader(),
+	legacy({
+		modernTargets: browsers,
+		modernPolyfills: true,
+		renderLegacyChunks: false,
+	}),
 ];
 
 const { RELEASE: release } = process.env;
@@ -80,6 +92,7 @@ export default mergeConfig(
 		build: {
 			minify: !!release,
 			sourcemap: !!release,
+			target: browserslistToEsbuild(browsers),
 		},
 	}),
 	vitestConfig,
diff --git a/packages/node-dev/.eslintrc.js b/packages/node-dev/.eslintrc.js
index cb1447036624f..cda3ce866a9ad 100644
--- a/packages/node-dev/.eslintrc.js
+++ b/packages/node-dev/.eslintrc.js
@@ -10,7 +10,6 @@ module.exports = {
 		'templates/**', // TODO: remove this
 	],
 	rules: {
-		'import/order': 'off', // TODO: remove this
 		'@typescript-eslint/ban-ts-comment': ['warn', { 'ts-ignore': true }],
 		'n8n-local-rules/no-plain-errors': 'off',
 	},
diff --git a/packages/node-dev/commands/build.ts b/packages/node-dev/commands/build.ts
index 5a78bf27ca11e..ce42baf7ddcea 100644
--- a/packages/node-dev/commands/build.ts
+++ b/packages/node-dev/commands/build.ts
@@ -1,6 +1,6 @@
-import { Container } from 'typedi';
 import { Command, Flags } from '@oclif/core';
 import { InstanceSettings } from 'n8n-core';
+import { Container } from 'typedi';
 
 import type { IBuildOptions } from '../src';
 import { buildFiles } from '../src';
diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 17a1eda25db06..96e133aa174ae 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-node-dev",
-  "version": "1.71.0",
+  "version": "1.73.0",
   "description": "CLI to simplify n8n credentials/node development",
   "main": "dist/src/index",
   "types": "dist/src/index.d.ts",
diff --git a/packages/node-dev/src/Build.ts b/packages/node-dev/src/Build.ts
index f600ca5297155..de6d83a2cf67e 100644
--- a/packages/node-dev/src/Build.ts
+++ b/packages/node-dev/src/Build.ts
@@ -1,14 +1,14 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-import glob from 'fast-glob';
 import { spawn } from 'child_process';
+import glob from 'fast-glob';
 import { copyFile, mkdir, readFile, writeFile } from 'fs/promises';
+import { InstanceSettings } from 'n8n-core';
+import { jsonParse } from 'n8n-workflow';
 import { join, dirname, resolve as resolvePath } from 'path';
-import { Container } from 'typedi';
 import { file as tmpFile } from 'tmp-promise';
+import { Container } from 'typedi';
 
-import { jsonParse } from 'n8n-workflow';
-import { InstanceSettings } from 'n8n-core';
 import type { IBuildOptions } from './Interfaces';
 
 /**
@@ -85,9 +85,7 @@ export async function buildFiles({
 
 		// Forward the output of the child process to the main one
 		// that the user can see what is happening
-		// @ts-ignore
 		buildProcess.stdout.pipe(process.stdout);
-		// @ts-ignore
 		buildProcess.stderr.pipe(process.stderr);
 
 		// Make sure that the child process gets also always terminated
diff --git a/packages/nodes-base/.eslintrc.js b/packages/nodes-base/.eslintrc.js
index fb4629d9ded2f..e99abcf38fff4 100644
--- a/packages/nodes-base/.eslintrc.js
+++ b/packages/nodes-base/.eslintrc.js
@@ -15,7 +15,6 @@ module.exports = {
 		eqeqeq: 'warn',
 		'id-denylist': 'warn',
 		'import/extensions': 'warn',
-		'import/order': 'warn',
 		'prefer-spread': 'warn',
 		'import/no-extraneous-dependencies': 'warn',
 
diff --git a/packages/nodes-base/credentials/Aws.credentials.ts b/packages/nodes-base/credentials/Aws.credentials.ts
index bb7b30d4cf041..9e968fdce5a30 100644
--- a/packages/nodes-base/credentials/Aws.credentials.ts
+++ b/packages/nodes-base/credentials/Aws.credentials.ts
@@ -1,6 +1,5 @@
 import type { Request } from 'aws4';
 import { sign } from 'aws4';
-
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialTestRequest,
diff --git a/packages/nodes-base/credentials/CiscoSecureEndpointApi.credentials.ts b/packages/nodes-base/credentials/CiscoSecureEndpointApi.credentials.ts
index 7ffac617797a2..99e4c06f4c020 100644
--- a/packages/nodes-base/credentials/CiscoSecureEndpointApi.credentials.ts
+++ b/packages/nodes-base/credentials/CiscoSecureEndpointApi.credentials.ts
@@ -1,3 +1,4 @@
+import axios from 'axios';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialTestRequest,
@@ -6,8 +7,6 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import axios from 'axios';
-
 export class CiscoSecureEndpointApi implements ICredentialType {
 	name = 'ciscoSecureEndpointApi';
 
diff --git a/packages/nodes-base/credentials/ElasticsearchApi.credentials.ts b/packages/nodes-base/credentials/ElasticsearchApi.credentials.ts
index b487ce894fa22..25811fba80afa 100644
--- a/packages/nodes-base/credentials/ElasticsearchApi.credentials.ts
+++ b/packages/nodes-base/credentials/ElasticsearchApi.credentials.ts
@@ -56,7 +56,7 @@ export class ElasticsearchApi implements ICredentialType {
 
 	test: ICredentialTestRequest = {
 		request: {
-			baseURL: '={{$credentials.baseUrl}}',
+			baseURL: '={{$credentials.baseUrl}}'.replace(/\/$/, ''),
 			url: '/_xpack?human=false',
 			skipSslCertificateValidation: '={{$credentials.ignoreSSLIssues}}',
 		},
diff --git a/packages/nodes-base/credentials/GhostAdminApi.credentials.ts b/packages/nodes-base/credentials/GhostAdminApi.credentials.ts
index 7c85f425274de..5e1040958e9b4 100644
--- a/packages/nodes-base/credentials/GhostAdminApi.credentials.ts
+++ b/packages/nodes-base/credentials/GhostAdminApi.credentials.ts
@@ -1,3 +1,4 @@
+import jwt from 'jsonwebtoken';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialTestRequest,
@@ -6,7 +7,6 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import jwt from 'jsonwebtoken';
 export class GhostAdminApi implements ICredentialType {
 	name = 'ghostAdminApi';
 
diff --git a/packages/nodes-base/credentials/GoogleApi.credentials.ts b/packages/nodes-base/credentials/GoogleApi.credentials.ts
index 96fa9e5f40711..38df5ac694a9f 100644
--- a/packages/nodes-base/credentials/GoogleApi.credentials.ts
+++ b/packages/nodes-base/credentials/GoogleApi.credentials.ts
@@ -1,3 +1,7 @@
+import type { AxiosRequestConfig } from 'axios';
+import axios from 'axios';
+import jwt from 'jsonwebtoken';
+import moment from 'moment-timezone';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialType,
@@ -6,14 +10,6 @@ import type {
 	Icon,
 } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
-import jwt from 'jsonwebtoken';
-
-import type { AxiosRequestConfig } from 'axios';
-
-import axios from 'axios';
-
 export class GoogleApi implements ICredentialType {
 	name = 'googleApi';
 
diff --git a/packages/nodes-base/credentials/LinearOAuth2Api.credentials.ts b/packages/nodes-base/credentials/LinearOAuth2Api.credentials.ts
index b1e22ddfd9d31..1f1ba7246741b 100644
--- a/packages/nodes-base/credentials/LinearOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/LinearOAuth2Api.credentials.ts
@@ -1,7 +1,5 @@
 import type { ICredentialType, INodeProperties } from 'n8n-workflow';
 
-const scopes = ['read', 'write', 'issues:create', 'comments:create'];
-
 export class LinearOAuth2Api implements ICredentialType {
 	name = 'linearOAuth2Api';
 
@@ -50,11 +48,19 @@ export class LinearOAuth2Api implements ICredentialType {
 			],
 			default: 'user',
 		},
+		{
+			displayName: 'Include Admin Scope',
+			name: 'includeAdminScope',
+			type: 'boolean',
+			default: false,
+			description: 'Grants the "Admin" scope, Needed to create webhooks',
+		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
 			type: 'hidden',
-			default: scopes.join(' '),
+			default:
+				'={{$self["includeAdminScope"] ? "read write issues:create comments:create admin" : "read write issues:create comments:create"}}',
 			required: true,
 		},
 		{
diff --git a/packages/nodes-base/credentials/MailerLiteApi.credentials.ts b/packages/nodes-base/credentials/MailerLiteApi.credentials.ts
index 54a97b4cc729c..fa5add1b6ab78 100644
--- a/packages/nodes-base/credentials/MailerLiteApi.credentials.ts
+++ b/packages/nodes-base/credentials/MailerLiteApi.credentials.ts
@@ -1,4 +1,10 @@
-import type { ICredentialType, INodeProperties } from 'n8n-workflow';
+import type {
+	ICredentialDataDecryptedObject,
+	ICredentialTestRequest,
+	ICredentialType,
+	IHttpRequestOptions,
+	INodeProperties,
+} from 'n8n-workflow';
 
 export class MailerLiteApi implements ICredentialType {
 	name = 'mailerLiteApi';
@@ -15,5 +21,37 @@ export class MailerLiteApi implements ICredentialType {
 			typeOptions: { password: true },
 			default: '',
 		},
+		{
+			displayName: 'Classic API',
+			name: 'classicApi',
+			type: 'boolean',
+			default: true,
+			description:
+				'If the Classic API should be used, If this is your first time using this node this should be false.',
+		},
 	];
+
+	async authenticate(
+		credentials: ICredentialDataDecryptedObject,
+		requestOptions: IHttpRequestOptions,
+	): Promise<IHttpRequestOptions> {
+		if (credentials.classicApi === true) {
+			requestOptions.headers = {
+				'X-MailerLite-ApiKey': credentials.apiKey as string,
+			};
+		} else {
+			requestOptions.headers = {
+				Authorization: `Bearer ${credentials.apiKey as string}`,
+			};
+		}
+		return requestOptions;
+	}
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL:
+				'={{$credentials.classicApi ? "https://api.mailerlite.com/api/v2" : "https://connect.mailerlite.com/api"}}',
+			url: '/groups',
+		},
+	};
 }
diff --git a/packages/nodes-base/credentials/MySql.credentials.ts b/packages/nodes-base/credentials/MySql.credentials.ts
index 73bff49be4b87..faea3a6f0f0d2 100644
--- a/packages/nodes-base/credentials/MySql.credentials.ts
+++ b/packages/nodes-base/credentials/MySql.credentials.ts
@@ -1,4 +1,5 @@
 import type { ICredentialType, INodeProperties } from 'n8n-workflow';
+
 import { sshTunnelProperties } from '@utils/sshTunnel.properties';
 
 export class MySql implements ICredentialType {
diff --git a/packages/nodes-base/credentials/OpenAiApi.credentials.ts b/packages/nodes-base/credentials/OpenAiApi.credentials.ts
index b97ae856f9509..226c1b7c4f7b0 100644
--- a/packages/nodes-base/credentials/OpenAiApi.credentials.ts
+++ b/packages/nodes-base/credentials/OpenAiApi.credentials.ts
@@ -30,6 +30,13 @@ export class OpenAiApi implements ICredentialType {
 			description:
 				"For users who belong to multiple organizations, you can set which organization is used for an API request. Usage from these API requests will count against the specified organization's subscription quota.",
 		},
+		{
+			displayName: 'Base URL',
+			name: 'url',
+			type: 'string',
+			default: 'https://api.openai.com/v1',
+			description: 'Override the default base URL for the API',
+		},
 	];
 
 	authenticate: IAuthenticateGeneric = {
@@ -44,8 +51,8 @@ export class OpenAiApi implements ICredentialType {
 
 	test: ICredentialTestRequest = {
 		request: {
-			baseURL: 'https://api.openai.com',
-			url: '/v1/models',
+			baseURL: '={{$credentials?.url}}',
+			url: '/models',
 		},
 	};
 }
diff --git a/packages/nodes-base/credentials/Postgres.credentials.ts b/packages/nodes-base/credentials/Postgres.credentials.ts
index a562245b2966b..227ad7ce276ad 100644
--- a/packages/nodes-base/credentials/Postgres.credentials.ts
+++ b/packages/nodes-base/credentials/Postgres.credentials.ts
@@ -1,4 +1,5 @@
 import type { ICredentialType, INodeProperties } from 'n8n-workflow';
+
 import { sshTunnelProperties } from '@utils/sshTunnel.properties';
 
 export class Postgres implements ICredentialType {
diff --git a/packages/nodes-base/credentials/Redis.credentials.ts b/packages/nodes-base/credentials/Redis.credentials.ts
index 194c2f59e3acf..9d9bbab3942d5 100644
--- a/packages/nodes-base/credentials/Redis.credentials.ts
+++ b/packages/nodes-base/credentials/Redis.credentials.ts
@@ -17,6 +17,13 @@ export class Redis implements ICredentialType {
 			},
 			default: '',
 		},
+		{
+			displayName: 'User',
+			name: 'user',
+			type: 'string',
+			default: '',
+			hint: 'Leave blank for password-only auth',
+		},
 		{
 			displayName: 'Host',
 			name: 'host',
diff --git a/packages/nodes-base/credentials/SeaTableApi.credentials.ts b/packages/nodes-base/credentials/SeaTableApi.credentials.ts
index 1481548510ceb..df17f6ae25e1d 100644
--- a/packages/nodes-base/credentials/SeaTableApi.credentials.ts
+++ b/packages/nodes-base/credentials/SeaTableApi.credentials.ts
@@ -1,6 +1,5 @@
-import type { ICredentialType, INodeProperties, INodePropertyOptions } from 'n8n-workflow';
-
 import moment from 'moment-timezone';
+import type { ICredentialType, INodeProperties, INodePropertyOptions } from 'n8n-workflow';
 
 // Get options for timezones
 const timezones: INodePropertyOptions[] = moment.tz
diff --git a/packages/nodes-base/credentials/SolarWindsIpamApi.credentials.ts b/packages/nodes-base/credentials/SolarWindsIpamApi.credentials.ts
new file mode 100644
index 0000000000000..2980978031736
--- /dev/null
+++ b/packages/nodes-base/credentials/SolarWindsIpamApi.credentials.ts
@@ -0,0 +1,85 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class SolarWindsIpamApi implements ICredentialType {
+	name = 'solarWindsIpamApi';
+
+	displayName = 'SolarWinds IPAM';
+
+	documentationUrl = 'solarwindsipam';
+
+	icon = {
+		light: 'file:icons/SolarWindsIpam.svg',
+		dark: 'file:icons/SolarWindsIpam.svg',
+	} as const;
+
+	httpRequestNode = {
+		name: 'SolarWinds IPAM',
+		docsUrl: 'https://www.solarwinds.com/ip-address-manager',
+		apiBaseUrlPlaceholder: 'https://your-ipam-server',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Base URL',
+			name: 'url',
+			required: true,
+			type: 'string',
+			default: '',
+			placeholder: 'https://your-ipam-server',
+			description: 'The base URL of your SolarWinds IPAM server.',
+		},
+		{
+			displayName: 'Username',
+			name: 'username',
+			required: true,
+			type: 'string',
+			default: '',
+			description: 'The username for SolarWinds IPAM API.',
+		},
+		{
+			displayName: 'Password',
+			name: 'password',
+			required: true,
+			type: 'string',
+			typeOptions: { password: true },
+			default: '',
+			description: 'The password for SolarWinds IPAM API.',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			auth: {
+				username: '={{$credentials.username}}',
+				password: '={{$credentials.password}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '={{$credentials.url}}'.replace(/\/$/, ''),
+			url: '/SolarWinds/InformationService/v3/Json/Query',
+			method: 'GET',
+			qs: {
+				query: 'SELECT TOP 1 AccountID FROM IPAM.AccountRoles',
+			},
+			skipSslCertificateValidation: true,
+		},
+		rules: [
+			{
+				type: 'responseCode',
+				properties: {
+					value: 403,
+					message: 'Connection failed: Invalid credentials or unreachable server',
+				},
+			},
+		],
+	};
+}
diff --git a/packages/nodes-base/credentials/SolarWindsObservabilityApi.credentials.ts b/packages/nodes-base/credentials/SolarWindsObservabilityApi.credentials.ts
new file mode 100644
index 0000000000000..0ae029e07476e
--- /dev/null
+++ b/packages/nodes-base/credentials/SolarWindsObservabilityApi.credentials.ts
@@ -0,0 +1,72 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class SolarWindsObservabilityApi implements ICredentialType {
+	name = 'solarWindsObservabilityApi';
+
+	displayName = 'SolarWinds Observability';
+
+	documentationUrl = 'solarwindsobservability';
+
+	icon = {
+		light: 'file:icons/SolarWindsObservability.svg',
+		dark: 'file:icons/SolarWindsObservability.svg',
+	} as const;
+
+	httpRequestNode = {
+		name: 'SolarWinds Observability',
+		docsUrl:
+			'https://documentation.solarwinds.com/en/success_center/observability/content/api/api-swagger.htm',
+		apiBaseUrlPlaceholder: 'https://api.xx-yy.cloud.solarwinds.com/',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'URL',
+			name: 'url',
+			required: true,
+			type: 'string',
+			default: '',
+		},
+		{
+			displayName: 'API Token',
+			name: 'apiToken',
+			required: true,
+			type: 'string',
+			typeOptions: { password: true },
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Bearer {{$credentials.apiToken}}',
+				'Content-Type': 'application/json-rpc',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '={{$credentials.url}}'.replace(/\/$/, ''),
+			url: '/v1/logs',
+			method: 'GET',
+		},
+		rules: [
+			{
+				type: 'responseSuccessBody',
+				properties: {
+					key: 'error',
+					value: 'invalid_auth',
+					message: 'Invalid access token',
+				},
+			},
+		],
+	};
+}
diff --git a/packages/nodes-base/credentials/icons/SolarWindsIpam.svg b/packages/nodes-base/credentials/icons/SolarWindsIpam.svg
new file mode 100644
index 0000000000000..814afbdb7cac7
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/SolarWindsIpam.svg
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.5.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1000 200" style="enable-background:new 0 0 1000 200;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#6E8C96;}
+	.st1{fill:#FFFFFF;}
+	.st2{fill:#FF6200;}
+</style>
+<g>
+	<path class="st2" d="M407.028,140.266V76.349h11.212v54.047h30.623v9.87H407.028z"/>
+	<path class="st2" d="M515.476,140.266L510.781,128h-30.282l-4.695,12.266h-12.266l25.107-63.917h13.99l25.107,63.917H515.476z
+		 M495.64,85.836l-11.978,32.294h23.956L495.64,85.836z"/>
+	<path class="st2" d="M670.683,140.266l-12.457-47.147l-12.362,47.147h-11.979l-18.303-63.917h12.553l12.458,49.256l13.224-49.256
+		h8.912l13.224,49.256l12.362-49.256h12.553l-18.207,63.917H670.683z"/>
+	<path class="st2" d="M722.916,140.266V76.349h11.212v63.917H722.916z"/>
+	<path class="st2" d="M807.891,140.266l-33.348-46.573v46.573h-11.212V76.349h11.499l32.677,45.327V76.349h11.212v63.917H807.891z"
+		/>
+	<path class="st2" d="M845.474,140.266V76.349h23.765c19.932,0,33.443,13.224,33.443,32.006c0,18.783-13.511,31.911-33.443,31.911
+		H845.474z M856.685,130.396h12.553c13.895,0,21.944-9.966,21.944-22.041c0-12.362-7.666-22.136-21.944-22.136h-12.553V130.396z"/>
+	<path class="st2" d="M354.552,75.295c-18.259,0-33.061,14.802-33.061,33.061c0,18.259,14.802,33.061,33.061,33.061
+		c18.259,0,33.061-14.802,33.061-33.061C387.613,90.097,372.812,75.295,354.552,75.295z M354.552,130.253
+		c-12.094,0-21.897-9.804-21.897-21.897s9.804-21.897,21.897-21.897s21.897,9.804,21.897,21.897S366.646,130.253,354.552,130.253z"
+		/>
+	<path class="st2" d="M589.039,120.208L589.039,120.208l-0.094-0.151l-0.058-0.093l-2.99-4.805l-0.009,0l-0.59-0.945
+		c6.282-2.339,11.627-8.198,11.627-17.836c0-11.787-8.241-20.028-20.891-20.028h-28.077v63.917h11.212v-23.861h4.113h7.003h4.113
+		l14.182,23.861h12.937L589.039,120.208z M559.169,106.534V86.219h15.332c6.325,0,10.925,4.025,10.925,10.158
+		c0,6.133-4.6,10.157-10.925,10.157H559.169z"/>
+	<path class="st2" d="M282.724,101.839c-7.57-1.917-14.087-3.546-14.087-8.528c0-4.792,4.216-7.954,10.828-7.954
+		c6.335,0,12.736,2.082,17.627,6.507l7.046-7.246l0.242-0.315c-5.942-5.75-13.991-8.912-23.957-8.912
+		c-13.991,0-23.286,8.145-23.286,18.686c0,13.511,12.266,16.577,22.711,19.165c7.762,2.012,14.566,3.737,14.566,9.487
+		c0,4.217-3.642,8.72-12.841,8.72c-8.148,0-14.608-3.447-19.026-7.626l-7.325,7.534c5.654,5.982,14.151,10.06,25.872,10.06
+		c17.249,0,24.723-9.104,24.723-19.741C305.818,107.781,293.265,104.522,282.724,101.839z"/>
+	<path class="st2" d="M947.088,101.839c-7.57-1.917-14.087-3.546-14.087-8.528c0-4.792,4.216-7.954,10.828-7.954
+		c6.335,0,12.736,2.082,17.627,6.507l7.046-7.246l0.242-0.315c-5.942-5.75-13.991-8.912-23.957-8.912
+		c-13.991,0-23.286,8.145-23.286,18.686c0,13.511,12.266,16.577,22.711,19.165c7.762,2.012,14.566,3.737,14.566,9.487
+		c0,4.217-3.642,8.72-12.841,8.72c-8.148,0-14.608-3.447-19.026-7.626l-7.325,7.534c5.654,5.982,14.151,10.06,25.872,10.06
+		c17.249,0,24.723-9.104,24.723-19.741C970.182,107.781,957.628,104.522,947.088,101.839z"/>
+	<g>
+		<g>
+			<g>
+				<path class="st2" d="M982.198,81.725h-1.379V84.1h-0.778v-5.871h1.944c0.661,0,1.17,0.151,1.526,0.452
+					c0.356,0.301,0.534,0.739,0.534,1.314c0,0.366-0.099,0.684-0.297,0.956c-0.198,0.272-0.472,0.475-0.825,0.609l1.379,2.492V84.1
+					h-0.831L982.198,81.725z M980.819,81.092h1.19c0.384,0,0.69-0.1,0.917-0.299c0.227-0.199,0.341-0.466,0.341-0.8
+					c0-0.364-0.108-0.642-0.325-0.836c-0.216-0.194-0.529-0.292-0.937-0.295h-1.186V81.092z"/>
+			</g>
+			<path class="st2" d="M981.828,86.34c-2.784,0-5.049-2.265-5.049-5.049c0-2.784,2.265-5.049,5.049-5.049s5.049,2.265,5.049,5.049
+				C986.876,84.075,984.612,86.34,981.828,86.34z M981.828,76.96c-2.388,0-4.331,1.943-4.331,4.331c0,2.388,1.943,4.331,4.331,4.331
+				s4.331-1.943,4.331-4.331C986.159,78.903,984.216,76.96,981.828,76.96z"/>
+		</g>
+		<g>
+			<path class="st2" d="M140.43,173.976h-2.449v6.797h-0.999v-6.797h-2.444v-0.822h5.892V173.976z"/>
+			<path class="st2" d="M142.858,173.154l2.491,6.216l2.491-6.216h1.303v7.619h-1.005v-2.967l0.094-3.202l-2.501,6.169h-0.769
+				l-2.496-6.154l0.099,3.187v2.967h-1.005v-7.619H142.858z"/>
+		</g>
+		<g>
+			<g>
+				<g>
+					<path class="st2" d="M105.191,96.65c0.58-0.155,1.142-0.31,1.72-0.477c12.698-3.58,25.05-8.54,37.324-13.677
+						c12.016-5.028,23.901-11.067,34.342-19.565c10.715-8.717,19.334-20.009,24.091-34.012c0.67-1.949,2.04-4.76,2.171-6.898
+						c-16.685,22.815-82.873,25.17-82.873,25.17l15.619-14.329C74.794,32.981,30.977,59.633,10.902,73.887
+						c25.691,2.756,48.948,13.638,67.156,30.023C87.017,101.136,96.162,99.132,105.191,96.65z"/>
+					<path class="st2" d="M208.993,94.409c0,0-61.073-4.671-124.512,15.757c8.417,8.793,15.511,18.851,20.947,29.879
+						C138.784,121.478,185.036,97.757,208.993,94.409z"/>
+					<path class="st2" d="M109.61,149.577c3.873,9.96,6.471,20.555,7.549,31.592l58.138-59.794L109.61,149.577z"/>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/packages/nodes-base/credentials/icons/SolarWindsObservability.svg b/packages/nodes-base/credentials/icons/SolarWindsObservability.svg
new file mode 100644
index 0000000000000..65c383dc33e6a
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/SolarWindsObservability.svg
@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.5.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1000 200" style="enable-background:new 0 0 1000 200;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FF6200;}
+</style>
+<g>
+	<g>
+		<path class="st0" d="M301.299,161.252c-0.583,5.361-2.5,9.464-5.752,12.308s-7.582,4.266-12.989,4.266
+			c-3.775,0-7.115-0.944-10.017-2.832c-2.902-1.888-5.146-4.562-6.73-8.024c-1.586-3.462-2.39-7.418-2.413-11.871v-6.608
+			c0-4.522,0.792-8.531,2.378-12.028c1.585-3.496,3.863-6.194,6.835-8.094c2.973-1.899,6.393-2.85,10.262-2.85
+			c5.455,0,9.761,1.468,12.92,4.406c3.158,2.937,4.994,7.004,5.507,12.202h-4.336c-1.072-8.647-5.769-12.972-14.091-12.972
+			c-4.614,0-8.292,1.727-11.03,5.179c-2.739,3.452-4.108,8.223-4.108,14.311v6.229c0,5.878,1.334,10.568,4.003,14.067
+			s6.276,5.248,10.821,5.248c4.498,0,7.89-1.077,10.175-3.233c2.284-2.156,3.694-5.391,4.23-9.703H301.299z"/>
+		<path class="st0" d="M334.422,172.336c-2.518,3.66-6.538,5.489-12.062,5.489c-4.033,0-7.098-1.171-9.196-3.514
+			c-2.098-2.343-3.17-5.81-3.217-10.402v-24.615h4.161v24.091c0,7.203,2.914,10.804,8.741,10.804c6.061,0,9.895-2.505,11.503-7.517
+			v-27.378h4.196v37.832h-4.057L334.422,172.336z"/>
+		<path class="st0" d="M371.334,167.511c0-2.074-0.834-3.741-2.5-5c-1.667-1.259-4.178-2.243-7.535-2.955
+			c-3.356-0.711-5.961-1.526-7.814-2.447c-1.853-0.921-3.229-2.045-4.126-3.375c-0.897-1.329-1.346-2.937-1.346-4.825
+			c0-2.984,1.247-5.449,3.741-7.395s5.688-2.92,9.58-2.92c4.219,0,7.605,1.043,10.157,3.129c2.553,2.086,3.829,4.808,3.829,8.165
+			h-4.196c0-2.214-0.927-4.056-2.779-5.524c-1.854-1.469-4.19-2.203-7.011-2.203c-2.751,0-4.959,0.612-6.626,1.836
+			c-1.667,1.224-2.5,2.814-2.5,4.772c0,1.888,0.693,3.351,2.081,4.388c1.387,1.038,3.916,1.987,7.587,2.85
+			c3.672,0.863,6.422,1.783,8.252,2.762c1.829,0.979,3.188,2.156,4.073,3.531c0.886,1.376,1.329,3.042,1.329,5
+			c0,3.194-1.289,5.746-3.864,7.657c-2.576,1.912-5.938,2.867-10.087,2.867c-4.406,0-7.979-1.066-10.717-3.199
+			c-2.739-2.133-4.108-4.831-4.108-8.095h4.195c0.163,2.448,1.194,4.354,3.095,5.717c1.899,1.364,4.411,2.046,7.535,2.046
+			c2.913,0,5.268-0.641,7.062-1.923S371.334,169.469,371.334,167.511z"/>
+		<path class="st0" d="M391.095,129.609v9.685h7.832v3.427h-7.832v25.237c0,2.101,0.378,3.664,1.136,4.69
+			c0.758,1.027,2.022,1.54,3.794,1.54c0.699,0,1.83-0.116,3.392-0.35l0.175,3.397c-1.096,0.393-2.587,0.589-4.476,0.589
+			c-2.867,0-4.953-0.833-6.259-2.5c-1.306-1.666-1.958-4.12-1.958-7.36v-25.244h-6.958v-3.427h6.958v-9.685H391.095z"/>
+		<path class="st0" d="M402.899,157.65c0-3.636,0.705-6.911,2.115-9.825c1.41-2.914,3.403-5.18,5.979-6.801
+			c2.575-1.62,5.494-2.43,8.759-2.43c5.034,0,9.113,1.766,12.236,5.297c3.124,3.531,4.686,8.211,4.686,14.038v0.875
+			c0,3.659-0.705,6.952-2.115,9.877c-1.41,2.926-3.397,5.181-5.962,6.766c-2.563,1.586-5.488,2.378-8.775,2.378
+			c-5.012,0-9.085-1.766-12.22-5.297c-3.136-3.531-4.703-8.211-4.703-14.039V157.65z M407.095,158.805
+			c0,4.522,1.171,8.234,3.514,11.136c2.343,2.902,5.413,4.354,9.213,4.354c3.776,0,6.836-1.451,9.178-4.354
+			c2.343-2.901,3.514-6.73,3.514-11.486v-0.804c0-2.89-0.536-5.536-1.607-7.937c-1.073-2.401-2.576-4.26-4.511-5.577
+			c-1.935-1.316-4.149-1.976-6.643-1.976c-3.73,0-6.772,1.463-9.126,4.388c-2.354,2.926-3.531,6.754-3.531,11.486V158.805z"/>
+		<path class="st0" d="M449.05,139.294l0.14,6.154c1.398-2.284,3.146-3.997,5.245-5.14c2.098-1.142,4.428-1.713,6.992-1.713
+			c5.968,0,9.756,2.448,11.364,7.343c1.352-2.354,3.158-4.167,5.419-5.437c2.261-1.27,4.755-1.906,7.482-1.906
+			c8.111,0,12.249,4.429,12.412,13.287v25.245h-4.195v-24.93c-0.023-3.38-0.752-5.886-2.186-7.518
+			c-1.434-1.631-3.771-2.448-7.011-2.448c-3.007,0.047-5.548,1.02-7.622,2.92s-3.229,4.213-3.461,6.94v25.035h-4.196v-25.245
+			c-0.023-3.24-0.786-5.658-2.29-7.255c-1.503-1.597-3.816-2.396-6.94-2.396c-2.634,0-4.895,0.752-6.783,2.255
+			c-1.888,1.503-3.286,3.736-4.195,6.696v25.944h-4.196v-37.832H449.05z"/>
+		<path class="st0" d="M523.141,177.825c-3.217,0-6.125-0.792-8.724-2.378c-2.6-1.585-4.621-3.793-6.066-6.625
+			c-1.445-2.833-2.168-6.009-2.168-9.528v-1.503c0-3.636,0.705-6.911,2.115-9.825c1.41-2.914,3.375-5.204,5.892-6.871
+			c2.518-1.666,5.245-2.5,8.183-2.5c4.592,0,8.233,1.568,10.926,4.703s4.039,7.418,4.039,12.849v2.343h-26.993v0.804
+			c0,4.289,1.229,7.861,3.688,10.717s5.554,4.283,9.283,4.283c2.238,0,4.214-0.407,5.927-1.224c1.713-0.815,3.27-2.121,4.668-3.916
+			l2.622,1.993C533.456,175.6,528.992,177.825,523.141,177.825z M522.373,142.161c-3.147,0-5.799,1.154-7.955,3.461
+			c-2.156,2.308-3.468,5.408-3.934,9.301h22.692v-0.455c-0.117-3.636-1.154-6.596-3.112-8.881
+			C528.106,143.304,525.542,142.161,522.373,142.161z"/>
+		<path class="st0" d="M562.823,142.86c-0.886-0.163-1.83-0.245-2.832-0.245c-2.61,0-4.819,0.729-6.626,2.186
+			c-1.807,1.457-3.094,3.572-3.862,6.346v25.979h-4.161v-37.832h4.091l0.07,6.014c2.213-4.476,5.769-6.713,10.663-6.713
+			c1.166,0,2.086,0.152,2.763,0.455L562.823,142.86z"/>
+		<path class="st0" d="M619.498,164.608c0-2.82-0.991-5.052-2.972-6.695c-1.981-1.644-5.606-3.205-10.874-4.686
+			c-5.269-1.48-9.114-3.094-11.538-4.843c-3.45-2.47-5.175-5.71-5.175-9.72c0-3.892,1.603-7.056,4.808-9.492
+			c3.204-2.436,7.302-3.654,12.29-3.654c3.379,0,6.404,0.653,9.073,1.958c2.669,1.306,4.737,3.124,6.206,5.455
+			c1.469,2.331,2.203,4.929,2.203,7.796h-4.336c0-3.483-1.188-6.283-3.566-8.398c-2.378-2.116-5.571-3.174-9.58-3.174
+			c-3.894,0-6.993,0.87-9.301,2.609c-2.308,1.739-3.462,4.009-3.462,6.811c0,2.592,1.037,4.705,3.112,6.339
+			c2.074,1.635,5.396,3.076,9.965,4.325c4.568,1.249,8.03,2.544,10.385,3.884c2.354,1.341,4.126,2.943,5.314,4.808
+			c1.188,1.865,1.783,4.068,1.783,6.609c0,4.009-1.603,7.226-4.808,9.649c-3.205,2.425-7.43,3.637-12.675,3.637
+			c-3.59,0-6.883-0.642-9.878-1.923c-2.995-1.282-5.268-3.077-6.817-5.385c-1.551-2.308-2.325-4.953-2.325-7.937h4.301
+			c0,3.59,1.34,6.422,4.021,8.496c2.681,2.075,6.247,3.111,10.699,3.111c3.963,0,7.145-0.874,9.546-2.622
+			C618.297,169.818,619.498,167.499,619.498,164.608z"/>
+		<path class="st0" d="M656.562,172.336c-2.518,3.66-6.538,5.489-12.062,5.489c-4.033,0-7.099-1.171-9.196-3.514
+			s-3.17-5.81-3.217-10.402v-24.615h4.161v24.091c0,7.203,2.913,10.804,8.741,10.804c6.06,0,9.894-2.505,11.502-7.517v-27.378h4.196
+			v37.832h-4.056L656.562,172.336z"/>
+		<path class="st0" d="M685.347,174.294c2.913,0,5.355-0.822,7.325-2.465c1.97-1.644,3.036-3.771,3.199-6.381h4.021
+			c-0.116,2.308-0.839,4.411-2.167,6.311c-1.329,1.9-3.095,3.386-5.298,4.458c-2.202,1.072-4.562,1.608-7.08,1.608
+			c-4.965,0-8.898-1.725-11.801-5.175c-2.902-3.449-4.353-8.088-4.353-13.916v-1.259c0-3.729,0.652-7.028,1.958-9.895
+			c1.305-2.867,3.176-5.081,5.611-6.643c2.436-1.562,5.285-2.343,8.549-2.343c4.149,0,7.57,1.236,10.263,3.707
+			c2.691,2.471,4.131,5.723,4.317,9.755h-4.021c-0.187-2.96-1.253-5.35-3.199-7.167c-1.946-1.818-4.4-2.728-7.36-2.728
+			c-3.776,0-6.708,1.364-8.794,4.091c-2.086,2.728-3.129,6.551-3.129,11.469v1.224c0,4.825,1.043,8.59,3.129,11.294
+			S681.547,174.294,685.347,174.294z"/>
+		<path class="st0" d="M722.17,174.294c2.913,0,5.355-0.822,7.325-2.465c1.97-1.644,3.036-3.771,3.199-6.381h4.021
+			c-0.116,2.308-0.839,4.411-2.167,6.311c-1.329,1.9-3.095,3.386-5.298,4.458c-2.202,1.072-4.562,1.608-7.08,1.608
+			c-4.965,0-8.898-1.725-11.801-5.175c-2.902-3.449-4.353-8.088-4.353-13.916v-1.259c0-3.729,0.652-7.028,1.958-9.895
+			c1.305-2.867,3.176-5.081,5.611-6.643c2.436-1.562,5.285-2.343,8.549-2.343c4.149,0,7.57,1.236,10.263,3.707
+			c2.691,2.471,4.131,5.723,4.317,9.755h-4.021c-0.187-2.96-1.253-5.35-3.199-7.167c-1.946-1.818-4.4-2.728-7.36-2.728
+			c-3.776,0-6.708,1.364-8.794,4.091c-2.086,2.728-3.129,6.551-3.129,11.469v1.224c0,4.825,1.043,8.59,3.129,11.294
+			S718.371,174.294,722.17,174.294z"/>
+		<path class="st0" d="M759.7,177.825c-3.217,0-6.125-0.792-8.724-2.378c-2.6-1.585-4.621-3.793-6.065-6.625
+			c-1.445-2.833-2.168-6.009-2.168-9.528v-1.503c0-3.636,0.705-6.911,2.115-9.825c1.409-2.914,3.374-5.204,5.891-6.871
+			c2.518-1.666,5.245-2.5,8.183-2.5c4.592,0,8.233,1.568,10.926,4.703s4.039,7.418,4.039,12.849v2.343h-26.993v0.804
+			c0,4.289,1.229,7.861,3.688,10.717s5.554,4.283,9.283,4.283c2.238,0,4.214-0.407,5.927-1.224c1.713-0.815,3.27-2.121,4.668-3.916
+			l2.622,1.993C770.014,175.6,765.55,177.825,759.7,177.825z M758.931,142.161c-3.147,0-5.799,1.154-7.955,3.461
+			c-2.156,2.308-3.468,5.408-3.934,9.301h22.692v-0.455c-0.117-3.636-1.154-6.596-3.112-8.881
+			C764.665,143.304,762.1,142.161,758.931,142.161z"/>
+		<path class="st0" d="M804.089,167.511c0-2.074-0.833-3.741-2.5-5c-1.666-1.259-4.178-2.243-7.534-2.955
+			c-3.357-0.711-5.962-1.526-7.815-2.447c-1.853-0.921-3.229-2.045-4.125-3.375c-0.898-1.329-1.347-2.937-1.347-4.825
+			c0-2.984,1.247-5.449,3.741-7.395s5.688-2.92,9.58-2.92c4.219,0,7.605,1.043,10.157,3.129c2.553,2.086,3.829,4.808,3.829,8.165
+			h-4.196c0-2.214-0.926-4.056-2.779-5.524c-1.854-1.469-4.19-2.203-7.011-2.203c-2.75,0-4.959,0.612-6.625,1.836
+			c-1.667,1.224-2.5,2.814-2.5,4.772c0,1.888,0.693,3.351,2.08,4.388c1.387,1.038,3.916,1.987,7.587,2.85
+			c3.672,0.863,6.422,1.783,8.252,2.762s3.188,2.156,4.073,3.531c0.886,1.376,1.329,3.042,1.329,5c0,3.194-1.288,5.746-3.864,7.657
+			c-2.575,1.912-5.938,2.867-10.087,2.867c-4.405,0-7.978-1.066-10.717-3.199s-4.108-4.831-4.108-8.095h4.196
+			c0.162,2.448,1.194,4.354,3.094,5.717c1.899,1.364,4.411,2.046,7.535,2.046c2.914,0,5.268-0.641,7.062-1.923
+			S804.089,169.469,804.089,167.511z"/>
+		<path class="st0" d="M839.804,167.511c0-2.074-0.833-3.741-2.5-5c-1.666-1.259-4.178-2.243-7.534-2.955
+			c-3.357-0.711-5.962-1.526-7.815-2.447c-1.853-0.921-3.229-2.045-4.125-3.375c-0.898-1.329-1.347-2.937-1.347-4.825
+			c0-2.984,1.247-5.449,3.741-7.395s5.688-2.92,9.58-2.92c4.219,0,7.605,1.043,10.157,3.129c2.552,2.086,3.828,4.808,3.828,8.165
+			h-4.195c0-2.214-0.926-4.056-2.779-5.524c-1.854-1.469-4.19-2.203-7.011-2.203c-2.75,0-4.959,0.612-6.625,1.836
+			c-1.667,1.224-2.5,2.814-2.5,4.772c0,1.888,0.693,3.351,2.08,4.388c1.387,1.038,3.916,1.987,7.587,2.85
+			c3.672,0.863,6.422,1.783,8.252,2.762s3.188,2.156,4.072,3.531c0.886,1.376,1.329,3.042,1.329,5c0,3.194-1.288,5.746-3.863,7.657
+			c-2.575,1.912-5.938,2.867-10.087,2.867c-4.405,0-7.978-1.066-10.717-3.199s-4.108-4.831-4.108-8.095h4.196
+			c0.162,2.448,1.194,4.354,3.094,5.717c1.899,1.364,4.411,2.046,7.535,2.046c2.914,0,5.268-0.641,7.062-1.923
+			S839.804,169.469,839.804,167.511z"/>
+	</g>
+	<g>
+		<g>
+			<g>
+				<g>
+					<path class="st0" d="M409.642,96.429V33.558h11.028V86.72h30.122v9.709H409.642z"/>
+				</g>
+				<g>
+					<path class="st0" d="M516.316,96.429l-4.618-12.065h-29.786l-4.619,12.065h-12.065l24.696-62.871h13.761l24.696,62.871H516.316
+						z M496.804,42.89l-11.782,31.765h23.564L496.804,42.89z"/>
+				</g>
+				<g>
+					<path class="st0" d="M668.982,96.429l-12.253-46.376l-12.159,46.376h-11.783l-18.004-62.871h12.348l12.254,48.45l13.007-48.45
+						h8.766l13.007,48.45l12.159-48.45h12.348l-17.909,62.871H668.982z"/>
+				</g>
+				<g>
+					<path class="st0" d="M720.36,96.429V33.558h11.028v62.871H720.36z"/>
+				</g>
+				<g>
+					<path class="st0" d="M803.944,96.429l-32.802-45.81v45.81h-11.028V33.558h11.311l32.142,44.585V33.558h11.028v62.871H803.944z"
+						/>
+				</g>
+				<g>
+					<path class="st0" d="M840.912,96.429V33.558h23.376c19.606,0,32.896,13.008,32.896,31.482c0,18.476-13.29,31.389-32.896,31.389
+						H840.912z M851.94,86.72h12.348c13.667,0,21.585-9.803,21.585-21.68c0-12.159-7.541-21.773-21.585-21.773H851.94V86.72z"/>
+				</g>
+				<g>
+					<path class="st0" d="M358.026,32.521c-17.96,0-32.52,14.56-32.52,32.52c0,17.96,14.56,32.52,32.52,32.52
+						c17.96,0,32.52-14.56,32.52-32.52C390.546,47.081,375.986,32.521,358.026,32.521z M358.026,86.58
+						c-11.896,0-21.539-9.643-21.539-21.539s9.643-21.539,21.539-21.539s21.539,9.643,21.539,21.539S369.921,86.58,358.026,86.58z"
+						/>
+				</g>
+				<g>
+					<path class="st0" d="M588.674,76.699L588.674,76.699l-0.092-0.148l-0.057-0.091l-2.941-4.727l-0.009,0l-0.581-0.93
+						c6.179-2.3,11.436-8.063,11.436-17.544c0-11.594-8.107-19.7-20.549-19.7h-27.618v62.871h11.028V72.958h4.046h6.888h4.046
+						l13.95,23.471h12.725L588.674,76.699z M559.293,63.249V43.267h15.081c6.221,0,10.746,3.959,10.746,9.992
+						c0,6.033-4.524,9.991-10.746,9.991H559.293z"/>
+				</g>
+				<g>
+					<path class="st0" d="M287.373,58.631c-7.447-1.886-13.856-3.488-13.856-8.389c0-4.713,4.147-7.824,10.651-7.824
+						c6.231,0,12.527,2.048,17.339,6.401l6.931-7.128l0.238-0.31c-5.844-5.656-13.762-8.766-23.565-8.766
+						c-13.762,0-22.905,8.012-22.905,18.381c0,13.29,12.065,16.306,22.34,18.852c7.635,1.979,14.327,3.676,14.327,9.332
+						c0,4.148-3.582,8.577-12.631,8.577c-8.015,0-14.369-3.391-18.714-7.502l-7.205,7.41c5.562,5.885,13.919,9.895,25.448,9.895
+						c16.967,0,24.318-8.955,24.318-19.418C310.089,64.475,297.741,61.27,287.373,58.631z"/>
+				</g>
+				<g>
+					<path class="st0" d="M940.862,58.631c-7.447-1.886-13.856-3.488-13.856-8.389c0-4.713,4.147-7.824,10.651-7.824
+						c6.231,0,12.527,2.048,17.339,6.401l6.93-7.128l0.239-0.31c-5.844-5.656-13.762-8.766-23.565-8.766
+						c-13.762,0-22.905,8.012-22.905,18.381c0,13.29,12.065,16.306,22.34,18.852c7.635,1.979,14.327,3.676,14.327,9.332
+						c0,4.148-3.582,8.577-12.631,8.577c-8.015,0-14.369-3.391-18.714-7.502l-7.205,7.41c5.562,5.885,13.919,9.895,25.448,9.895
+						c16.966,0,24.318-8.955,24.318-19.418C963.579,64.475,951.231,61.27,940.862,58.631z"/>
+				</g>
+			</g>
+		</g>
+		<g>
+			<g>
+				<g>
+					<g>
+						<path class="st0" d="M975.398,38.883h-1.356v2.336h-0.765v-5.775h1.912c0.65,0,1.151,0.148,1.501,0.444
+							c0.351,0.296,0.526,0.727,0.526,1.293c0,0.36-0.097,0.673-0.292,0.94c-0.194,0.267-0.465,0.467-0.811,0.599l1.356,2.451v0.048
+							h-0.817L975.398,38.883z M974.041,38.26h1.17c0.378,0,0.679-0.098,0.902-0.294c0.223-0.196,0.335-0.458,0.335-0.787
+							c0-0.358-0.107-0.632-0.319-0.822c-0.213-0.191-0.52-0.287-0.922-0.29h-1.166V38.26z"/>
+					</g>
+				</g>
+				<g>
+					<path class="st0" d="M975.034,43.422c-2.738,0-4.966-2.228-4.966-4.967c0-2.738,2.228-4.966,4.966-4.966
+						c2.738,0,4.966,2.228,4.966,4.966C980,41.194,977.772,43.422,975.034,43.422z M975.034,34.196c-2.349,0-4.26,1.911-4.26,4.26
+						c0,2.349,1.911,4.261,4.26,4.261s4.26-1.911,4.26-4.261C979.294,36.107,977.383,34.196,975.034,34.196z"/>
+				</g>
+			</g>
+		</g>
+		<g>
+			<path class="st0" d="M940.862,58.631c-7.447-1.886-13.856-3.488-13.856-8.389c0-4.713,4.147-7.824,10.651-7.824
+				c6.231,0,12.527,2.048,17.339,6.401l6.93-7.128l0.239-0.31c-5.844-5.656-13.762-8.766-23.565-8.766
+				c-13.762,0-22.905,8.012-22.905,18.381c0,13.29,12.065,16.306,22.34,18.852c7.635,1.979,14.327,3.676,14.327,9.332
+				c0,4.148-3.582,8.577-12.631,8.577c-8.015,0-14.369-3.391-18.714-7.502l-7.205,7.41c5.562,5.885,13.919,9.895,25.448,9.895
+				c16.966,0,24.318-8.955,24.318-19.418C963.579,64.475,951.231,61.27,940.862,58.631z"/>
+		</g>
+		<g>
+			<g>
+				<g>
+					<g>
+						<path class="st0" d="M975.398,38.883h-1.356v2.336h-0.765v-5.775h1.912c0.65,0,1.151,0.148,1.501,0.444
+							c0.351,0.296,0.526,0.727,0.526,1.293c0,0.36-0.097,0.673-0.292,0.94c-0.194,0.267-0.465,0.467-0.811,0.599l1.356,2.451v0.048
+							h-0.817L975.398,38.883z M974.041,38.26h1.17c0.378,0,0.679-0.098,0.902-0.294c0.223-0.196,0.335-0.458,0.335-0.787
+							c0-0.358-0.107-0.632-0.319-0.822c-0.213-0.191-0.52-0.287-0.922-0.29h-1.166V38.26z"/>
+					</g>
+				</g>
+				<g>
+					<path class="st0" d="M975.034,43.422c-2.738,0-4.966-2.228-4.966-4.967c0-2.738,2.228-4.966,4.966-4.966
+						c2.738,0,4.966,2.228,4.966,4.966C980,41.194,977.772,43.422,975.034,43.422z M975.034,34.196c-2.349,0-4.26,1.911-4.26,4.26
+						c0,2.349,1.911,4.261,4.26,4.261s4.26-1.911,4.26-4.261C979.294,36.107,977.383,34.196,975.034,34.196z"/>
+				</g>
+			</g>
+		</g>
+	</g>
+	<g>
+		<g>
+			<g>
+				<g>
+					<g>
+						<path class="st0" d="M112.745,94.791c0.57-0.153,1.123-0.305,1.692-0.469c12.49-3.522,24.64-8.4,36.713-13.453
+							c11.82-4.946,23.509-10.885,33.78-19.244c10.54-8.574,19.017-19.681,23.697-33.456c0.659-1.917,2.006-4.682,2.136-6.785
+							c-16.412,22.442-81.517,24.758-81.517,24.758l15.364-14.095C82.847,32.165,39.747,58.381,20,72.401
+							c25.271,2.711,48.147,13.414,66.057,29.532C94.869,99.204,103.864,97.233,112.745,94.791z"/>
+					</g>
+					<g>
+						<path class="st0" d="M214.849,92.587c0,0-60.073-4.594-122.474,15.499c8.279,8.649,15.257,18.542,20.605,29.39
+							C145.789,119.213,191.284,95.88,214.849,92.587z"/>
+					</g>
+					<g>
+						<path class="st0" d="M117.092,146.852c3.81,9.797,6.365,20.219,7.425,31.075l57.186-58.815L117.092,146.852z"/>
+					</g>
+				</g>
+			</g>
+		</g>
+	</g>
+	<g>
+		<g>
+			<g>
+				<g>
+					<path class="st0" d="M147.408,170.852h-2.409v6.686h-0.983v-6.686h-2.404v-0.808h5.796V170.852z"/>
+				</g>
+				<g>
+					<path class="st0" d="M149.796,170.044l2.45,6.115l2.45-6.115h1.282v7.494h-0.988v-2.918l0.093-3.15l-2.46,6.068h-0.757
+						l-2.455-6.053l0.098,3.135v2.918h-0.988v-7.494H149.796z"/>
+				</g>
+			</g>
+		</g>
+	</g>
+	<g>
+		<path class="st0" d="M117.092,146.852c3.81,9.797,6.365,20.219,7.425,31.075l57.186-58.815L117.092,146.852z"/>
+	</g>
+</g>
+</svg>
diff --git a/packages/nodes-base/credentials/test/Aws.credentials.test.ts b/packages/nodes-base/credentials/test/Aws.credentials.test.ts
index 2f7c25b8d96b3..1874758ecd4a1 100644
--- a/packages/nodes-base/credentials/test/Aws.credentials.test.ts
+++ b/packages/nodes-base/credentials/test/Aws.credentials.test.ts
@@ -1,5 +1,6 @@
 import { sign, type Request } from 'aws4';
 import type { IHttpRequestOptions } from 'n8n-workflow';
+
 import { Aws, type AwsCredentialsType } from '../Aws.credentials';
 
 jest.mock('aws4', () => ({
diff --git a/packages/nodes-base/jest.config.js b/packages/nodes-base/jest.config.js
index 860b43c6304c4..721030d49c85b 100644
--- a/packages/nodes-base/jest.config.js
+++ b/packages/nodes-base/jest.config.js
@@ -1,3 +1,6 @@
+// Avoid tests failing because of difference between local and GitHub actions timezone
+process.env.TZ = 'UTC';
+
 /** @type {import('jest').Config} */
 module.exports = {
 	...require('../../jest.config'),
diff --git a/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.ts b/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.ts
index 068cf0b902d12..79384895692fd 100644
--- a/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.ts
+++ b/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.ts
@@ -7,17 +7,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import {
-	actionNetworkApiRequest,
-	adjustEventPayload,
-	adjustPersonPayload,
-	adjustPetitionPayload,
-	handleListing,
-	makeOsdiLink,
-	resourceLoaders,
-	simplifyResponse,
-} from './GenericFunctions';
-
 import {
 	attendanceFields,
 	attendanceOperations,
@@ -34,7 +23,16 @@ import {
 	tagFields,
 	tagOperations,
 } from './descriptions';
-
+import {
+	actionNetworkApiRequest,
+	adjustEventPayload,
+	adjustPersonPayload,
+	adjustPetitionPayload,
+	handleListing,
+	makeOsdiLink,
+	resourceLoaders,
+	simplifyResponse,
+} from './GenericFunctions';
 import type {
 	AllFieldsUi,
 	EmailAddressUi,
diff --git a/packages/nodes-base/nodes/ActionNetwork/GenericFunctions.ts b/packages/nodes-base/nodes/ActionNetwork/GenericFunctions.ts
index a9545ffe80487..55167ea7ed091 100644
--- a/packages/nodes-base/nodes/ActionNetwork/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ActionNetwork/GenericFunctions.ts
@@ -1,3 +1,5 @@
+import flow from 'lodash/flow';
+import omit from 'lodash/omit';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -6,9 +8,6 @@ import type {
 	IRequestOptions,
 } from 'n8n-workflow';
 
-import flow from 'lodash/flow';
-import omit from 'lodash/omit';
-
 import type {
 	AllFieldsUi,
 	FieldWithPrimaryField,
diff --git a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts
index ca7ea31c3d7ca..8468af3a7fb56 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts
+++ b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts
@@ -10,35 +10,23 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import type { IProduct } from './GenericFunctions';
-import { activeCampaignApiRequest, activeCampaignApiRequestAllItems } from './GenericFunctions';
-
+import { accountContactFields, accountContactOperations } from './AccountContactDescription';
+import { accountFields, accountOperations } from './AccountDescription';
+import { connectionFields, connectionOperations } from './ConnectionDescription';
 import { contactFields, contactOperations } from './ContactDescription';
-
+import { contactListFields, contactListOperations } from './ContactListDescription';
+import { contactTagFields, contactTagOperations } from './ContactTagDescription';
 import { dealFields, dealOperations } from './DealDescription';
-
-import { ecomOrderFields, ecomOrderOperations } from './EcomOrderDescription';
-
 import { ecomCustomerFields, ecomCustomerOperations } from './EcomCustomerDescription';
-
+import { ecomOrderFields, ecomOrderOperations } from './EcomOrderDescription';
 import {
 	ecomOrderProductsFields,
 	ecomOrderProductsOperations,
 } from './EcomOrderProductsDescription';
-
-import { connectionFields, connectionOperations } from './ConnectionDescription';
-
-import { accountFields, accountOperations } from './AccountDescription';
-
-import { tagFields, tagOperations } from './TagDescription';
-
-import { accountContactFields, accountContactOperations } from './AccountContactDescription';
-
-import { contactListFields, contactListOperations } from './ContactListDescription';
-
-import { contactTagFields, contactTagOperations } from './ContactTagDescription';
-
+import { activeCampaignApiRequest, activeCampaignApiRequestAllItems } from './GenericFunctions';
+import type { IProduct } from './GenericFunctions';
 import { listFields, listOperations } from './ListDescription';
+import { tagFields, tagOperations } from './TagDescription';
 
 interface CustomProperty {
 	name: string;
diff --git a/packages/nodes-base/nodes/ActiveCampaign/DealDescription.ts b/packages/nodes-base/nodes/ActiveCampaign/DealDescription.ts
index ac849a9ef5d9e..3e9529f8f193f 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/DealDescription.ts
+++ b/packages/nodes-base/nodes/ActiveCampaign/DealDescription.ts
@@ -1,7 +1,6 @@
 import type { INodeProperties } from 'n8n-workflow';
 
 import { allCurrencies } from './currencies';
-
 import { activeCampaignDefaultGetAllProperties } from './GenericFunctions';
 
 export const dealOperations: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/ActiveCampaign/EcomOrderDescription.ts b/packages/nodes-base/nodes/ActiveCampaign/EcomOrderDescription.ts
index cf7833bd928a6..c7a73f28b0047 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/EcomOrderDescription.ts
+++ b/packages/nodes-base/nodes/ActiveCampaign/EcomOrderDescription.ts
@@ -1,7 +1,6 @@
 import type { INodeProperties } from 'n8n-workflow';
 
 import { allCurrencies } from './currencies';
-
 import { activeCampaignDefaultGetAllProperties } from './GenericFunctions';
 
 export const ecomOrderOperations: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/Adalo/Adalo.node.ts b/packages/nodes-base/nodes/Adalo/Adalo.node.ts
index 1865f16be530e..5c0ae35d463a1 100644
--- a/packages/nodes-base/nodes/Adalo/Adalo.node.ts
+++ b/packages/nodes-base/nodes/Adalo/Adalo.node.ts
@@ -6,6 +6,7 @@ import {
 	type INodeType,
 	type INodeTypeDescription,
 } from 'n8n-workflow';
+
 import { collectionFields } from './CollectionDescription';
 import type { FieldsUiValues } from './types';
 
diff --git a/packages/nodes-base/nodes/Affinity/Affinity.node.ts b/packages/nodes-base/nodes/Affinity/Affinity.node.ts
index d70d908704545..21fecbaab612b 100644
--- a/packages/nodes-base/nodes/Affinity/Affinity.node.ts
+++ b/packages/nodes-base/nodes/Affinity/Affinity.node.ts
@@ -10,17 +10,11 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { affinityApiRequest, affinityApiRequestAllItems } from './GenericFunctions';
-
-import { organizationFields, organizationOperations } from './OrganizationDescription';
-
-import { personFields, personOperations } from './PersonDescription';
-
 import { listFields, listOperations } from './ListDescription';
-
 import { listEntryFields, listEntryOperations } from './ListEntryDescription';
-
+import { organizationFields, organizationOperations } from './OrganizationDescription';
 import type { IOrganization } from './OrganizationInterface';
-
+import { personFields, personOperations } from './PersonDescription';
 import type { IPerson } from './PersonInterface';
 
 export class Affinity implements INodeType {
diff --git a/packages/nodes-base/nodes/Affinity/GenericFunctions.ts b/packages/nodes-base/nodes/Affinity/GenericFunctions.ts
index 54ece184d5930..5bff8e06f8513 100644
--- a/packages/nodes-base/nodes/Affinity/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Affinity/GenericFunctions.ts
@@ -66,7 +66,6 @@ export async function affinityApiRequestAllItems(
 
 	do {
 		responseData = await affinityApiRequest.call(this, method, resource, body, query);
-		// @ts-ignore
 		query.page_token = responseData.page_token;
 		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.page_token !== undefined && responseData.page_token !== null);
@@ -84,7 +83,6 @@ export function eventsExist(subscriptions: string[], currentSubsriptions: string
 }
 
 export function mapResource(key: string) {
-	//@ts-ignore
 	return {
 		person: 'persons',
 		list: 'lists',
diff --git a/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts b/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts
index 3e620b0b401fa..5762a81a306d2 100644
--- a/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts
+++ b/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts
@@ -7,14 +7,12 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, jsonParse, NodeOperationError } from 'n8n-workflow';
 
-import { contactFields, contactOperations } from './ContactDescription';
-
 import { companyFields, companyOperations } from './CompanyDescription';
-
-import { dealFields, dealOperations } from './DealDescription';
-
+import { contactFields, contactOperations } from './ContactDescription';
 import type { IContact, IContactUpdate } from './ContactInterface';
-
+import { dealFields, dealOperations } from './DealDescription';
+import type { IDeal } from './DealInterface';
+import type { IFilter, ISearchConditions } from './FilterInterface';
 import {
 	agileCrmApiRequest,
 	agileCrmApiRequestAllItems,
@@ -24,10 +22,6 @@ import {
 	validateJSON,
 } from './GenericFunctions';
 
-import type { IDeal } from './DealInterface';
-
-import type { IFilter, ISearchConditions } from './FilterInterface';
-
 export class AgileCrm implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Agile CRM',
diff --git a/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts b/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts
index f308b94c90bc0..204d5dd0600f6 100644
--- a/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts
@@ -10,7 +10,6 @@ import type {
 import { NodeApiError } from 'n8n-workflow';
 
 import type { IContactUpdate } from './ContactInterface';
-
 import type { IFilterRules, ISearchConditions } from './FilterInterface';
 
 export async function agileCrmApiRequest(
diff --git a/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts b/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts
index 59b4618d88d24..5a3cec630d4cf 100644
--- a/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts
+++ b/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts
@@ -1,3 +1,4 @@
+import set from 'lodash/set';
 import {
 	NodeOperationError,
 	NodeConnectionType,
@@ -9,8 +10,6 @@ import {
 	AI_TRANSFORM_JS_CODE,
 } from 'n8n-workflow';
 
-import set from 'lodash/set';
-
 import { JavaScriptSandbox } from '../Code/JavaScriptSandbox';
 import { getSandboxContext } from '../Code/Sandbox';
 import { standardizeOutput } from '../Code/utils';
diff --git a/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts b/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts
index d5235546d7487..8877c5763e514 100644
--- a/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts
+++ b/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IPollFunctions,
 	IDataObject,
@@ -7,7 +8,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import type { IRecord } from './v1/GenericFunctions';
 import { apiRequestAllItems, downloadRecordAttachments } from './v1/GenericFunctions';
 
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/base/getMany.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/base/getMany.test.ts
index f535def3cb065..d3c6a6662fc51 100644
--- a/packages/nodes-base/nodes/Airtable/test/v2/node/base/getMany.test.ts
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/base/getMany.test.ts
@@ -1,7 +1,6 @@
 import nock from 'nock';
 
 import * as getMany from '../../../../v2/actions/base/getMany.operation';
-
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction } from '../helpers';
 
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/base/getSchema.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/base/getSchema.test.ts
index df3b8ed930470..4f6bda2a898a7 100644
--- a/packages/nodes-base/nodes/Airtable/test/v2/node/base/getSchema.test.ts
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/base/getSchema.test.ts
@@ -1,7 +1,6 @@
 import nock from 'nock';
 
 import * as getSchema from '../../../../v2/actions/base/getSchema.operation';
-
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction } from '../helpers';
 
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/helpers.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/helpers.ts
index 1edd17cd16aa0..80855886eadbf 100644
--- a/packages/nodes-base/nodes/Airtable/test/v2/node/helpers.ts
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/helpers.ts
@@ -1,7 +1,6 @@
-import type { IDataObject, IExecuteFunctions, IGetNodeParameterOptions, INode } from 'n8n-workflow';
-
 import { get } from 'lodash';
 import { constructExecutionMetaData } from 'n8n-core';
+import type { IDataObject, IExecuteFunctions, IGetNodeParameterOptions, INode } from 'n8n-workflow';
 
 export const node: INode = {
 	id: '11',
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/record/create.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/record/create.test.ts
index 1b17b25ea7711..85f5d0db7eb33 100644
--- a/packages/nodes-base/nodes/Airtable/test/v2/node/record/create.test.ts
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/record/create.test.ts
@@ -1,7 +1,6 @@
 import nock from 'nock';
 
 import * as create from '../../../../v2/actions/record/create.operation';
-
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction } from '../helpers';
 
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/record/deleteRecord.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/record/deleteRecord.test.ts
index 2ea8b11d75ca5..36e8e828e6141 100644
--- a/packages/nodes-base/nodes/Airtable/test/v2/node/record/deleteRecord.test.ts
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/record/deleteRecord.test.ts
@@ -1,7 +1,6 @@
 import nock from 'nock';
 
 import * as deleteRecord from '../../../../v2/actions/record/deleteRecord.operation';
-
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction } from '../helpers';
 
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/record/get.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/record/get.test.ts
index 3d8c709abd450..eb9a612cf6a5d 100644
--- a/packages/nodes-base/nodes/Airtable/test/v2/node/record/get.test.ts
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/record/get.test.ts
@@ -1,7 +1,6 @@
 import nock from 'nock';
 
 import * as get from '../../../../v2/actions/record/get.operation';
-
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction } from '../helpers';
 
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/record/search.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/record/search.test.ts
index 83e2bab61bf7d..b5c12159073cc 100644
--- a/packages/nodes-base/nodes/Airtable/test/v2/node/record/search.test.ts
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/record/search.test.ts
@@ -1,7 +1,6 @@
 import nock from 'nock';
 
 import * as search from '../../../../v2/actions/record/search.operation';
-
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction } from '../helpers';
 
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/record/update.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/record/update.test.ts
index afe736c914441..89cdc0d9ef50f 100644
--- a/packages/nodes-base/nodes/Airtable/test/v2/node/record/update.test.ts
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/record/update.test.ts
@@ -1,7 +1,6 @@
 import nock from 'nock';
 
 import * as update from '../../../../v2/actions/record/update.operation';
-
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction } from '../helpers';
 
diff --git a/packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts b/packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts
index 526894110a5a6..27214c61926a8 100644
--- a/packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts
+++ b/packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts
@@ -9,10 +9,10 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { oldVersionNotice } from '../../../utils/descriptions';
-import { generatePairedItemData } from '../../../utils/utilities';
 import type { IRecord } from './GenericFunctions';
 import { apiRequest, apiRequestAllItems, downloadRecordAttachments } from './GenericFunctions';
+import { oldVersionNotice } from '../../../utils/descriptions';
+import { generatePairedItemData } from '../../../utils/utilities';
 
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Airtable',
diff --git a/packages/nodes-base/nodes/Airtable/v2/AirtableV2.node.ts b/packages/nodes-base/nodes/Airtable/v2/AirtableV2.node.ts
index 4395f690ebc69..3c8afb0d80e63 100644
--- a/packages/nodes-base/nodes/Airtable/v2/AirtableV2.node.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/AirtableV2.node.ts
@@ -5,8 +5,8 @@ import type {
 	INodeTypeBaseDescription,
 } from 'n8n-workflow';
 
-import { versionDescription } from './actions/versionDescription';
 import { router } from './actions/router';
+import { versionDescription } from './actions/versionDescription';
 import { listSearch, loadOptions, resourceMapping } from './methods';
 
 export class AirtableV2 implements INodeType {
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/base/getMany.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/base/getMany.operation.ts
index da5f2f528e0ac..5272be1a2a7e3 100644
--- a/packages/nodes-base/nodes/Airtable/v2/actions/base/getMany.operation.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/base/getMany.operation.ts
@@ -4,6 +4,7 @@ import type {
 	INodeProperties,
 	IExecuteFunctions,
 } from 'n8n-workflow';
+
 import {
 	generatePairedItemData,
 	updateDisplayOptions,
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/base/getSchema.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/base/getSchema.operation.ts
index aa791f7b64877..b687cac225ada 100644
--- a/packages/nodes-base/nodes/Airtable/v2/actions/base/getSchema.operation.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/base/getSchema.operation.ts
@@ -5,10 +5,11 @@ import type {
 	IExecuteFunctions,
 	NodeApiError,
 } from 'n8n-workflow';
+
 import { updateDisplayOptions, wrapData } from '../../../../../utils/utilities';
+import { processAirtableError } from '../../helpers/utils';
 import { apiRequest } from '../../transport';
 import { baseRLC } from '../common.descriptions';
-import { processAirtableError } from '../../helpers/utils';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/record/Record.resource.ts b/packages/nodes-base/nodes/Airtable/v2/actions/record/Record.resource.ts
index f9b5287f4b8e1..d061808b7e22a 100644
--- a/packages/nodes-base/nodes/Airtable/v2/actions/record/Record.resource.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/Record.resource.ts
@@ -1,5 +1,4 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { baseRLC, tableRLC } from '../common.descriptions';
 
 import * as create from './create.operation';
 import * as deleteRecord from './deleteRecord.operation';
@@ -7,6 +6,7 @@ import * as get from './get.operation';
 import * as search from './search.operation';
 import * as update from './update.operation';
 import * as upsert from './upsert.operation';
+import { baseRLC, tableRLC } from '../common.descriptions';
 
 export { create, deleteRecord, get, search, update, upsert };
 
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/record/create.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/record/create.operation.ts
index 758c3b7a2ffc1..2ae70b5d7dcdd 100644
--- a/packages/nodes-base/nodes/Airtable/v2/actions/record/create.operation.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/create.operation.ts
@@ -5,10 +5,11 @@ import type {
 	IExecuteFunctions,
 	NodeApiError,
 } from 'n8n-workflow';
+
 import { updateDisplayOptions, wrapData } from '../../../../../utils/utilities';
+import { processAirtableError, removeIgnored } from '../../helpers/utils';
 import { apiRequest } from '../../transport';
 import { insertUpdateOptions } from '../common.descriptions';
-import { processAirtableError, removeIgnored } from '../../helpers/utils';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/record/deleteRecord.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/record/deleteRecord.operation.ts
index cbbf12ba3c5cc..cc8ba894c08de 100644
--- a/packages/nodes-base/nodes/Airtable/v2/actions/record/deleteRecord.operation.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/deleteRecord.operation.ts
@@ -5,9 +5,10 @@ import type {
 	NodeApiError,
 	IExecuteFunctions,
 } from 'n8n-workflow';
+
 import { updateDisplayOptions, wrapData } from '../../../../../utils/utilities';
-import { apiRequest } from '../../transport';
 import { processAirtableError } from '../../helpers/utils';
+import { apiRequest } from '../../transport';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/record/get.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/record/get.operation.ts
index 73a9933076336..82a6edcc9523a 100644
--- a/packages/nodes-base/nodes/Airtable/v2/actions/record/get.operation.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/get.operation.ts
@@ -5,10 +5,11 @@ import type {
 	NodeApiError,
 	IExecuteFunctions,
 } from 'n8n-workflow';
+
 import { updateDisplayOptions, wrapData } from '../../../../../utils/utilities';
-import { apiRequest, downloadRecordAttachments } from '../../transport';
-import { flattenOutput, processAirtableError } from '../../helpers/utils';
 import type { IRecord } from '../../helpers/interfaces';
+import { flattenOutput, processAirtableError } from '../../helpers/utils';
+import { apiRequest, downloadRecordAttachments } from '../../transport';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/record/search.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/record/search.operation.ts
index 29f753794f229..ae698d8a7ac6f 100644
--- a/packages/nodes-base/nodes/Airtable/v2/actions/record/search.operation.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/search.operation.ts
@@ -4,10 +4,11 @@ import type {
 	INodeProperties,
 	IExecuteFunctions,
 } from 'n8n-workflow';
+
 import { generatePairedItemData, updateDisplayOptions } from '../../../../../utils/utilities';
-import { apiRequest, apiRequestAllItems, downloadRecordAttachments } from '../../transport';
 import type { IRecord } from '../../helpers/interfaces';
 import { flattenOutput } from '../../helpers/utils';
+import { apiRequest, apiRequestAllItems, downloadRecordAttachments } from '../../transport';
 import { viewRLC } from '../common.descriptions';
 
 const properties: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/record/update.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/record/update.operation.ts
index d2c4172dd53d1..de3a56ead8485 100644
--- a/packages/nodes-base/nodes/Airtable/v2/actions/record/update.operation.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/update.operation.ts
@@ -5,10 +5,11 @@ import type {
 	NodeApiError,
 	IExecuteFunctions,
 } from 'n8n-workflow';
+
 import { updateDisplayOptions, wrapData } from '../../../../../utils/utilities';
-import { apiRequestAllItems, batchUpdate } from '../../transport';
-import { findMatches, processAirtableError, removeIgnored } from '../../helpers/utils';
 import type { UpdateRecord } from '../../helpers/interfaces';
+import { findMatches, processAirtableError, removeIgnored } from '../../helpers/utils';
+import { apiRequestAllItems, batchUpdate } from '../../transport';
 import { insertUpdateOptions } from '../common.descriptions';
 
 const properties: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/record/upsert.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/record/upsert.operation.ts
index e6266480cee97..0bc0c28cac0b7 100644
--- a/packages/nodes-base/nodes/Airtable/v2/actions/record/upsert.operation.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/upsert.operation.ts
@@ -5,10 +5,11 @@ import type {
 	IExecuteFunctions,
 	NodeApiError,
 } from 'n8n-workflow';
+
 import { updateDisplayOptions, wrapData } from '../../../../../utils/utilities';
-import { apiRequest, apiRequestAllItems, batchUpdate } from '../../transport';
-import { processAirtableError, removeIgnored } from '../../helpers/utils';
 import type { UpdateRecord } from '../../helpers/interfaces';
+import { processAirtableError, removeIgnored } from '../../helpers/utils';
+import { apiRequest, apiRequestAllItems, batchUpdate } from '../../transport';
 import { insertUpdateOptions } from '../common.descriptions';
 
 const properties: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/router.ts b/packages/nodes-base/nodes/Airtable/v2/actions/router.ts
index ac1216a680474..6bc659f27595f 100644
--- a/packages/nodes-base/nodes/Airtable/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/router.ts
@@ -1,9 +1,9 @@
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import type { AirtableType } from './node.type';
 
-import * as record from './record/Record.resource';
 import * as base from './base/Base.resource';
+import type { AirtableType } from './node.type';
+import * as record from './record/Record.resource';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	let returnData: INodeExecutionData[] = [];
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/versionDescription.ts b/packages/nodes-base/nodes/Airtable/v2/actions/versionDescription.ts
index f2ecef8726b24..9bbbd7345e4f1 100644
--- a/packages/nodes-base/nodes/Airtable/v2/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/versionDescription.ts
@@ -1,8 +1,8 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import { NodeConnectionType, type INodeTypeDescription } from 'n8n-workflow';
 
-import * as record from './record/Record.resource';
 import * as base from './base/Base.resource';
+import * as record from './record/Record.resource';
 
 export const versionDescription: INodeTypeDescription = {
 	displayName: 'Airtable',
diff --git a/packages/nodes-base/nodes/Airtable/v2/helpers/utils.ts b/packages/nodes-base/nodes/Airtable/v2/helpers/utils.ts
index 0daf33b997d52..11e14a5bd8f31 100644
--- a/packages/nodes-base/nodes/Airtable/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/helpers/utils.ts
@@ -1,5 +1,6 @@
-import { ApplicationError, type IDataObject, type NodeApiError } from 'n8n-workflow';
 import set from 'lodash/set';
+import { ApplicationError, type IDataObject, type NodeApiError } from 'n8n-workflow';
+
 import type { UpdateRecord } from './interfaces';
 
 export function removeIgnored(data: IDataObject, ignore: string | string[]) {
diff --git a/packages/nodes-base/nodes/Airtable/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Airtable/v2/methods/listSearch.ts
index 10f2d89c83948..b9bca910daa4f 100644
--- a/packages/nodes-base/nodes/Airtable/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/methods/listSearch.ts
@@ -5,6 +5,7 @@ import type {
 	INodeListSearchResult,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
 import { apiRequest } from '../transport';
 
 export async function baseSearch(
diff --git a/packages/nodes-base/nodes/Airtable/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/Airtable/v2/methods/loadOptions.ts
index 79aaabf1ef1a9..9d7120ec2ca06 100644
--- a/packages/nodes-base/nodes/Airtable/v2/methods/loadOptions.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/methods/loadOptions.ts
@@ -1,5 +1,6 @@
 import type { IDataObject, ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
 import { apiRequest } from '../transport';
 
 export async function getColumns(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
diff --git a/packages/nodes-base/nodes/Airtable/v2/methods/resourceMapping.ts b/packages/nodes-base/nodes/Airtable/v2/methods/resourceMapping.ts
index e99140d251278..c0d4934c3b4e6 100644
--- a/packages/nodes-base/nodes/Airtable/v2/methods/resourceMapping.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/methods/resourceMapping.ts
@@ -7,6 +7,7 @@ import type {
 	ResourceMapperFields,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
 import { apiRequest } from '../transport';
 
 type AirtableSchema = {
diff --git a/packages/nodes-base/nodes/Airtable/v2/transport/index.ts b/packages/nodes-base/nodes/Airtable/v2/transport/index.ts
index 95d2c3c1f85a3..6d26a24118479 100644
--- a/packages/nodes-base/nodes/Airtable/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/transport/index.ts
@@ -10,6 +10,7 @@ import type {
 	IRequestOptions,
 } from 'n8n-workflow';
 import { ApplicationError } from 'n8n-workflow';
+
 import type { IAttachment, IRecord } from '../helpers/interfaces';
 import { flattenOutput } from '../helpers/utils';
 
diff --git a/packages/nodes-base/nodes/Amqp/Amqp.node.ts b/packages/nodes-base/nodes/Amqp/Amqp.node.ts
index ce711d9695406..1283558d370e4 100644
--- a/packages/nodes-base/nodes/Amqp/Amqp.node.ts
+++ b/packages/nodes-base/nodes/Amqp/Amqp.node.ts
@@ -1,6 +1,3 @@
-import type { Connection, ContainerOptions, Dictionary, EventContext, Sender } from 'rhea';
-import { create_container } from 'rhea';
-
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -13,6 +10,8 @@ import type {
 	ICredentialDataDecryptedObject,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import type { Connection, ContainerOptions, Dictionary, EventContext, Sender } from 'rhea';
+import { create_container } from 'rhea';
 
 async function checkIfCredentialsValid(
 	credentials: IDataObject,
diff --git a/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts b/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts
index 249391fd9dbfc..bd88bcbc660ac 100644
--- a/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts
+++ b/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts
@@ -1,6 +1,3 @@
-import type { ContainerOptions, EventContext, Message, ReceiverOptions } from 'rhea';
-import { create_container } from 'rhea';
-
 import type {
 	ITriggerFunctions,
 	IDataObject,
@@ -11,6 +8,8 @@ import type {
 	IRun,
 } from 'n8n-workflow';
 import { deepCopy, jsonParse, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import type { ContainerOptions, EventContext, Message, ReceiverOptions } from 'rhea';
+import { create_container } from 'rhea';
 
 export class AmqpTrigger implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Asana/Asana.node.ts b/packages/nodes-base/nodes/Asana/Asana.node.ts
index c5d3401674f30..72b93594f3718 100644
--- a/packages/nodes-base/nodes/Asana/Asana.node.ts
+++ b/packages/nodes-base/nodes/Asana/Asana.node.ts
@@ -1,3 +1,5 @@
+import { snakeCase } from 'change-case';
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -10,9 +12,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
-import { snakeCase } from 'change-case';
 import {
 	asanaApiRequest,
 	asanaApiRequestAllItems,
diff --git a/packages/nodes-base/nodes/Asana/GenericFunctions.ts b/packages/nodes-base/nodes/Asana/GenericFunctions.ts
index 72492ecb6c4f7..73623701adb95 100644
--- a/packages/nodes-base/nodes/Asana/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Asana/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -8,8 +9,6 @@ import type {
 	INodePropertyOptions,
 } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
 /**
  * Make an API request to Asana
  *
diff --git a/packages/nodes-base/nodes/Automizy/Automizy.node.ts b/packages/nodes-base/nodes/Automizy/Automizy.node.ts
index 38c53c4f1f31b..24c9f9c6d67e8 100644
--- a/packages/nodes-base/nodes/Automizy/Automizy.node.ts
+++ b/packages/nodes-base/nodes/Automizy/Automizy.node.ts
@@ -10,10 +10,8 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { automizyApiRequest, automizyApiRequestAllItems } from './GenericFunctions';
-
 import { contactFields, contactOperations } from './ContactDescription';
-
+import { automizyApiRequest, automizyApiRequestAllItems } from './GenericFunctions';
 import { listFields, listOperations } from './ListDescription';
 
 export class Automizy implements INodeType {
diff --git a/packages/nodes-base/nodes/Automizy/GenericFunctions.ts b/packages/nodes-base/nodes/Automizy/GenericFunctions.ts
index 94e73e0388a27..fca83ab1ca54d 100644
--- a/packages/nodes-base/nodes/Automizy/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Automizy/GenericFunctions.ts
@@ -40,7 +40,6 @@ export async function automizyApiRequest(
 		if (Object.keys(option).length !== 0) {
 			Object.assign(options, option);
 		}
-		//@ts-ignore
 		return await this.helpers.request.call(this, options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/Autopilot/Autopilot.node.ts b/packages/nodes-base/nodes/Autopilot/Autopilot.node.ts
index 069e2dd03fecc..d3b123761fc05 100644
--- a/packages/nodes-base/nodes/Autopilot/Autopilot.node.ts
+++ b/packages/nodes-base/nodes/Autopilot/Autopilot.node.ts
@@ -10,14 +10,10 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { autopilotApiRequest, autopilotApiRequestAllItems } from './GenericFunctions';
-
 import { contactFields, contactOperations } from './ContactDescription';
-
 import { contactJourneyFields, contactJourneyOperations } from './ContactJourneyDescription';
-
 import { contactListFields, contactListOperations } from './ContactListDescription';
-
+import { autopilotApiRequest, autopilotApiRequestAllItems } from './GenericFunctions';
 import { listFields, listOperations } from './ListDescription';
 
 export class Autopilot implements INodeType {
diff --git a/packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.ts b/packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.ts
index a27ff7c1a56c1..29460f7851c58 100644
--- a/packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.ts
+++ b/packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.ts
@@ -1,3 +1,4 @@
+import { snakeCase } from 'change-case';
 import type {
 	IHookFunctions,
 	IWebhookFunctions,
@@ -8,7 +9,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
 import { autopilotApiRequest } from './GenericFunctions';
 
 export class AutopilotTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts b/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts
index 1aee04d83b722..535233bbc9d70 100644
--- a/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts
+++ b/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts
@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import type {
 	IHookFunctions,
 	IWebhookFunctions,
@@ -10,7 +11,6 @@ import type {
 } from 'n8n-workflow';
 import { jsonParse, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import get from 'lodash/get';
 import { awsApiRequestSOAP } from './GenericFunctions';
 
 export class AwsSnsTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Aws/CertificateManager/AwsCertificateManager.node.ts b/packages/nodes-base/nodes/Aws/CertificateManager/AwsCertificateManager.node.ts
index 25abdb7669ac9..80047f39a0dd0 100644
--- a/packages/nodes-base/nodes/Aws/CertificateManager/AwsCertificateManager.node.ts
+++ b/packages/nodes-base/nodes/Aws/CertificateManager/AwsCertificateManager.node.ts
@@ -8,7 +8,6 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { certificateFields, certificateOperations } from './CertificateDescription';
-
 import { awsApiRequestAllItems, awsApiRequestREST } from './GenericFunctions';
 
 export class AwsCertificateManager implements INodeType {
diff --git a/packages/nodes-base/nodes/Aws/CertificateManager/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/CertificateManager/GenericFunctions.ts
index bff183fcee42e..0a68f30c51848 100644
--- a/packages/nodes-base/nodes/Aws/CertificateManager/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/CertificateManager/GenericFunctions.ts
@@ -1,5 +1,4 @@
 import get from 'lodash/get';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
diff --git a/packages/nodes-base/nodes/Aws/Comprehend/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/Comprehend/GenericFunctions.ts
index 7f327518a0116..bbdf8138634c4 100644
--- a/packages/nodes-base/nodes/Aws/Comprehend/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/Comprehend/GenericFunctions.ts
@@ -1,5 +1,3 @@
-import { parseString } from 'xml2js';
-
 import type {
 	IExecuteFunctions,
 	IHookFunctions,
@@ -8,6 +6,7 @@ import type {
 	IHttpRequestOptions,
 	IHttpRequestMethods,
 } from 'n8n-workflow';
+import { parseString } from 'xml2js';
 
 export async function awsApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
diff --git a/packages/nodes-base/nodes/Aws/Comprehend/test/AwsComprehend.node.test.ts b/packages/nodes-base/nodes/Aws/Comprehend/test/AwsComprehend.node.test.ts
index 0215ddc6dac35..ecedd706728b3 100644
--- a/packages/nodes-base/nodes/Aws/Comprehend/test/AwsComprehend.node.test.ts
+++ b/packages/nodes-base/nodes/Aws/Comprehend/test/AwsComprehend.node.test.ts
@@ -1,4 +1,5 @@
 import nock from 'nock';
+
 import { getWorkflowFilenames, initBinaryDataService, testWorkflows } from '@test/nodes/Helpers';
 
 const workflows = getWorkflowFilenames(__dirname);
diff --git a/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.ts b/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.ts
index cecc3aca46c4d..57346fbc8710e 100644
--- a/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.ts
+++ b/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.ts
@@ -11,9 +11,7 @@ import {
 } from 'n8n-workflow';
 
 import { awsApiRequest, awsApiRequestAllItems } from './GenericFunctions';
-
 import { itemFields, itemOperations } from './ItemDescription';
-
 import type {
 	FieldsUiValues,
 	IAttributeNameUi,
@@ -22,7 +20,6 @@ import type {
 	IRequestBody,
 	PutItemUi,
 } from './types';
-
 import {
 	adjustExpressionAttributeName,
 	adjustExpressionAttributeValues,
diff --git a/packages/nodes-base/nodes/Aws/ELB/AwsElb.node.ts b/packages/nodes-base/nodes/Aws/ELB/AwsElb.node.ts
index fbc781fb6ff86..ab80b67e9ee01 100644
--- a/packages/nodes-base/nodes/Aws/ELB/AwsElb.node.ts
+++ b/packages/nodes-base/nodes/Aws/ELB/AwsElb.node.ts
@@ -11,13 +11,11 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { awsApiRequestSOAP, awsApiRequestSOAPAllItems } from './GenericFunctions';
-
-import { loadBalancerFields, loadBalancerOperations } from './LoadBalancerDescription';
-
 import {
 	listenerCertificateFields,
 	listenerCertificateOperations,
 } from './ListenerCertificateDescription';
+import { loadBalancerFields, loadBalancerOperations } from './LoadBalancerDescription';
 
 export class AwsElb implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Aws/ELB/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/ELB/GenericFunctions.ts
index 51a88f61bafb0..00f4bbdc69299 100644
--- a/packages/nodes-base/nodes/Aws/ELB/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/ELB/GenericFunctions.ts
@@ -1,7 +1,4 @@
 import get from 'lodash/get';
-
-import { parseString } from 'xml2js';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -13,6 +10,7 @@ import type {
 	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
+import { parseString } from 'xml2js';
 
 export async function awsApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
diff --git a/packages/nodes-base/nodes/Aws/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/GenericFunctions.ts
index 5c65217e9bce8..18a268f0e3fd5 100644
--- a/packages/nodes-base/nodes/Aws/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/GenericFunctions.ts
@@ -1,5 +1,3 @@
-import { parseString as parseXml } from 'xml2js';
-
 import type {
 	IExecuteFunctions,
 	IHookFunctions,
@@ -10,6 +8,7 @@ import type {
 	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
+import { parseString as parseXml } from 'xml2js';
 
 export async function awsApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
diff --git a/packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts
index b0992162ca537..db25a8b6437c9 100644
--- a/packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts
@@ -1,7 +1,5 @@
+import { pascalCase } from 'change-case';
 import get from 'lodash/get';
-
-import { parseString } from 'xml2js';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -11,8 +9,7 @@ import type {
 	IHttpRequestOptions,
 	IHttpRequestMethods,
 } from 'n8n-workflow';
-
-import { pascalCase } from 'change-case';
+import { parseString } from 'xml2js';
 
 export async function awsApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
diff --git a/packages/nodes-base/nodes/Aws/Rekognition/test/AwsRekognition.node.test.ts b/packages/nodes-base/nodes/Aws/Rekognition/test/AwsRekognition.node.test.ts
index e9fe6debac0b5..49b1465307f98 100644
--- a/packages/nodes-base/nodes/Aws/Rekognition/test/AwsRekognition.node.test.ts
+++ b/packages/nodes-base/nodes/Aws/Rekognition/test/AwsRekognition.node.test.ts
@@ -1,4 +1,5 @@
 import nock from 'nock';
+
 import { getWorkflowFilenames, testWorkflows } from '@test/nodes/Helpers';
 
 const responseLabels = [
diff --git a/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts b/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts
index 50a4c1738a62d..132cd109c938c 100644
--- a/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts
+++ b/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts
@@ -2,7 +2,6 @@ import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow'
 import { VersionedNodeType } from 'n8n-workflow';
 
 import { AwsS3V1 } from './V1/AwsS3V1.node';
-
 import { AwsS3V2 } from './V2/AwsS3V2.node';
 
 export class AwsS3 extends VersionedNodeType {
diff --git a/packages/nodes-base/nodes/Aws/S3/V1/AwsS3V1.node.ts b/packages/nodes-base/nodes/Aws/S3/V1/AwsS3V1.node.ts
index fa3879b71db0d..d467460d89505 100644
--- a/packages/nodes-base/nodes/Aws/S3/V1/AwsS3V1.node.ts
+++ b/packages/nodes-base/nodes/Aws/S3/V1/AwsS3V1.node.ts
@@ -1,8 +1,5 @@
-import { createHash } from 'crypto';
 import { paramCase, snakeCase } from 'change-case';
-
-import { Builder } from 'xml2js';
-
+import { createHash } from 'crypto';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -12,13 +9,11 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import { Builder } from 'xml2js';
 
 import { bucketFields, bucketOperations } from './BucketDescription';
-
-import { folderFields, folderOperations } from './FolderDescription';
-
 import { fileFields, fileOperations } from './FileDescription';
-
+import { folderFields, folderOperations } from './FolderDescription';
 import {
 	awsApiRequestREST,
 	awsApiRequestSOAP,
diff --git a/packages/nodes-base/nodes/Aws/S3/V1/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/S3/V1/GenericFunctions.ts
index 06700d283df0b..947a0db801bd5 100644
--- a/packages/nodes-base/nodes/Aws/S3/V1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/S3/V1/GenericFunctions.ts
@@ -1,7 +1,4 @@
 import get from 'lodash/get';
-
-import { parseString } from 'xml2js';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -11,6 +8,7 @@ import type {
 	IHttpRequestOptions,
 	IHttpRequestMethods,
 } from 'n8n-workflow';
+import { parseString } from 'xml2js';
 
 export async function awsApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
diff --git a/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts b/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts
index 34cdef556aa80..bd08de167fcab 100644
--- a/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts
+++ b/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts
@@ -1,9 +1,5 @@
-import { createHash } from 'crypto';
-import type { Readable } from 'stream';
 import { paramCase, snakeCase } from 'change-case';
-
-import { Builder } from 'xml2js';
-
+import { createHash } from 'crypto';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -13,13 +9,12 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import type { Readable } from 'stream';
+import { Builder } from 'xml2js';
 
 import { bucketFields, bucketOperations } from './BucketDescription';
-
-import { folderFields, folderOperations } from './FolderDescription';
-
 import { fileFields, fileOperations } from './FileDescription';
-
+import { folderFields, folderOperations } from './FolderDescription';
 import { awsApiRequestREST, awsApiRequestRESTAllItems } from './GenericFunctions';
 
 // Minimum size 5MB for multipart upload in S3
diff --git a/packages/nodes-base/nodes/Aws/S3/V2/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/S3/V2/GenericFunctions.ts
index c4e47a8af36eb..ede6895e43d1b 100644
--- a/packages/nodes-base/nodes/Aws/S3/V2/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/S3/V2/GenericFunctions.ts
@@ -1,7 +1,4 @@
 import get from 'lodash/get';
-
-import { parseString } from 'xml2js';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -11,6 +8,7 @@ import type {
 	IHttpRequestOptions,
 	IHttpRequestMethods,
 } from 'n8n-workflow';
+import { parseString } from 'xml2js';
 
 export async function awsApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
diff --git a/packages/nodes-base/nodes/Aws/S3/test/V1/AwsS3.node.test.ts b/packages/nodes-base/nodes/Aws/S3/test/V1/AwsS3.node.test.ts
index c13c572ef2758..a5770b0b9c712 100644
--- a/packages/nodes-base/nodes/Aws/S3/test/V1/AwsS3.node.test.ts
+++ b/packages/nodes-base/nodes/Aws/S3/test/V1/AwsS3.node.test.ts
@@ -1,4 +1,5 @@
 import nock from 'nock';
+
 import { getWorkflowFilenames, initBinaryDataService, testWorkflows } from '@test/nodes/Helpers';
 
 const workflows = getWorkflowFilenames(__dirname);
diff --git a/packages/nodes-base/nodes/Aws/S3/test/V2/AwsS3.node.test.ts b/packages/nodes-base/nodes/Aws/S3/test/V2/AwsS3.node.test.ts
index 7d4da16178d9d..fe6b625331327 100644
--- a/packages/nodes-base/nodes/Aws/S3/test/V2/AwsS3.node.test.ts
+++ b/packages/nodes-base/nodes/Aws/S3/test/V2/AwsS3.node.test.ts
@@ -1,4 +1,5 @@
 import nock from 'nock';
+
 import { getWorkflowFilenames, initBinaryDataService, testWorkflows } from '@test/nodes/Helpers';
 
 const workflows = getWorkflowFilenames(__dirname);
diff --git a/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts b/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts
index 052928a681cbd..ebbc2496ff7ff 100644
--- a/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts
+++ b/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts
@@ -1,4 +1,3 @@
-import qs from 'node:querystring';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,6 +8,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import qs from 'node:querystring';
 
 import { awsApiRequestSOAP, awsApiRequestSOAPAllItems } from './GenericFunctions';
 
diff --git a/packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts
index b71053bd286ab..b76ab07c61bf4 100644
--- a/packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts
@@ -1,5 +1,4 @@
-import { parseString } from 'xml2js';
-
+import get from 'lodash/get';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -11,8 +10,7 @@ import type {
 	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
-
-import get from 'lodash/get';
+import { parseString } from 'xml2js';
 
 export async function awsApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
diff --git a/packages/nodes-base/nodes/Aws/SES/test/AwsSes.node.test.ts b/packages/nodes-base/nodes/Aws/SES/test/AwsSes.node.test.ts
index 45ad851ca7f1e..dfd4005fe32e0 100644
--- a/packages/nodes-base/nodes/Aws/SES/test/AwsSes.node.test.ts
+++ b/packages/nodes-base/nodes/Aws/SES/test/AwsSes.node.test.ts
@@ -1,9 +1,10 @@
-import qs from 'node:querystring';
-import assert from 'node:assert';
 import { NodeConnectionType } from 'n8n-workflow';
-import type { WorkflowTestData } from '@test/nodes/types';
+import assert from 'node:assert';
+import qs from 'node:querystring';
+
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import * as Helpers from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
 
 describe('AwsSes Node', () => {
 	const tests: WorkflowTestData[] = [
diff --git a/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts b/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts
index ba99d9fcacb32..2761233a6f5b6 100644
--- a/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts
+++ b/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts
@@ -1,4 +1,4 @@
-import { URL } from 'url';
+import { pascalCase } from 'change-case';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -11,8 +11,8 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeConnectionType } from 'n8n-workflow';
+import { URL } from 'url';
 
-import { pascalCase } from 'change-case';
 import { awsApiRequestSOAP } from '../GenericFunctions';
 
 export class AwsSqs implements INodeType {
diff --git a/packages/nodes-base/nodes/Aws/Textract/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/Textract/GenericFunctions.ts
index 663c82b54e3db..a92de20bbeef4 100644
--- a/packages/nodes-base/nodes/Aws/Textract/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/Textract/GenericFunctions.ts
@@ -1,10 +1,5 @@
-import { URL } from 'url';
-
 import type { Request } from 'aws4';
 import { sign } from 'aws4';
-
-import { parseString } from 'xml2js';
-
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialTestFunctions,
@@ -18,6 +13,8 @@ import type {
 	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
+import { URL } from 'url';
+import { parseString } from 'xml2js';
 
 function getEndpointForService(
 	service: string,
diff --git a/packages/nodes-base/nodes/Aws/Transcribe/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/Transcribe/GenericFunctions.ts
index 05faeb8a83ec6..54cf97ec5832d 100644
--- a/packages/nodes-base/nodes/Aws/Transcribe/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/Transcribe/GenericFunctions.ts
@@ -1,8 +1,6 @@
-import { URL } from 'url';
-
 import type { Request } from 'aws4';
 import { sign } from 'aws4';
-
+import get from 'lodash/get';
 import type {
 	ICredentialDataDecryptedObject,
 	IDataObject,
@@ -15,8 +13,7 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
-
-import get from 'lodash/get';
+import { URL } from 'url';
 
 function getEndpointForService(
 	service: string,
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/get/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/get/index.ts
index bd99a16bdd72a..d3462c784e4b3 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/get/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/get/index.ts
@@ -1,4 +1,4 @@
-import { get as execute } from './execute';
 import { companyReportGetDescription as description } from './description';
+import { get as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/index.ts
index ed602347d3467..0650a1d9f4982 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/index.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as get from './get';
 
 export { get };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/create/description.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/create/description.ts
index 9c4dd63f7ec90..9008ca9176041 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/create/description.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/create/description.ts
@@ -1,6 +1,5 @@
-import type { EmployeeProperties } from '../../Interfaces';
-
 import { createEmployeeSharedDescription } from './shareDescription';
+import type { EmployeeProperties } from '../../Interfaces';
 
 export const employeeCreateDescription: EmployeeProperties = [
 	{
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/create/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/create/execute.ts
index 33c29827761cb..eaae6824e8bbc 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/create/execute.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/create/execute.ts
@@ -1,8 +1,7 @@
-import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
-
+import { capitalCase } from 'change-case';
 import moment from 'moment-timezone';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
-import { capitalCase } from 'change-case';
 import { apiRequest } from '../../../transport';
 
 export async function create(
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/create/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/create/index.ts
index 67619d0e9e00a..70993e84948e4 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/create/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/create/index.ts
@@ -1,4 +1,4 @@
-import { create as execute } from './execute';
 import { employeeCreateDescription as description } from './description';
+import { create as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/get/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/get/index.ts
index 981c65126e799..70a4f62f202d6 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/get/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/get/index.ts
@@ -1,4 +1,4 @@
-import { get as execute } from './execute';
 import { employeeGetDescription as description } from './description';
+import { get as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/getAll/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/getAll/index.ts
index 9ae4d1d2b1a9b..fbd36f52631a8 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/getAll/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/getAll/index.ts
@@ -1,4 +1,4 @@
-import { getAll as execute } from './execute';
 import { employeeGetAllDescription as description } from './description';
+import { getAll as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/index.ts
index 9e685756b716e..f8d2c0f74d956 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/index.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as create from './create';
 import * as get from './get';
 import * as getAll from './getAll';
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/update/description.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/update/description.ts
index 83af844d745c9..ea215bc50967c 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/update/description.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/update/description.ts
@@ -1,5 +1,5 @@
-import type { EmployeeProperties } from '../../Interfaces';
 import { updateEmployeeSharedDescription } from './sharedDescription';
+import type { EmployeeProperties } from '../../Interfaces';
 
 export const employeeUpdateDescription: EmployeeProperties = [
 	{
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/update/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/update/execute.ts
index 76d1bdd56207b..18d56e7424d7e 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/update/execute.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/update/execute.ts
@@ -1,9 +1,8 @@
+import { capitalCase } from 'change-case';
+import moment from 'moment-timezone';
 import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
-import { capitalCase } from 'change-case';
 import { apiRequest } from '../../../transport';
 
 export async function update(
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/update/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/update/index.ts
index 9dd013c5d8383..dd76ebb54ef35 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/update/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/update/index.ts
@@ -1,4 +1,4 @@
-import { update as execute } from './execute';
 import { employeeUpdateDescription as description } from './description';
+import { update as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/del/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/del/index.ts
index 05d70b3f50845..a08a03b2c3c98 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/del/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/del/index.ts
@@ -1,4 +1,4 @@
-import { del as execute } from './execute';
 import { employeeDocumentDelDescription as description } from './description';
+import { del as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/download/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/download/index.ts
index 67f73a986dfc7..8393a452d3d05 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/download/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/download/index.ts
@@ -1,4 +1,4 @@
-import { download as execute } from './execute';
 import { employeeDocumentDownloadDescription as description } from './description';
+import { download as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/getAll/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/getAll/index.ts
index eb6a95a73ec97..a9975d4f50afd 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/getAll/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/getAll/index.ts
@@ -1,4 +1,4 @@
-import { getAll as execute } from './execute';
 import { employeeDocumentGetAllDescription as description } from './description';
+import { getAll as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/index.ts
index 3853a5e9dd9b9..cc211f266fc6c 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/index.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as del from './del';
 import * as download from './download';
 import * as getAll from './getAll';
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/update/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/update/index.ts
index 0c86c7a29aae3..6769e4df26cca 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/update/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/update/index.ts
@@ -1,4 +1,4 @@
-import { update as execute } from './execute';
 import { employeeDocumentUpdateDescription as description } from './description';
+import { update as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/upload/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/upload/index.ts
index 1026bc2d2766d..c8a5e8adf94e3 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/upload/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/upload/index.ts
@@ -1,4 +1,4 @@
-import { upload as execute } from './execute';
 import { employeeDocumentUploadDescription as description } from './description';
+import { upload as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/file/del/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/file/del/index.ts
index 0bef7541b8931..f7dd3961d7267 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/file/del/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/file/del/index.ts
@@ -1,4 +1,4 @@
-import { del as execute } from './execute';
 import { fileDelDescription as description } from './description';
+import { del as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/file/download/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/file/download/index.ts
index 8d736b9e28da4..458af9a0a66db 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/file/download/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/file/download/index.ts
@@ -1,4 +1,4 @@
-import { download as execute } from './execute';
 import { fileDownloadDescription as description } from './description';
+import { download as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/file/getAll/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/file/getAll/index.ts
index ddb484a98c4b1..5de5bb48d8cc8 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/file/getAll/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/file/getAll/index.ts
@@ -1,4 +1,4 @@
-import { getAll as execute } from './execute';
 import { fileGetAllDescription as description } from './description';
+import { getAll as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/file/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/file/index.ts
index d1f8755377176..a267d81861a49 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/file/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/file/index.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as del from './del';
 import * as download from './download';
 import * as getAll from './getAll';
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/file/update/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/file/update/index.ts
index b1621b0679d99..027c26c72e8df 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/file/update/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/file/update/index.ts
@@ -1,4 +1,4 @@
-import { update as execute } from './execute';
 import { fileUpdateDescription as description } from './description';
+import { update as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/file/upload/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/file/upload/index.ts
index 20787c370b06b..294c00031d9ad 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/file/upload/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/file/upload/index.ts
@@ -1,4 +1,4 @@
-import { upload as execute } from './execute';
 import { fileUploadDescription as description } from './description';
+import { upload as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/router.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/router.ts
index 9e8cb85a9ed92..041eb7adb51c1 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/router.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/router.ts
@@ -1,10 +1,9 @@
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 
+import * as companyReport from './companyReport';
 import * as employee from './employee';
 import * as employeeDocument from './employeeDocument';
 import * as file from './file';
-import * as companyReport from './companyReport';
-
 import type { BambooHr } from './Interfaces';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[]> {
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/versionDescription.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/versionDescription.ts
index 213599b61467c..88a79226de9e5 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/versionDescription.ts
@@ -1,10 +1,10 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import { NodeConnectionType, type INodeTypeDescription } from 'n8n-workflow';
 
-import * as file from './file';
+import * as companyReport from './companyReport';
 import * as employee from './employee';
 import * as employeeDocument from './employeeDocument';
-import * as companyReport from './companyReport';
+import * as file from './file';
 
 export const versionDescription: INodeTypeDescription = {
 	credentials: [
diff --git a/packages/nodes-base/nodes/BambooHr/v1/transport/index.ts b/packages/nodes-base/nodes/BambooHr/v1/transport/index.ts
index 1a993e98c9bc9..657d7dec4ebbe 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/transport/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/transport/index.ts
@@ -53,7 +53,6 @@ export async function apiRequest(
 	}
 
 	try {
-		//@ts-ignore
 		return await this.helpers.request(options);
 	} catch (error) {
 		const description = error?.response?.headers['x-bamboohr-error-messsage'] || '';
diff --git a/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.ts b/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.ts
index 586fed329c8a7..d82c565d62fcb 100644
--- a/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.ts
+++ b/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.ts
@@ -10,9 +10,7 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { bannerbearApiRequest, keysToSnakeCase } from './GenericFunctions';
-
 import { imageFields, imageOperations } from './ImageDescription';
-
 import { templateFields, templateOperations } from './TemplateDescription';
 
 export class Bannerbear implements INodeType {
diff --git a/packages/nodes-base/nodes/Bannerbear/GenericFunctions.ts b/packages/nodes-base/nodes/Bannerbear/GenericFunctions.ts
index 0e48b58d83a9f..1c8a313201edb 100644
--- a/packages/nodes-base/nodes/Bannerbear/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Bannerbear/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import { snakeCase } from 'change-case';
 import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
@@ -10,8 +11,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
-
 export async function bannerbearApiRequest(
 	this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions,
 	method: IHttpRequestMethods,
diff --git a/packages/nodes-base/nodes/Baserow/Baserow.node.ts b/packages/nodes-base/nodes/Baserow/Baserow.node.ts
index bb378a97daf66..7f58cf00b1af9 100644
--- a/packages/nodes-base/nodes/Baserow/Baserow.node.ts
+++ b/packages/nodes-base/nodes/Baserow/Baserow.node.ts
@@ -15,9 +15,7 @@ import {
 	TableFieldMapper,
 	toOptions,
 } from './GenericFunctions';
-
 import { operationFields } from './OperationDescription';
-
 import type {
 	BaserowCredentials,
 	FieldsUiValues,
diff --git a/packages/nodes-base/nodes/Beeminder/Beeminder.node.ts b/packages/nodes-base/nodes/Beeminder/Beeminder.node.ts
index 751bb19fc083c..e35e652c4f9f0 100644
--- a/packages/nodes-base/nodes/Beeminder/Beeminder.node.ts
+++ b/packages/nodes-base/nodes/Beeminder/Beeminder.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import {
 	type IExecuteFunctions,
 	type IDataObject,
@@ -10,14 +11,12 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import {
 	createDatapoint,
 	deleteDatapoint,
 	getAllDatapoints,
 	updateDatapoint,
 } from './Beeminder.node.functions';
-
 import { beeminderApiRequest } from './GenericFunctions';
 
 export class Beeminder implements INodeType {
diff --git a/packages/nodes-base/nodes/Bitly/Bitly.node.ts b/packages/nodes-base/nodes/Bitly/Bitly.node.ts
index 3a62d5f07206e..5b376e0b2f4db 100644
--- a/packages/nodes-base/nodes/Bitly/Bitly.node.ts
+++ b/packages/nodes-base/nodes/Bitly/Bitly.node.ts
@@ -9,9 +9,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { linkFields, linkOperations } from './LinkDescription';
-
 import { bitlyApiRequest, bitlyApiRequestAllItems } from './GenericFunctions';
+import { linkFields, linkOperations } from './LinkDescription';
 
 export class Bitly implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts b/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts
index eaea3c48c698a..c86ee2b58dae0 100644
--- a/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts
+++ b/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts
@@ -1,3 +1,6 @@
+import isEmpty from 'lodash/isEmpty';
+import partialRight from 'lodash/partialRight';
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -6,33 +9,26 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-
-import isEmpty from 'lodash/isEmpty';
-import partialRight from 'lodash/partialRight';
-import {
-	bitwardenApiRequest as tokenlessBitwardenApiRequest,
-	getAccessToken,
-	handleGetAll as tokenlessHandleGetAll,
-	loadResource,
-} from './GenericFunctions';
 
 import type { CollectionUpdateFields } from './descriptions/CollectionDescription';
 import { collectionFields, collectionOperations } from './descriptions/CollectionDescription';
-
 import { eventFields, eventOperations } from './descriptions/EventDescription';
-
 import type {
 	GroupCreationAdditionalFields,
 	GroupUpdateFields,
 } from './descriptions/GroupDescription';
 import { groupFields, groupOperations } from './descriptions/GroupDescription';
-
 import type {
 	MemberCreationAdditionalFields,
 	MemberUpdateFields,
 } from './descriptions/MemberDescription';
 import { memberFields, memberOperations } from './descriptions/MemberDescription';
+import {
+	bitwardenApiRequest as tokenlessBitwardenApiRequest,
+	getAccessToken,
+	handleGetAll as tokenlessHandleGetAll,
+	loadResource,
+} from './GenericFunctions';
 
 export class Bitwarden implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Box/Box.node.ts b/packages/nodes-base/nodes/Box/Box.node.ts
index 3d9e71e3efd5c..d737405673356 100644
--- a/packages/nodes-base/nodes/Box/Box.node.ts
+++ b/packages/nodes-base/nodes/Box/Box.node.ts
@@ -1,3 +1,5 @@
+import { noCase } from 'change-case';
+import moment from 'moment-timezone';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -7,13 +9,9 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-import { noCase } from 'change-case';
-import { boxApiRequest, boxApiRequestAllItems } from './GenericFunctions';
-
 import { fileFields, fileOperations } from './FileDescription';
-
 import { folderFields, folderOperations } from './FolderDescription';
+import { boxApiRequest, boxApiRequestAllItems } from './GenericFunctions';
 
 export class Box implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Box/GenericFunctions.ts b/packages/nodes-base/nodes/Box/GenericFunctions.ts
index f768a217656b7..759a8140c3a31 100644
--- a/packages/nodes-base/nodes/Box/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Box/GenericFunctions.ts
@@ -41,7 +41,6 @@ export async function boxApiRequest(
 			includeCredentialsOnRefreshOnBody: true,
 		};
 
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'boxOAuth2Api', options, oAuth2Options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/Brevo/AttributeDescription.ts b/packages/nodes-base/nodes/Brevo/AttributeDescription.ts
index f51efa0579866..0a5a2f4f80ecb 100644
--- a/packages/nodes-base/nodes/Brevo/AttributeDescription.ts
+++ b/packages/nodes-base/nodes/Brevo/AttributeDescription.ts
@@ -4,6 +4,7 @@ import type {
 	INodeProperties,
 	JsonObject,
 } from 'n8n-workflow';
+
 import { BrevoNode } from './GenericFunctions';
 
 export const attributeOperations: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/Brevo/Brevo.node.ts b/packages/nodes-base/nodes/Brevo/Brevo.node.ts
index e1e22ff46f5d0..d201d53529f0f 100644
--- a/packages/nodes-base/nodes/Brevo/Brevo.node.ts
+++ b/packages/nodes-base/nodes/Brevo/Brevo.node.ts
@@ -1,6 +1,7 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import type { INodeType, INodeTypeDescription } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
+
 import { attributeFields, attributeOperations } from './AttributeDescription';
 import { contactFields, contactOperations } from './ContactDescription';
 import { emailFields, emailOperations } from './EmailDescription';
diff --git a/packages/nodes-base/nodes/Brevo/BrevoTrigger.node.ts b/packages/nodes-base/nodes/Brevo/BrevoTrigger.node.ts
index 4e2a480291c8b..35b86f4415a09 100644
--- a/packages/nodes-base/nodes/Brevo/BrevoTrigger.node.ts
+++ b/packages/nodes-base/nodes/Brevo/BrevoTrigger.node.ts
@@ -7,6 +7,7 @@ import {
 	type IWebhookFunctions,
 	type IWebhookResponseData,
 } from 'n8n-workflow';
+
 import { BrevoWebhookApi } from './GenericFunctions';
 
 export class BrevoTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Brevo/EmailDescription.ts b/packages/nodes-base/nodes/Brevo/EmailDescription.ts
index 63fda3ab10515..0a73a1a67cdf5 100644
--- a/packages/nodes-base/nodes/Brevo/EmailDescription.ts
+++ b/packages/nodes-base/nodes/Brevo/EmailDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { BrevoNode } from './GenericFunctions';
 
 export const emailOperations: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/Bubble/Bubble.node.ts b/packages/nodes-base/nodes/Bubble/Bubble.node.ts
index d63c9802668ae..70641ac106512 100644
--- a/packages/nodes-base/nodes/Bubble/Bubble.node.ts
+++ b/packages/nodes-base/nodes/Bubble/Bubble.node.ts
@@ -8,7 +8,6 @@ import type {
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
 import { bubbleApiRequest, bubbleApiRequestAllItems, validateJSON } from './GenericFunctions';
-
 import { objectFields, objectOperations } from './ObjectDescription';
 
 export class Bubble implements INodeType {
diff --git a/packages/nodes-base/nodes/Bubble/GenericFunctions.ts b/packages/nodes-base/nodes/Bubble/GenericFunctions.ts
index 46927492e96b6..7c05b8622727a 100644
--- a/packages/nodes-base/nodes/Bubble/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Bubble/GenericFunctions.ts
@@ -19,15 +19,13 @@ export async function bubbleApiRequest(
 	body: IDataObject,
 	qs: IDataObject,
 ) {
-	const { apiToken, appName, domain, environment, hosting } = (await this.getCredentials(
-		'bubbleApi',
-	)) as {
+	const { apiToken, appName, domain, environment, hosting } = await this.getCredentials<{
 		apiToken: string;
 		appName: string;
 		domain: string;
 		environment: 'development' | 'live';
 		hosting: 'bubbleHosted' | 'selfHosted';
-	};
+	}>('bubbleApi');
 
 	const rootUrl = hosting === 'bubbleHosted' ? `https://${appName}.bubbleapps.io` : domain;
 	const urlSegment = environment === 'development' ? '/version-test/api/1.1' : '/api/1.1';
diff --git a/packages/nodes-base/nodes/CircleCi/CircleCi.node.ts b/packages/nodes-base/nodes/CircleCi/CircleCi.node.ts
index 37b051d7ecf87..12ef42d73f79c 100644
--- a/packages/nodes-base/nodes/CircleCi/CircleCi.node.ts
+++ b/packages/nodes-base/nodes/CircleCi/CircleCi.node.ts
@@ -7,9 +7,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { pipelineFields, pipelineOperations } from './PipelineDescription';
-
 import { circleciApiRequest, circleciApiRequestAllItems } from './GenericFunctions';
+import { pipelineFields, pipelineOperations } from './PipelineDescription';
 
 export class CircleCi implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Cisco/Webex/CiscoWebex.node.ts b/packages/nodes-base/nodes/Cisco/Webex/CiscoWebex.node.ts
index 0d9aad5bfd53f..39a6140837467 100644
--- a/packages/nodes-base/nodes/Cisco/Webex/CiscoWebex.node.ts
+++ b/packages/nodes-base/nodes/Cisco/Webex/CiscoWebex.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -9,9 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-import { getAttachments, webexApiRequest, webexApiRequestAllItems } from './GenericFunctions';
-
 import {
 	meetingFields,
 	meetingOperations,
@@ -20,6 +18,7 @@ import {
 	messageFields,
 	messageOperations,
 } from './descriptions';
+import { getAttachments, webexApiRequest, webexApiRequestAllItems } from './GenericFunctions';
 
 export class CiscoWebex implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts b/packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts
index 88d20374308b0..2ddf4d950795f 100644
--- a/packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts
@@ -1,5 +1,5 @@
 import { createHash } from 'crypto';
-
+import upperFirst from 'lodash/upperFirst';
 import type {
 	ICredentialDataDecryptedObject,
 	IDataObject,
@@ -14,8 +14,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import upperFirst from 'lodash/upperFirst';
-
 export async function webexApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions | IWebhookFunctions,
 	method: IHttpRequestMethods,
@@ -43,7 +41,6 @@ export async function webexApiRequest(
 		if (Object.keys(qs).length === 0) {
 			delete options.qs;
 		}
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'ciscoWebexOAuth2Api', options, {
 			tokenType: 'Bearer',
 		});
diff --git a/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts b/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts
index f8e72c75b3928..685ac62fc2004 100644
--- a/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts
+++ b/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts
@@ -7,10 +7,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { clearbitApiRequest } from './GenericFunctions';
-
 import { companyFields, companyOperations } from './CompanyDescription';
-
+import { clearbitApiRequest } from './GenericFunctions';
 import { personFields, personOperations } from './PersonDescription';
 
 export class Clearbit implements INodeType {
diff --git a/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts b/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts
index 2e524be59a763..952bd4956f179 100644
--- a/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts
+++ b/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,46 +10,24 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-import { clickupApiRequest, clickupApiRequestAllItems, validateJSON } from './GenericFunctions';
-
 import { checklistFields, checklistOperations } from './ChecklistDescription';
-
 import { checklistItemFields, checklistItemOperations } from './ChecklistItemDescription';
-
 import { commentFields, commentOperations } from './CommentDescription';
-
 import { folderFields, folderOperations } from './FolderDescription';
-
+import { clickupApiRequest, clickupApiRequestAllItems, validateJSON } from './GenericFunctions';
 import { goalFields, goalOperations } from './GoalDescription';
-
 import { goalKeyResultFields, goalKeyResultOperations } from './GoalKeyResultDescription';
-
-// import {
-// 	guestFields,
-// 	guestOperations,
-// } from './guestDescription';
-
+import { listFields, listOperations } from './ListDescription';
+import type { IList } from './ListInterface';
+import { spaceTagFields, spaceTagOperations } from './SpaceTagDescription';
+import { taskDependencyFields, taskDependencyOperations } from './TaskDependencyDescription';
 import { taskFields, taskOperations } from './TaskDescription';
-
+import type { ITask } from './TaskInterface';
 import { taskListFields, taskListOperations } from './TaskListDescription';
-
 import { taskTagFields, taskTagOperations } from './TaskTagDescription';
-
-import { spaceTagFields, spaceTagOperations } from './SpaceTagDescription';
-
-import { taskDependencyFields, taskDependencyOperations } from './TaskDependencyDescription';
-
 import { timeEntryFields, timeEntryOperations } from './TimeEntryDescription';
-
 import { timeEntryTagFields, timeEntryTagOperations } from './TimeEntryTagDescription';
 
-import { listFields, listOperations } from './ListDescription';
-
-import type { ITask } from './TaskInterface';
-
-import type { IList } from './ListInterface';
-
 export class ClickUp implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'ClickUp',
diff --git a/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts b/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts
index 21974d6a08293..f816ff1843787 100644
--- a/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts
@@ -42,7 +42,6 @@ export async function clickupApiRequest(
 				keepBearer: false,
 				tokenType: 'Bearer',
 			};
-			// @ts-ignore
 			return await this.helpers.requestOAuth2.call(
 				this,
 				'clickUpOAuth2Api',
diff --git a/packages/nodes-base/nodes/Clockify/Clockify.node.ts b/packages/nodes-base/nodes/Clockify/Clockify.node.ts
index 8f5456dd67096..9723dfa025bc7 100644
--- a/packages/nodes-base/nodes/Clockify/Clockify.node.ts
+++ b/packages/nodes-base/nodes/Clockify/Clockify.node.ts
@@ -1,3 +1,5 @@
+import moment from 'moment-timezone';
+import { NodeConnectionType } from 'n8n-workflow';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -7,29 +9,17 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeConnectionType } from 'n8n-workflow';
-
-import moment from 'moment-timezone';
-import { clockifyApiRequest, clockifyApiRequestAllItems } from './GenericFunctions';
-
-import type { IClientDto, IWorkspaceDto } from './WorkpaceInterfaces';
-
-import type { IUserDto } from './UserDtos';
-
-import type { IProjectDto } from './ProjectInterfaces';
 
 import { clientFields, clientOperations } from './ClientDescription';
-
+import { clockifyApiRequest, clockifyApiRequestAllItems } from './GenericFunctions';
 import { projectFields, projectOperations } from './ProjectDescription';
-
+import type { IProjectDto } from './ProjectInterfaces';
 import { tagFields, tagOperations } from './TagDescription';
-
 import { taskFields, taskOperations } from './TaskDescription';
-
 import { timeEntryFields, timeEntryOperations } from './TimeEntryDescription';
-
 import { userFields, userOperations } from './UserDescription';
-
+import type { IUserDto } from './UserDtos';
+import type { IClientDto, IWorkspaceDto } from './WorkpaceInterfaces';
 import { workspaceFields, workspaceOperations } from './WorkspaceDescription';
 
 export class Clockify implements INodeType {
diff --git a/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts b/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts
index cbca70f49c384..a7ea51f512579 100644
--- a/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts
+++ b/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts
@@ -1,5 +1,4 @@
 import moment from 'moment-timezone';
-
 import type {
 	IPollFunctions,
 	IDataObject,
@@ -11,9 +10,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { clockifyApiRequest } from './GenericFunctions';
-
 import { EntryTypeEnum } from './EntryTypeEnum';
+import { clockifyApiRequest } from './GenericFunctions';
 import type { IUserDto } from './UserDtos';
 import type { IWorkspaceDto } from './WorkpaceInterfaces';
 
diff --git a/packages/nodes-base/nodes/Clockify/UserDtos.ts b/packages/nodes-base/nodes/Clockify/UserDtos.ts
index 6365b057dfaeb..e482e47030e4d 100644
--- a/packages/nodes-base/nodes/Clockify/UserDtos.ts
+++ b/packages/nodes-base/nodes/Clockify/UserDtos.ts
@@ -1,4 +1,5 @@
 import type { IDataObject } from 'n8n-workflow';
+
 import type { IMembershipDto } from './CommonDtos';
 
 const enum UserStatusEnum {
diff --git a/packages/nodes-base/nodes/Cloudflare/Cloudflare.node.ts b/packages/nodes-base/nodes/Cloudflare/Cloudflare.node.ts
index 93acdb0e5275f..bd9050029c9de 100644
--- a/packages/nodes-base/nodes/Cloudflare/Cloudflare.node.ts
+++ b/packages/nodes-base/nodes/Cloudflare/Cloudflare.node.ts
@@ -10,7 +10,6 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { cloudflareApiRequest, cloudflareApiRequestAllItems } from './GenericFunctions';
-
 import { zoneCertificateFields, zoneCertificateOperations } from './ZoneCertificateDescription';
 
 export class Cloudflare implements INodeType {
diff --git a/packages/nodes-base/nodes/Cockpit/Cockpit.node.ts b/packages/nodes-base/nodes/Cockpit/Cockpit.node.ts
index fedf9c4204548..f279f1d099d1b 100644
--- a/packages/nodes-base/nodes/Cockpit/Cockpit.node.ts
+++ b/packages/nodes-base/nodes/Cockpit/Cockpit.node.ts
@@ -8,6 +8,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
+
 import { collectionFields, collectionOperations } from './CollectionDescription';
 import {
 	createCollectionEntry,
diff --git a/packages/nodes-base/nodes/Cockpit/CollectionFunctions.ts b/packages/nodes-base/nodes/Cockpit/CollectionFunctions.ts
index 07955905f2dd5..15be38653a9b3 100644
--- a/packages/nodes-base/nodes/Cockpit/CollectionFunctions.ts
+++ b/packages/nodes-base/nodes/Cockpit/CollectionFunctions.ts
@@ -1,5 +1,6 @@
 import type { IExecuteFunctions, ILoadOptionsFunctions, IDataObject } from 'n8n-workflow';
 import { jsonParse } from 'n8n-workflow';
+
 import type { ICollection } from './CollectionInterface';
 import { cockpitApiRequest } from './GenericFunctions';
 
diff --git a/packages/nodes-base/nodes/Cockpit/FormFunctions.ts b/packages/nodes-base/nodes/Cockpit/FormFunctions.ts
index 1b48287439b68..318a73901e1ed 100644
--- a/packages/nodes-base/nodes/Cockpit/FormFunctions.ts
+++ b/packages/nodes-base/nodes/Cockpit/FormFunctions.ts
@@ -1,4 +1,5 @@
 import type { IExecuteFunctions, ILoadOptionsFunctions, IDataObject } from 'n8n-workflow';
+
 import type { IForm } from './FormInterface';
 import { cockpitApiRequest } from './GenericFunctions';
 
diff --git a/packages/nodes-base/nodes/Cockpit/SingletonFunctions.ts b/packages/nodes-base/nodes/Cockpit/SingletonFunctions.ts
index 464f1f2bad5bb..cb2536ef11cb3 100644
--- a/packages/nodes-base/nodes/Cockpit/SingletonFunctions.ts
+++ b/packages/nodes-base/nodes/Cockpit/SingletonFunctions.ts
@@ -1,4 +1,5 @@
 import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-workflow';
+
 import { cockpitApiRequest } from './GenericFunctions';
 
 export async function getSingleton(
diff --git a/packages/nodes-base/nodes/Coda/Coda.node.ts b/packages/nodes-base/nodes/Coda/Coda.node.ts
index fd0da7dcf05a1..94ca3050c8953 100644
--- a/packages/nodes-base/nodes/Coda/Coda.node.ts
+++ b/packages/nodes-base/nodes/Coda/Coda.node.ts
@@ -9,10 +9,11 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeApiError } from 'n8n-workflow';
+
+import { controlFields, controlOperations } from './ControlDescription';
+import { formulaFields, formulaOperations } from './FormulaDescription';
 import { codaApiRequest, codaApiRequestAllItems } from './GenericFunctions';
 import { tableFields, tableOperations } from './TableDescription';
-import { formulaFields, formulaOperations } from './FormulaDescription';
-import { controlFields, controlOperations } from './ControlDescription';
 import { viewFields, viewOperations } from './ViewDescription';
 
 export class Coda implements INodeType {
diff --git a/packages/nodes-base/nodes/Coda/GenericFunctions.ts b/packages/nodes-base/nodes/Coda/GenericFunctions.ts
index b889e7dafa063..25e1aaa8df09a 100644
--- a/packages/nodes-base/nodes/Coda/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Coda/GenericFunctions.ts
@@ -67,7 +67,6 @@ export async function codaApiRequestAllItems(
 	do {
 		responseData = await codaApiRequest.call(this, method, resource, body, query, uri);
 		uri = responseData.nextPageLink;
-		// @ts-ignore
 		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.nextPageLink !== undefined && responseData.nextPageLink !== '');
 
diff --git a/packages/nodes-base/nodes/Code/JavaScriptSandbox.ts b/packages/nodes-base/nodes/Code/JavaScriptSandbox.ts
index 73f5ba7f758de..449be97a124a1 100644
--- a/packages/nodes-base/nodes/Code/JavaScriptSandbox.ts
+++ b/packages/nodes-base/nodes/Code/JavaScriptSandbox.ts
@@ -1,15 +1,15 @@
 import { NodeVM, makeResolverFromLegacyOptions, type Resolver } from '@n8n/vm2';
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 
-import { ValidationError } from './ValidationError';
 import { ExecutionError } from './ExecutionError';
-import type { SandboxContext } from './Sandbox';
-import { Sandbox } from './Sandbox';
 import {
 	mapItemNotDefinedErrorIfNeededForRunForEach,
 	mapItemsNotDefinedErrorIfNeededForRunForAll,
 	validateNoDisallowedMethodsInRunForEach,
 } from './JsCodeValidator';
+import type { SandboxContext } from './Sandbox';
+import { Sandbox } from './Sandbox';
+import { ValidationError } from './ValidationError';
 
 const { NODE_FUNCTION_ALLOW_BUILTIN: builtIn, NODE_FUNCTION_ALLOW_EXTERNAL: external } =
 	process.env;
diff --git a/packages/nodes-base/nodes/Code/PythonSandbox.ts b/packages/nodes-base/nodes/Code/PythonSandbox.ts
index 365f213500e2a..6491b7d085ed0 100644
--- a/packages/nodes-base/nodes/Code/PythonSandbox.ts
+++ b/packages/nodes-base/nodes/Code/PythonSandbox.ts
@@ -1,5 +1,6 @@
 import { ApplicationError, type IExecuteFunctions, type INodeExecutionData } from 'n8n-workflow';
 import type { PyDict } from 'pyodide/ffi';
+
 import { LoadPyodide } from './Pyodide';
 import type { SandboxContext } from './Sandbox';
 import { Sandbox } from './Sandbox';
diff --git a/packages/nodes-base/nodes/Code/test/Code.node.test.ts b/packages/nodes-base/nodes/Code/test/Code.node.test.ts
index 3f1ed0eccfdc7..486b6b673d0e4 100644
--- a/packages/nodes-base/nodes/Code/test/Code.node.test.ts
+++ b/packages/nodes-base/nodes/Code/test/Code.node.test.ts
@@ -1,11 +1,13 @@
-import { anyNumber, mock } from 'jest-mock-extended';
 import { NodeVM } from '@n8n/vm2';
+import { anyNumber, mock } from 'jest-mock-extended';
+import { normalizeItems } from 'n8n-core';
 import type { IExecuteFunctions, IWorkflowDataProxyData } from 'n8n-workflow';
 import { ApplicationError } from 'n8n-workflow';
-import { normalizeItems } from 'n8n-core';
+
+import { testWorkflows, getWorkflowFilenames, initBinaryDataService } from '@test/nodes/Helpers';
+
 import { Code } from '../Code.node';
 import { ValidationError } from '../ValidationError';
-import { testWorkflows, getWorkflowFilenames, initBinaryDataService } from '@test/nodes/Helpers';
 
 describe('Test Code Node', () => {
 	const workflows = getWorkflowFilenames(__dirname);
diff --git a/packages/nodes-base/nodes/Code/test/utils.test.ts b/packages/nodes-base/nodes/Code/test/utils.test.ts
index b622c86661434..437d8b443b939 100644
--- a/packages/nodes-base/nodes/Code/test/utils.test.ts
+++ b/packages/nodes-base/nodes/Code/test/utils.test.ts
@@ -1,5 +1,6 @@
 import type { INodeExecutionData } from 'n8n-workflow';
 import { NodeExecutionOutput } from 'n8n-workflow';
+
 import { addPostExecutionWarning } from '../utils';
 
 describe('addPostExecutionWarning', () => {
diff --git a/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.ts b/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.ts
index e31c84194be17..eac35239d23f3 100644
--- a/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.ts
+++ b/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,11 +10,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import { coinFields, coinOperations } from './CoinDescription';
-
 import { eventFields, eventOperations } from './EventDescription';
-
 import { coinGeckoApiRequest, coinGeckoRequestAllItems } from './GenericFunctions';
 
 export class CoinGecko implements INodeType {
diff --git a/packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts b/packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts
index 141ed62851816..ff20558d2694f 100644
--- a/packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts
@@ -37,7 +37,6 @@ export async function coinGeckoApiRequest(
 			delete options.body;
 		}
 
-		//@ts-ignore
 		return await this.helpers.request.call(this, options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.ts b/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.ts
index 87b0c88c72ecc..0e1eab0b7a781 100644
--- a/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.ts
+++ b/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.ts
@@ -6,6 +6,7 @@ import {
 	type INodeTypeDescription,
 	NodeConnectionType,
 } from 'n8n-workflow';
+
 import {
 	checkInput,
 	checkInputAndThrowError,
diff --git a/packages/nodes-base/nodes/CompareDatasets/GenericFunctions.ts b/packages/nodes-base/nodes/CompareDatasets/GenericFunctions.ts
index f8d707e3ce0c0..12fa1a447aff4 100644
--- a/packages/nodes-base/nodes/CompareDatasets/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/CompareDatasets/GenericFunctions.ts
@@ -1,14 +1,14 @@
-import { ApplicationError, type IDataObject, type INodeExecutionData } from 'n8n-workflow';
-
+import { cloneDeep } from 'lodash';
 import difference from 'lodash/difference';
 import get from 'lodash/get';
 import intersection from 'lodash/intersection';
 import isEmpty from 'lodash/isEmpty';
 import omit from 'lodash/omit';
-import unset from 'lodash/unset';
-import { cloneDeep } from 'lodash';
 import set from 'lodash/set';
 import union from 'lodash/union';
+import unset from 'lodash/unset';
+import { ApplicationError, type IDataObject, type INodeExecutionData } from 'n8n-workflow';
+
 import { fuzzyCompare, preparePairedItemDataArray } from '@utils/utilities';
 
 type PairToMatch = {
diff --git a/packages/nodes-base/nodes/CompareDatasets/test/utils/utils.test.ts b/packages/nodes-base/nodes/CompareDatasets/test/utils/utils.test.ts
index 6af3b2f294b5b..4d10178726436 100644
--- a/packages/nodes-base/nodes/CompareDatasets/test/utils/utils.test.ts
+++ b/packages/nodes-base/nodes/CompareDatasets/test/utils/utils.test.ts
@@ -1,4 +1,5 @@
 import type { INodeExecutionData } from 'n8n-workflow';
+
 import { checkInput } from '../../GenericFunctions';
 
 describe('Test Compare Datasets Node utils', () => {
diff --git a/packages/nodes-base/nodes/Compression/Compression.node.ts b/packages/nodes-base/nodes/Compression/Compression.node.ts
index 4f816cbbae860..1ecf7edb4e807 100644
--- a/packages/nodes-base/nodes/Compression/Compression.node.ts
+++ b/packages/nodes-base/nodes/Compression/Compression.node.ts
@@ -1,4 +1,5 @@
-import { promisify } from 'util';
+import * as fflate from 'fflate';
+import * as mime from 'mime-types';
 import {
 	NodeConnectionType,
 	type IBinaryKeyData,
@@ -7,16 +8,13 @@ import {
 	type INodeType,
 	type INodeTypeDescription,
 } from 'n8n-workflow';
-
-import * as fflate from 'fflate';
+import { promisify } from 'util';
 
 const gunzip = promisify(fflate.gunzip);
 const gzip = promisify(fflate.gzip);
 const unzip = promisify(fflate.unzip);
 const zip = promisify(fflate.zip);
 
-import * as mime from 'mime-types';
-
 const ALREADY_COMPRESSED = [
 	'7z',
 	'aifc',
diff --git a/packages/nodes-base/nodes/Compression/test/node/Compression.test.ts b/packages/nodes-base/nodes/Compression/test/node/Compression.test.ts
index 65833677c740b..a83d793ebab9f 100644
--- a/packages/nodes-base/nodes/Compression/test/node/Compression.test.ts
+++ b/packages/nodes-base/nodes/Compression/test/node/Compression.test.ts
@@ -1,16 +1,16 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
-import path from 'path';
-import os from 'node:os';
 import type { IDataObject } from 'n8n-workflow';
-import type { WorkflowTestData } from '@test/nodes/types';
+import os from 'node:os';
+import path from 'path';
 
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import {
 	getResultNodeData,
 	setup,
 	initBinaryDataService,
 	readJsonFileSync,
 } from '@test/nodes/Helpers';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+import type { WorkflowTestData } from '@test/nodes/types';
 
 if (os.platform() !== 'win32') {
 	describe('Execute Compression Node', () => {
diff --git a/packages/nodes-base/nodes/Contentful/Contentful.node.ts b/packages/nodes-base/nodes/Contentful/Contentful.node.ts
index c666ec83c28a5..a70e96021d7c5 100644
--- a/packages/nodes-base/nodes/Contentful/Contentful.node.ts
+++ b/packages/nodes-base/nodes/Contentful/Contentful.node.ts
@@ -7,13 +7,12 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { contentfulApiRequestAllItems, contentfulApiRequest } from './GenericFunctions';
-
-import * as SpaceDescription from './SpaceDescription';
+import * as AssetDescription from './AssetDescription';
 import * as ContentTypeDescription from './ContentTypeDescription';
 import * as EntryDescription from './EntryDescription';
-import * as AssetDescription from './AssetDescription';
+import { contentfulApiRequestAllItems, contentfulApiRequest } from './GenericFunctions';
 import * as LocaleDescription from './LocaleDescription';
+import * as SpaceDescription from './SpaceDescription';
 
 export class Contentful implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts b/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts
index a19911ae74910..7f335f9791e6e 100644
--- a/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts
+++ b/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts
@@ -9,16 +9,11 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { convertKitApiRequest } from './GenericFunctions';
-
 import { customFieldFields, customFieldOperations } from './CustomFieldDescription';
-
 import { formFields, formOperations } from './FormDescription';
-
+import { convertKitApiRequest } from './GenericFunctions';
 import { sequenceFields, sequenceOperations } from './SequenceDescription';
-
 import { tagFields, tagOperations } from './TagDescription';
-
 import { tagSubscriberFields, tagSubscriberOperations } from './TagSubscriberDescription';
 
 export class ConvertKit implements INodeType {
diff --git a/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.ts b/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.ts
index 9c3441fd86306..95161748d60bf 100644
--- a/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.ts
+++ b/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.ts
@@ -1,3 +1,4 @@
+import { snakeCase } from 'change-case';
 import type {
 	IHookFunctions,
 	IWebhookFunctions,
@@ -10,7 +11,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
 import { convertKitApiRequest } from './GenericFunctions';
 
 export class ConvertKitTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Copper/Copper.node.ts b/packages/nodes-base/nodes/Copper/Copper.node.ts
index 05274dd4536d0..ecabe2aa4a407 100644
--- a/packages/nodes-base/nodes/Copper/Copper.node.ts
+++ b/packages/nodes-base/nodes/Copper/Copper.node.ts
@@ -7,15 +7,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import {
-	adjustCompanyFields,
-	adjustLeadFields,
-	adjustPersonFields,
-	adjustTaskFields,
-	copperApiRequest,
-	handleListing,
-} from './GenericFunctions';
-
 import {
 	companyFields,
 	companyOperations,
@@ -34,6 +25,14 @@ import {
 	userFields,
 	userOperations,
 } from './descriptions';
+import {
+	adjustCompanyFields,
+	adjustLeadFields,
+	adjustPersonFields,
+	adjustTaskFields,
+	copperApiRequest,
+	handleListing,
+} from './GenericFunctions';
 
 export class Copper implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Copper/GenericFunctions.ts b/packages/nodes-base/nodes/Copper/GenericFunctions.ts
index 3137471c2e3e3..bfab720a1e375 100644
--- a/packages/nodes-base/nodes/Copper/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Copper/GenericFunctions.ts
@@ -1,5 +1,6 @@
 import { createHash } from 'crypto';
-
+import flow from 'lodash/flow';
+import omit from 'lodash/omit';
 import type {
 	ICredentialDataDecryptedObject,
 	IDataObject,
@@ -13,9 +14,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import flow from 'lodash/flow';
-import omit from 'lodash/omit';
-
 import type {
 	AddressFixedCollection,
 	EmailFixedCollection,
diff --git a/packages/nodes-base/nodes/Copper/descriptions/CompanyDescription.ts b/packages/nodes-base/nodes/Copper/descriptions/CompanyDescription.ts
index 0acd63e83e3bf..2a0f94e40ff09 100644
--- a/packages/nodes-base/nodes/Copper/descriptions/CompanyDescription.ts
+++ b/packages/nodes-base/nodes/Copper/descriptions/CompanyDescription.ts
@@ -1,8 +1,9 @@
 import type { INodeProperties } from 'n8n-workflow';
 
-import { addressFixedCollection, phoneNumbersFixedCollection } from '../utils/sharedFields';
 import { isoCountryCodes } from '@utils/ISOCountryCodes';
 
+import { addressFixedCollection, phoneNumbersFixedCollection } from '../utils/sharedFields';
+
 export const companyOperations: INodeProperties[] = [
 	{
 		displayName: 'Operation',
diff --git a/packages/nodes-base/nodes/Cortex/Cortex.node.ts b/packages/nodes-base/nodes/Cortex/Cortex.node.ts
index 39bfff623c28a..2b2e59311d530 100644
--- a/packages/nodes-base/nodes/Cortex/Cortex.node.ts
+++ b/packages/nodes-base/nodes/Cortex/Cortex.node.ts
@@ -1,4 +1,6 @@
+import * as changeCase from 'change-case';
 import { createHash } from 'crypto';
+import upperFirst from 'lodash/upperFirst';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -9,17 +11,12 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
-import upperFirst from 'lodash/upperFirst';
-import * as changeCase from 'change-case';
-import { cortexApiRequest, getEntityLabel, prepareParameters, splitTags } from './GenericFunctions';
 
 import { analyzerFields, analyzersOperations } from './AnalyzerDescriptions';
-
-import { responderFields, respondersOperations } from './ResponderDescription';
-
-import { jobFields, jobOperations } from './JobDescription';
-
 import type { IJob } from './AnalyzerInterface';
+import { cortexApiRequest, getEntityLabel, prepareParameters, splitTags } from './GenericFunctions';
+import { jobFields, jobOperations } from './JobDescription';
+import { responderFields, respondersOperations } from './ResponderDescription';
 
 export class Cortex implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Cortex/GenericFunctions.ts b/packages/nodes-base/nodes/Cortex/GenericFunctions.ts
index 45f4105a10fff..dd074e2976f7f 100644
--- a/packages/nodes-base/nodes/Cortex/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Cortex/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -7,8 +8,6 @@ import type {
 	IRequestOptions,
 } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
 export async function cortexApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	method: IHttpRequestMethods,
diff --git a/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts b/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
index a489093425067..1aba92bf30cfc 100644
--- a/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
+++ b/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
@@ -5,8 +5,8 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-
 import pgPromise from 'pg-promise';
+
 import {
 	generateReturning,
 	getItemCopy,
diff --git a/packages/nodes-base/nodes/CrowdDev/CrowdDev.node.ts b/packages/nodes-base/nodes/CrowdDev/CrowdDev.node.ts
index f8d94fceaf2df..bcea2f2b7ee6e 100644
--- a/packages/nodes-base/nodes/CrowdDev/CrowdDev.node.ts
+++ b/packages/nodes-base/nodes/CrowdDev/CrowdDev.node.ts
@@ -1,5 +1,6 @@
 import type { INodeType, INodeTypeDescription } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
+
 import { allProperties } from './descriptions';
 
 export class CrowdDev implements INodeType {
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/activityFields.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/activityFields.ts
index f7fe7c2050b7b..9ca7575474c74 100644
--- a/packages/nodes-base/nodes/CrowdDev/descriptions/activityFields.ts
+++ b/packages/nodes-base/nodes/CrowdDev/descriptions/activityFields.ts
@@ -1,7 +1,8 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { activityPresend } from '../GenericFunctions';
+
 import { emailsField } from './shared';
 import { getAdditionalOptions, mapWith, showFor } from './utils';
+import { activityPresend } from '../GenericFunctions';
 
 const displayOpts = showFor(['activity']);
 
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/automationFields.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/automationFields.ts
index 3607321a64825..3b28bf1de224c 100644
--- a/packages/nodes-base/nodes/CrowdDev/descriptions/automationFields.ts
+++ b/packages/nodes-base/nodes/CrowdDev/descriptions/automationFields.ts
@@ -1,6 +1,7 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { automationPresend } from '../GenericFunctions';
+
 import { mapWith, showFor } from './utils';
+import { automationPresend } from '../GenericFunctions';
 
 const displayOpts = showFor(['automation']);
 
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/index.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/index.ts
index 4bc1496287b30..515f7f08552f0 100644
--- a/packages/nodes-base/nodes/CrowdDev/descriptions/index.ts
+++ b/packages/nodes-base/nodes/CrowdDev/descriptions/index.ts
@@ -1,11 +1,12 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { resources } from './resources';
+
 import { activityOperations, activityFields } from './activityFields';
+import { automationFields, automationOperations } from './automationFields';
 import { memberFields, memberOperations } from './memberFields';
 import { noteFields, noteOperations } from './noteFields';
 import { organizationFields, organizationOperations } from './organizationFields';
+import { resources } from './resources';
 import { taskFields, taskOperations } from './taskFields';
-import { automationFields, automationOperations } from './automationFields';
 
 export const allProperties: INodeProperties[] = [
 	resources,
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/memberFields.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/memberFields.ts
index 08f4548b690d0..67a96cff7f7b8 100644
--- a/packages/nodes-base/nodes/CrowdDev/descriptions/memberFields.ts
+++ b/packages/nodes-base/nodes/CrowdDev/descriptions/memberFields.ts
@@ -1,7 +1,8 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { memberPresend } from '../GenericFunctions';
-import { getAdditionalOptions, getId, mapWith, showFor } from './utils';
+
 import * as shared from './shared';
+import { getAdditionalOptions, getId, mapWith, showFor } from './utils';
+import { memberPresend } from '../GenericFunctions';
 
 const displayOpts = showFor(['member']);
 
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/noteFields.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/noteFields.ts
index 7184d88f0bbbe..69c2d0da13e28 100644
--- a/packages/nodes-base/nodes/CrowdDev/descriptions/noteFields.ts
+++ b/packages/nodes-base/nodes/CrowdDev/descriptions/noteFields.ts
@@ -1,6 +1,7 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { notePresend } from '../GenericFunctions';
+
 import { getId, mapWith, showFor } from './utils';
+import { notePresend } from '../GenericFunctions';
 
 const displayOpts = showFor(['note']);
 
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/organizationFields.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/organizationFields.ts
index 283c85193ea61..4ea7440272bd2 100644
--- a/packages/nodes-base/nodes/CrowdDev/descriptions/organizationFields.ts
+++ b/packages/nodes-base/nodes/CrowdDev/descriptions/organizationFields.ts
@@ -1,6 +1,7 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { organizationPresend } from '../GenericFunctions';
+
 import { getAdditionalOptions, getId, mapWith, showFor } from './utils';
+import { organizationPresend } from '../GenericFunctions';
 
 const displayOpts = showFor(['organization']);
 
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/taskFields.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/taskFields.ts
index 8a39b0031a93b..5de5573860d98 100644
--- a/packages/nodes-base/nodes/CrowdDev/descriptions/taskFields.ts
+++ b/packages/nodes-base/nodes/CrowdDev/descriptions/taskFields.ts
@@ -1,6 +1,7 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { taskPresend } from '../GenericFunctions';
+
 import { getAdditionalOptions, getId, showFor } from './utils';
+import { taskPresend } from '../GenericFunctions';
 
 const displayOpts = showFor(['task']);
 
diff --git a/packages/nodes-base/nodes/Crypto/Crypto.node.ts b/packages/nodes-base/nodes/Crypto/Crypto.node.ts
index 6bbaa30e74c61..b0b2b21b120d7 100644
--- a/packages/nodes-base/nodes/Crypto/Crypto.node.ts
+++ b/packages/nodes-base/nodes/Crypto/Crypto.node.ts
@@ -1,7 +1,5 @@
 import type { BinaryToTextEncoding } from 'crypto';
 import { createHash, createHmac, createSign, getHashes, randomBytes } from 'crypto';
-import { pipeline } from 'stream/promises';
-import { v4 as uuid } from 'uuid';
 import set from 'lodash/set';
 import type {
 	IExecuteFunctions,
@@ -11,6 +9,8 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { deepCopy, BINARY_ENCODING, NodeConnectionType } from 'n8n-workflow';
+import { pipeline } from 'stream/promises';
+import { v4 as uuid } from 'uuid';
 
 const unsupportedAlgorithms = [
 	'RSA-MD4',
diff --git a/packages/nodes-base/nodes/Crypto/test/Crypto.test.ts b/packages/nodes-base/nodes/Crypto/test/Crypto.test.ts
index b321d4e852b67..d473b0551f96b 100644
--- a/packages/nodes-base/nodes/Crypto/test/Crypto.test.ts
+++ b/packages/nodes-base/nodes/Crypto/test/Crypto.test.ts
@@ -1,6 +1,7 @@
 import fs from 'fs';
 import fsPromises from 'fs/promises';
 import { Readable } from 'stream';
+
 import { testWorkflows, getWorkflowFilenames, initBinaryDataService } from '@test/nodes/Helpers';
 
 const workflows = getWorkflowFilenames(__dirname);
diff --git a/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.ts b/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.ts
index b9202734c3600..98b465823002e 100644
--- a/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.ts
+++ b/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.ts
@@ -6,10 +6,11 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-import { customerIoApiRequest, validateJSON } from './GenericFunctions';
+
 import { campaignFields, campaignOperations } from './CampaignDescription';
 import { customerFields, customerOperations } from './CustomerDescription';
 import { eventFields, eventOperations } from './EventDescription';
+import { customerIoApiRequest, validateJSON } from './GenericFunctions';
 import { segmentFields, segmentOperations } from './SegmentDescription';
 
 export class CustomerIo implements INodeType {
diff --git a/packages/nodes-base/nodes/CustomerIo/GenericFunctions.ts b/packages/nodes-base/nodes/CustomerIo/GenericFunctions.ts
index dd6e356d954e0..bdcdaae9cf200 100644
--- a/packages/nodes-base/nodes/CustomerIo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/CustomerIo/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import type {
 	IExecuteFunctions,
 	IHookFunctions,
@@ -7,8 +8,6 @@ import type {
 	IHttpRequestOptions,
 } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
 export async function customerIoApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	method: IHttpRequestMethods,
diff --git a/packages/nodes-base/nodes/DateTime/V1/DateTimeV1.node.ts b/packages/nodes-base/nodes/DateTime/V1/DateTimeV1.node.ts
index 2b38055281880..fda31d9e2407a 100644
--- a/packages/nodes-base/nodes/DateTime/V1/DateTimeV1.node.ts
+++ b/packages/nodes-base/nodes/DateTime/V1/DateTimeV1.node.ts
@@ -1,3 +1,6 @@
+import set from 'lodash/set';
+import { DateTime as LuxonDateTime } from 'luxon';
+import moment from 'moment-timezone';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -8,15 +11,8 @@ import type {
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-
 import { deepCopy, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import set from 'lodash/set';
-
-import moment from 'moment-timezone';
-
-import { DateTime as LuxonDateTime } from 'luxon';
-
 function parseDateByFormat(this: IExecuteFunctions, value: string, fromFormat: string) {
 	const date = moment(value, fromFormat, true);
 	if (moment(date).isValid()) return date;
diff --git a/packages/nodes-base/nodes/DateTime/V2/AddToDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/AddToDateDescription.ts
index e6efc9e01c133..b3b4cb590f539 100644
--- a/packages/nodes-base/nodes/DateTime/V2/AddToDateDescription.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/AddToDateDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { includeInputFields } from './common.descriptions';
 
 export const AddToDateDescription: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/DateTime/V2/CurrentDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/CurrentDateDescription.ts
index 81e25c2f38de6..4d8f997bc80e5 100644
--- a/packages/nodes-base/nodes/DateTime/V2/CurrentDateDescription.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/CurrentDateDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { includeInputFields } from './common.descriptions';
 
 export const CurrentDateDescription: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/DateTime/V2/DateTimeV2.node.ts b/packages/nodes-base/nodes/DateTime/V2/DateTimeV2.node.ts
index ca5a2d5a66302..9f148a55dbaf1 100644
--- a/packages/nodes-base/nodes/DateTime/V2/DateTimeV2.node.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/DateTimeV2.node.ts
@@ -1,3 +1,6 @@
+import type { DateTimeUnit, DurationUnit } from 'luxon';
+import { DateTime } from 'luxon';
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import type {
 	IExecuteFunctions,
 	INodeExecutionData,
@@ -5,18 +8,15 @@ import type {
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import type { DateTimeUnit, DurationUnit } from 'luxon';
-import { DateTime } from 'luxon';
-import { CurrentDateDescription } from './CurrentDateDescription';
 import { AddToDateDescription } from './AddToDateDescription';
-import { SubtractFromDateDescription } from './SubtractFromDateDescription';
-import { FormatDateDescription } from './FormatDateDescription';
-import { RoundDateDescription } from './RoundDateDescription';
-import { GetTimeBetweenDatesDescription } from './GetTimeBetweenDates';
+import { CurrentDateDescription } from './CurrentDateDescription';
 import { ExtractDateDescription } from './ExtractDateDescription';
+import { FormatDateDescription } from './FormatDateDescription';
 import { parseDate } from './GenericFunctions';
+import { GetTimeBetweenDatesDescription } from './GetTimeBetweenDates';
+import { RoundDateDescription } from './RoundDateDescription';
+import { SubtractFromDateDescription } from './SubtractFromDateDescription';
 
 export class DateTimeV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/DateTime/V2/ExtractDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/ExtractDateDescription.ts
index 2cbabc72a5a75..1c1ef6d9c86ca 100644
--- a/packages/nodes-base/nodes/DateTime/V2/ExtractDateDescription.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/ExtractDateDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { includeInputFields } from './common.descriptions';
 
 export const ExtractDateDescription: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/DateTime/V2/FormatDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/FormatDateDescription.ts
index 65f578b5a6993..830551775c802 100644
--- a/packages/nodes-base/nodes/DateTime/V2/FormatDateDescription.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/FormatDateDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { includeInputFields } from './common.descriptions';
 
 export const FormatDateDescription: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/DateTime/V2/GetTimeBetweenDates.ts b/packages/nodes-base/nodes/DateTime/V2/GetTimeBetweenDates.ts
index d4329c179e205..e59d9c4a6d5d2 100644
--- a/packages/nodes-base/nodes/DateTime/V2/GetTimeBetweenDates.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/GetTimeBetweenDates.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { includeInputFields } from './common.descriptions';
 
 export const GetTimeBetweenDatesDescription: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/DateTime/V2/RoundDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/RoundDateDescription.ts
index 0108fa17e40fa..b6cacd2e18598 100644
--- a/packages/nodes-base/nodes/DateTime/V2/RoundDateDescription.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/RoundDateDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { includeInputFields } from './common.descriptions';
 
 export const RoundDateDescription: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/DateTime/V2/SubtractFromDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/SubtractFromDateDescription.ts
index 8de53d6b37951..43f223b452456 100644
--- a/packages/nodes-base/nodes/DateTime/V2/SubtractFromDateDescription.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/SubtractFromDateDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { includeInputFields } from './common.descriptions';
 
 export const SubtractFromDateDescription: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/DateTime/test/node/DateTime.test.ts b/packages/nodes-base/nodes/DateTime/test/node/DateTime.test.ts
index 60c630d076f4c..6c98039b78d55 100644
--- a/packages/nodes-base/nodes/DateTime/test/node/DateTime.test.ts
+++ b/packages/nodes-base/nodes/DateTime/test/node/DateTime.test.ts
@@ -1,4 +1,5 @@
 import moment from 'moment-timezone';
+
 import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
 
 const workflows = getWorkflowFilenames(__dirname);
diff --git a/packages/nodes-base/nodes/DebugHelper/DebugHelper.node.ts b/packages/nodes-base/nodes/DebugHelper/DebugHelper.node.ts
index 77ae4d861ae8e..b3746ead812e5 100644
--- a/packages/nodes-base/nodes/DebugHelper/DebugHelper.node.ts
+++ b/packages/nodes-base/nodes/DebugHelper/DebugHelper.node.ts
@@ -1,3 +1,4 @@
+import { setSeed, array as mfArray } from 'minifaker';
 import type {
 	IExecuteFunctions,
 	INodeExecutionData,
@@ -10,7 +11,8 @@ import {
 	NodeConnectionType,
 	NodeOperationError,
 } from 'n8n-workflow';
-import { setSeed, array as mfArray } from 'minifaker';
+
+import { generateGarbageMemory, runGarbageCollector } from './functions';
 import {
 	generateCreditCard,
 	generateIPv4,
@@ -25,7 +27,6 @@ import {
 	generateUUID,
 	generateVersion,
 } from './randomData';
-import { generateGarbageMemory, runGarbageCollector } from './functions';
 
 export class DebugHelper implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/DeepL/DeepL.node.ts b/packages/nodes-base/nodes/DeepL/DeepL.node.ts
index fbf5ade3c48b5..f85f091ebea7b 100644
--- a/packages/nodes-base/nodes/DeepL/DeepL.node.ts
+++ b/packages/nodes-base/nodes/DeepL/DeepL.node.ts
@@ -10,7 +10,6 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { deepLApiRequest } from './GenericFunctions';
-
 import { textOperations } from './TextDescription';
 
 export class DeepL implements INodeType {
diff --git a/packages/nodes-base/nodes/Demio/Demio.node.ts b/packages/nodes-base/nodes/Demio/Demio.node.ts
index 1479d415fdfd1..e93c32683cd14 100644
--- a/packages/nodes-base/nodes/Demio/Demio.node.ts
+++ b/packages/nodes-base/nodes/Demio/Demio.node.ts
@@ -9,10 +9,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { demioApiRequest } from './GenericFunctions';
-
 import { eventFields, eventOperations } from './EventDescription';
-
+import { demioApiRequest } from './GenericFunctions';
 import { reportFields, reportOperations } from './ReportDescription';
 
 export class Demio implements INodeType {
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/channel/create.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/channel/create.test.ts
index b0e0168a6db84..5f7e38ed1d1ee 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/channel/create.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/channel/create.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport/discord.api';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport/discord.api';
 
 const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
 
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/channel/deleteChannel.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/channel/deleteChannel.test.ts
index 4e80537759021..01f523d4c3209 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/channel/deleteChannel.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/channel/deleteChannel.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport/discord.api';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport/discord.api';
 
 const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
 
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/channel/get.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/channel/get.test.ts
index b5049a3f854c8..ceb952395cd09 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/channel/get.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/channel/get.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes, IRequestOptions } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport/helpers';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport/helpers';
 
 // TODO: use nock
 const requestApiSpy = jest.spyOn(transport, 'requestApi');
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/channel/getAll.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/channel/getAll.test.ts
index 7ad2b24113be5..1616cde2b0ddb 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/channel/getAll.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/channel/getAll.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport/discord.api';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport/discord.api';
 
 const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
 
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/channel/update.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/channel/update.test.ts
index 072990d8ff828..e6139f59df945 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/channel/update.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/channel/update.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport/discord.api';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport/discord.api';
 
 const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
 
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/member/getAll.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/member/getAll.test.ts
index e84dcd1ad7839..7de96bc6eefcc 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/member/getAll.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/member/getAll.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport/discord.api';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport/discord.api';
 
 const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
 
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/member/roleAdd.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/member/roleAdd.test.ts
index 0de1100e60b6e..febf091233e7c 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/member/roleAdd.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/member/roleAdd.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport/discord.api';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport/discord.api';
 
 const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
 
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/member/roleRemove.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/member/roleRemove.test.ts
index a523f6699a925..159c3e71f08a2 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/member/roleRemove.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/member/roleRemove.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport/discord.api';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport/discord.api';
 
 const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
 
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/message/deleteMessage.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/message/deleteMessage.test.ts
index 5afd6c6c30bbc..6ee8d16e41e19 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/message/deleteMessage.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/message/deleteMessage.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport/discord.api';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport/discord.api';
 
 const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
 
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/message/get.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/message/get.test.ts
index 775a266a61fce..78ec0f22b1ad6 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/message/get.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/message/get.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport/discord.api';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport/discord.api';
 
 const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
 
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/message/getAll.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/message/getAll.test.ts
index 8c5a9cc4795d2..5bb7d7ba2f739 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/message/getAll.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/message/getAll.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport/discord.api';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport/discord.api';
 
 const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
 
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/message/react.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/message/react.test.ts
index 52f16534525d0..13c4924f4efa4 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/message/react.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/message/react.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport/discord.api';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport/discord.api';
 
 const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
 
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/message/send.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/message/send.test.ts
index 3ccc3ea598567..95c2ca54cc1f0 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/message/send.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/message/send.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport/discord.api';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport/discord.api';
 
 const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
 
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/webhook/sendLegacy.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/webhook/sendLegacy.test.ts
index df93c22b11829..fa5487400e316 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/webhook/sendLegacy.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/webhook/sendLegacy.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport/discord.api';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport/discord.api';
 
 const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
 
diff --git a/packages/nodes-base/nodes/Discord/test/v2/utils.test.ts b/packages/nodes-base/nodes/Discord/test/v2/utils.test.ts
index a54d48eee9fe9..ff79027568609 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/utils.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/utils.test.ts
@@ -1,4 +1,6 @@
 import type { IExecuteFunctions, INode } from 'n8n-workflow';
+
+import * as transport from '../../v2//transport/discord.api';
 import {
 	createSimplifyFunction,
 	prepareOptions,
@@ -7,8 +9,6 @@ import {
 	setupChannelGetter,
 } from '../../v2/helpers/utils';
 
-import * as transport from '../../v2//transport/discord.api';
-
 const node: INode = {
 	id: '1',
 	name: 'Discord node',
diff --git a/packages/nodes-base/nodes/Discord/v1/DiscordV1.node.ts b/packages/nodes-base/nodes/Discord/v1/DiscordV1.node.ts
index 6f0f24ce63149..e802a0dbef0bb 100644
--- a/packages/nodes-base/nodes/Discord/v1/DiscordV1.node.ts
+++ b/packages/nodes-base/nodes/Discord/v1/DiscordV1.node.ts
@@ -14,8 +14,8 @@ import {
 	sleep,
 } from 'n8n-workflow';
 
-import { oldVersionNotice } from '../../../utils/descriptions';
 import type { DiscordAttachment, DiscordWebhook } from './Interfaces';
+import { oldVersionNotice } from '../../../utils/descriptions';
 
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Discord',
diff --git a/packages/nodes-base/nodes/Discord/v2/DiscordV2.node.ts b/packages/nodes-base/nodes/Discord/v2/DiscordV2.node.ts
index b4409a370bfd5..20b4cec13f6ee 100644
--- a/packages/nodes-base/nodes/Discord/v2/DiscordV2.node.ts
+++ b/packages/nodes-base/nodes/Discord/v2/DiscordV2.node.ts
@@ -6,11 +6,9 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import { listSearch, loadOptions } from './methods';
-
 import { router } from './actions/router';
-
 import { versionDescription } from './actions/versionDescription';
+import { listSearch, loadOptions } from './methods';
 
 export class DiscordV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/channel/create.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/channel/create.operation.ts
index d87bad2ec2227..fc797a8bd3d4c 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/channel/create.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/channel/create.operation.ts
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import { parseDiscordError, prepareErrorData } from '../../helpers/utils';
 import { discordApiRequest } from '../../transport';
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/channel/deleteChannel.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/channel/deleteChannel.operation.ts
index 57c405655f10f..af718bb4c6baa 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/channel/deleteChannel.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/channel/deleteChannel.operation.ts
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import { parseDiscordError, prepareErrorData, setupChannelGetter } from '../../helpers/utils';
 import { discordApiRequest } from '../../transport';
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/channel/get.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/channel/get.operation.ts
index 585b5294d405a..741960a5de26c 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/channel/get.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/channel/get.operation.ts
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import { parseDiscordError, prepareErrorData, setupChannelGetter } from '../../helpers/utils';
 import { discordApiRequest } from '../../transport';
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/channel/getAll.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/channel/getAll.operation.ts
index 4644f4975e41c..20d5611d2467e 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/channel/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/channel/getAll.operation.ts
@@ -4,10 +4,11 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { returnAllOrLimit } from '../../../../../utils/descriptions';
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import { parseDiscordError, prepareErrorData } from '../../helpers/utils';
 import { discordApiRequest } from '../../transport';
-import { returnAllOrLimit } from '../../../../../utils/descriptions';
 
 const properties: INodeProperties[] = [
 	...returnAllOrLimit,
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/channel/index.ts b/packages/nodes-base/nodes/Discord/v2/actions/channel/index.ts
index e866e89ac0c42..4d43cea64ffff 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/channel/index.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/channel/index.ts
@@ -1,11 +1,11 @@
 import type { INodeProperties } from 'n8n-workflow';
 
-import { guildRLC } from '../common.description';
 import * as create from './create.operation';
+import * as deleteChannel from './deleteChannel.operation';
 import * as get from './get.operation';
 import * as getAll from './getAll.operation';
 import * as update from './update.operation';
-import * as deleteChannel from './deleteChannel.operation';
+import { guildRLC } from '../common.description';
 
 export { create, get, getAll, update, deleteChannel };
 
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/channel/update.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/channel/update.operation.ts
index 8a07aa8efbcfc..1acd79702664d 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/channel/update.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/channel/update.operation.ts
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import { parseDiscordError, prepareErrorData, setupChannelGetter } from '../../helpers/utils';
 import { discordApiRequest } from '../../transport';
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/common.description.ts b/packages/nodes-base/nodes/Discord/v2/actions/common.description.ts
index f2f35f44760bf..7acccea9042e1 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/common.description.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/common.description.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../utils/utilities';
 
 export const guildRLC: INodeProperties = {
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/member/getAll.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/member/getAll.operation.ts
index 1cf43b0c9865d..982382b1c632e 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/member/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/member/getAll.operation.ts
@@ -4,11 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { returnAllOrLimit } from '../../../../../utils/descriptions';
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import { createSimplifyFunction, parseDiscordError, prepareErrorData } from '../../helpers/utils';
 import { discordApiRequest } from '../../transport';
 import { simplifyBoolean } from '../common.description';
-import { returnAllOrLimit } from '../../../../../utils/descriptions';
 
 const properties: INodeProperties[] = [
 	...returnAllOrLimit,
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/member/index.ts b/packages/nodes-base/nodes/Discord/v2/actions/member/index.ts
index a2260b731c13d..5f2e87f749e01 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/member/index.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/member/index.ts
@@ -1,9 +1,9 @@
 import type { INodeProperties } from 'n8n-workflow';
 
-import { guildRLC } from '../common.description';
 import * as getAll from './getAll.operation';
 import * as roleAdd from './roleAdd.operation';
 import * as roleRemove from './roleRemove.operation';
+import { guildRLC } from '../common.description';
 
 export { getAll, roleAdd, roleRemove };
 
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/member/roleAdd.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/member/roleAdd.operation.ts
index 4cd83fe2fd441..d35cab836df39 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/member/roleAdd.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/member/roleAdd.operation.ts
@@ -1,4 +1,5 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import { parseDiscordError, prepareErrorData } from '../../helpers/utils';
 import { discordApiRequest } from '../../transport';
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/member/roleRemove.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/member/roleRemove.operation.ts
index 025975054b8f1..d6048294c5fab 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/member/roleRemove.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/member/roleRemove.operation.ts
@@ -1,4 +1,5 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import { parseDiscordError, prepareErrorData } from '../../helpers/utils';
 import { discordApiRequest } from '../../transport';
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/message/deleteMessage.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/message/deleteMessage.operation.ts
index 149d9fc9e90ce..11e903c663746 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/message/deleteMessage.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/message/deleteMessage.operation.ts
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import { parseDiscordError, prepareErrorData, setupChannelGetter } from '../../helpers/utils';
 import { discordApiRequest } from '../../transport';
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/message/get.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/message/get.operation.ts
index f7405a7b99254..d6246fada9bbf 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/message/get.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/message/get.operation.ts
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import {
 	createSimplifyFunction,
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/message/getAll.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/message/getAll.operation.ts
index c818bf08d129f..10086c4040bc7 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/message/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/message/getAll.operation.ts
@@ -4,6 +4,8 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { returnAllOrLimit } from '../../../../../utils/descriptions';
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import {
 	createSimplifyFunction,
@@ -13,7 +15,6 @@ import {
 } from '../../helpers/utils';
 import { discordApiRequest } from '../../transport';
 import { channelRLC, simplifyBoolean } from '../common.description';
-import { returnAllOrLimit } from '../../../../../utils/descriptions';
 
 const properties: INodeProperties[] = [
 	channelRLC,
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/message/index.ts b/packages/nodes-base/nodes/Discord/v2/actions/message/index.ts
index a2fb1955a4b73..c040cb94e7cd7 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/message/index.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/message/index.ts
@@ -1,11 +1,11 @@
 import type { INodeProperties } from 'n8n-workflow';
 
-import { guildRLC } from '../common.description';
+import * as deleteMessage from './deleteMessage.operation';
+import * as get from './get.operation';
 import * as getAll from './getAll.operation';
 import * as react from './react.operation';
 import * as send from './send.operation';
-import * as deleteMessage from './deleteMessage.operation';
-import * as get from './get.operation';
+import { guildRLC } from '../common.description';
 
 export { getAll, react, send, deleteMessage, get };
 
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/message/react.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/message/react.operation.ts
index 1041c5626a0e6..9713d9e8efd6f 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/message/react.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/message/react.operation.ts
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import { parseDiscordError, prepareErrorData, setupChannelGetter } from '../../helpers/utils';
 import { discordApiRequest } from '../../transport';
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/message/send.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/message/send.operation.ts
index 1b29fe13addcc..bcd49d7a8f24f 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/message/send.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/message/send.operation.ts
@@ -5,15 +5,8 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
-import { updateDisplayOptions } from '../../../../../utils/utilities';
-import { discordApiMultiPartRequest, discordApiRequest } from '../../transport';
-import {
-	embedsFixedCollection,
-	filesFixedCollection,
-	textChannelRLC,
-	userRLC,
-} from '../common.description';
 
+import { updateDisplayOptions } from '../../../../../utils/utilities';
 import {
 	checkAccessToChannel,
 	parseDiscordError,
@@ -22,6 +15,13 @@ import {
 	prepareMultiPartForm,
 	prepareOptions,
 } from '../../helpers/utils';
+import { discordApiMultiPartRequest, discordApiRequest } from '../../transport';
+import {
+	embedsFixedCollection,
+	filesFixedCollection,
+	textChannelRLC,
+	userRLC,
+} from '../common.description';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/router.ts b/packages/nodes-base/nodes/Discord/v2/actions/router.ts
index 2a65ca6145a60..a43534e1411c5 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/router.ts
@@ -1,14 +1,13 @@
 import type { IDataObject, IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { discordApiRequest } from '../transport';
-import { checkAccessToGuild } from '../helpers/utils';
-
-import * as message from './message';
 import * as channel from './channel';
 import * as member from './member';
-import * as webhook from './webhook';
+import * as message from './message';
 import type { Discord } from './node.type';
+import * as webhook from './webhook';
+import { checkAccessToGuild } from '../helpers/utils';
+import { discordApiRequest } from '../transport';
 
 export async function router(this: IExecuteFunctions) {
 	let returnData: INodeExecutionData[] = [];
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/versionDescription.ts b/packages/nodes-base/nodes/Discord/v2/actions/versionDescription.ts
index 7fc8c5d532be8..8d79650890f3e 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/versionDescription.ts
@@ -1,9 +1,9 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import { NodeConnectionType, type INodeTypeDescription } from 'n8n-workflow';
 
-import * as message from './message';
 import * as channel from './channel';
 import * as member from './member';
+import * as message from './message';
 import * as webhook from './webhook';
 
 export const versionDescription: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/webhook/sendLegacy.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/webhook/sendLegacy.operation.ts
index cf4379f0e5cce..e94837fb4ce17 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/webhook/sendLegacy.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/webhook/sendLegacy.operation.ts
@@ -4,9 +4,8 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions } from '../../../../../utils/utilities';
-import { discordApiMultiPartRequest, discordApiRequest } from '../../transport';
 
+import { updateDisplayOptions } from '../../../../../utils/utilities';
 import {
 	parseDiscordError,
 	prepareEmbeds,
@@ -14,7 +13,7 @@ import {
 	prepareMultiPartForm,
 	prepareOptions,
 } from '../../helpers/utils';
-
+import { discordApiMultiPartRequest, discordApiRequest } from '../../transport';
 import { embedsFixedCollection, filesFixedCollection } from '../common.description';
 
 const properties: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/Discord/v2/helpers/utils.ts b/packages/nodes-base/nodes/Discord/v2/helpers/utils.ts
index b3852f9527a4b..7f1922adb4873 100644
--- a/packages/nodes-base/nodes/Discord/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Discord/v2/helpers/utils.ts
@@ -1,3 +1,6 @@
+import FormData from 'form-data';
+import { isEmpty } from 'lodash';
+import { extension } from 'mime-types';
 import type {
 	IBinaryKeyData,
 	IDataObject,
@@ -6,9 +9,7 @@ import type {
 	INodeExecutionData,
 } from 'n8n-workflow';
 import { jsonParse, NodeOperationError } from 'n8n-workflow';
-import { isEmpty } from 'lodash';
-import FormData from 'form-data';
-import { extension } from 'mime-types';
+
 import { capitalize } from '../../../../utils/utilities';
 import { discordApiRequest } from '../transport';
 
diff --git a/packages/nodes-base/nodes/Discord/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Discord/v2/methods/listSearch.ts
index abbec430402e0..02251f610d433 100644
--- a/packages/nodes-base/nodes/Discord/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Discord/v2/methods/listSearch.ts
@@ -3,8 +3,9 @@ import {
 	type ILoadOptionsFunctions,
 	type INodeListSearchResult,
 } from 'n8n-workflow';
-import { discordApiRequest } from '../transport';
+
 import { checkAccessToGuild } from '../helpers/utils';
+import { discordApiRequest } from '../transport';
 
 async function getGuildId(this: ILoadOptionsFunctions) {
 	const guildId = this.getNodeParameter('guildId', undefined, {
diff --git a/packages/nodes-base/nodes/Discord/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/Discord/v2/methods/loadOptions.ts
index ab79a4bd1d84c..8cc4cfd27f418 100644
--- a/packages/nodes-base/nodes/Discord/v2/methods/loadOptions.ts
+++ b/packages/nodes-base/nodes/Discord/v2/methods/loadOptions.ts
@@ -1,6 +1,7 @@
 import type { IDataObject, ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
-import { discordApiRequest } from '../transport';
+
 import { checkAccessToGuild } from '../helpers/utils';
+import { discordApiRequest } from '../transport';
 
 export async function getRoles(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 	const guildId = this.getNodeParameter('guildId', undefined, {
diff --git a/packages/nodes-base/nodes/Discord/v2/transport/discord.api.ts b/packages/nodes-base/nodes/Discord/v2/transport/discord.api.ts
index c7a066ef4d2cc..7c95bf5d3b999 100644
--- a/packages/nodes-base/nodes/Discord/v2/transport/discord.api.ts
+++ b/packages/nodes-base/nodes/Discord/v2/transport/discord.api.ts
@@ -1,3 +1,4 @@
+import type FormData from 'form-data';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -7,10 +8,8 @@ import type {
 	ILoadOptionsFunctions,
 	IRequestOptions,
 } from 'n8n-workflow';
-
 import { sleep, NodeApiError, jsonParse } from 'n8n-workflow';
 
-import type FormData from 'form-data';
 import { getCredentialsType, requestApi } from './helpers';
 
 export async function discordApiRequest(
diff --git a/packages/nodes-base/nodes/Discourse/Discourse.node.ts b/packages/nodes-base/nodes/Discourse/Discourse.node.ts
index 2cf817d71bf1a..92e329ca9743a 100644
--- a/packages/nodes-base/nodes/Discourse/Discourse.node.ts
+++ b/packages/nodes-base/nodes/Discourse/Discourse.node.ts
@@ -9,16 +9,11 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { discourseApiRequest } from './GenericFunctions';
-
-import { postFields, postOperations } from './PostDescription';
-
 import { categoryFields, categoryOperations } from './CategoryDescription';
-
+import { discourseApiRequest } from './GenericFunctions';
 import { groupFields, groupOperations } from './GroupDescription';
-
+import { postFields, postOperations } from './PostDescription';
 import { userFields, userOperations } from './UserDescription';
-
 import { userGroupFields, userGroupOperations } from './UserGroupDescription';
 
 export class Discourse implements INodeType {
diff --git a/packages/nodes-base/nodes/Drift/Drift.node.ts b/packages/nodes-base/nodes/Drift/Drift.node.ts
index dcb62e5affdff..19a29ec8731a5 100644
--- a/packages/nodes-base/nodes/Drift/Drift.node.ts
+++ b/packages/nodes-base/nodes/Drift/Drift.node.ts
@@ -6,9 +6,10 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
-import { driftApiRequest } from './GenericFunctions';
+
 import { contactFields, contactOperations } from './ContactDescription';
 import type { IContact } from './ContactInterface';
+import { driftApiRequest } from './GenericFunctions';
 
 export class Drift implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/E2eTest/E2eTest.node.ts b/packages/nodes-base/nodes/E2eTest/E2eTest.node.ts
index 24c121988bf7f..cf247919a214e 100644
--- a/packages/nodes-base/nodes/E2eTest/E2eTest.node.ts
+++ b/packages/nodes-base/nodes/E2eTest/E2eTest.node.ts
@@ -9,6 +9,7 @@ import {
 	type INodeTypeDescription,
 	type ResourceMapperFields,
 } from 'n8n-workflow';
+
 import { remoteOptions, resourceMapperFields, returnData, searchOptions } from './mock';
 
 export class E2eTest implements INodeType {
diff --git a/packages/nodes-base/nodes/ERPNext/ERPNext.node.ts b/packages/nodes-base/nodes/ERPNext/ERPNext.node.ts
index 8217b3f22d917..0d00b57032699 100644
--- a/packages/nodes-base/nodes/ERPNext/ERPNext.node.ts
+++ b/packages/nodes-base/nodes/ERPNext/ERPNext.node.ts
@@ -11,9 +11,7 @@ import type {
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
 import { documentFields, documentOperations } from './DocumentDescription';
-
 import { erpNextApiRequest, erpNextApiRequestAllItems } from './GenericFunctions';
-
 import type { DocumentProperties } from './utils';
 import { processNames, toSQL } from './utils';
 
diff --git a/packages/nodes-base/nodes/EditImage/EditImage.node.ts b/packages/nodes-base/nodes/EditImage/EditImage.node.ts
index 0cfc6b0bcdbda..9167781af9a68 100644
--- a/packages/nodes-base/nodes/EditImage/EditImage.node.ts
+++ b/packages/nodes-base/nodes/EditImage/EditImage.node.ts
@@ -1,5 +1,6 @@
-import { parse as pathParse } from 'path';
 import { writeFile as fsWriteFile } from 'fs/promises';
+import getSystemFonts from 'get-system-fonts';
+import gm from 'gm';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -11,9 +12,8 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeOperationError, NodeConnectionType, deepCopy } from 'n8n-workflow';
-import gm from 'gm';
+import { parse as pathParse } from 'path';
 import { file } from 'tmp-promise';
-import getSystemFonts from 'get-system-fonts';
 
 const nodeOperations: INodePropertyOptions[] = [
 	{
@@ -1244,7 +1244,7 @@ export class EditImage implements INodeType {
 						gmInstance = gmInstance!
 							.fill(operationData.fontColor as string)
 							.fontSize(operationData.fontSize as number)
-							.font(font as string)
+							.font(font)
 							.drawText(
 								operationData.positionX as number,
 								operationData.positionY as number,
diff --git a/packages/nodes-base/nodes/Egoi/Egoi.node.ts b/packages/nodes-base/nodes/Egoi/Egoi.node.ts
index e922c7ad21364..31056e97b2995 100644
--- a/packages/nodes-base/nodes/Egoi/Egoi.node.ts
+++ b/packages/nodes-base/nodes/Egoi/Egoi.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,9 +10,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import { egoiApiRequest, egoiApiRequestAllItems, simplify } from './GenericFunctions';
-
 import type { ICreateMemberBody } from './Interfaces';
 
 export class Egoi implements INodeType {
diff --git a/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.ts b/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.ts
index d9eb282476405..f30a6f3e2a9e2 100644
--- a/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.ts
+++ b/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.ts
@@ -9,14 +9,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import {
-	elasticSecurityApiRequest,
-	getConnector,
-	getVersion,
-	handleListing,
-	throwOnEmptyUpdate,
-} from './GenericFunctions';
-
 import {
 	caseCommentFields,
 	caseCommentOperations,
@@ -27,7 +19,13 @@ import {
 	connectorFields,
 	connectorOperations,
 } from './descriptions';
-
+import {
+	elasticSecurityApiRequest,
+	getConnector,
+	getVersion,
+	handleListing,
+	throwOnEmptyUpdate,
+} from './GenericFunctions';
 import type { Connector, ConnectorCreatePayload, ConnectorType } from './types';
 
 export class ElasticSecurity implements INodeType {
diff --git a/packages/nodes-base/nodes/Elastic/ElasticSecurity/GenericFunctions.ts b/packages/nodes-base/nodes/Elastic/ElasticSecurity/GenericFunctions.ts
index 7a055eb1e16f4..0da536b60095e 100644
--- a/packages/nodes-base/nodes/Elastic/ElasticSecurity/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Elastic/ElasticSecurity/GenericFunctions.ts
@@ -21,9 +21,8 @@ export async function elasticSecurityApiRequest(
 	body: IDataObject = {},
 	qs: IDataObject = {},
 ) {
-	const { baseUrl: rawBaseUrl } = (await this.getCredentials(
-		'elasticSecurityApi',
-	)) as ElasticSecurityApiCredentials;
+	const { baseUrl: rawBaseUrl } =
+		await this.getCredentials<ElasticSecurityApiCredentials>('elasticSecurityApi');
 
 	const baseUrl = tolerateTrailingSlash(rawBaseUrl);
 
diff --git a/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts b/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts
index d13d237514984..5fab762b88c6a 100644
--- a/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts
+++ b/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts
@@ -1,3 +1,4 @@
+import omit from 'lodash/omit';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -8,15 +9,12 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, jsonParse, NodeApiError } from 'n8n-workflow';
 
-import omit from 'lodash/omit';
+import { documentFields, documentOperations, indexFields, indexOperations } from './descriptions';
 import {
 	elasticsearchApiRequest,
 	elasticsearchApiRequestAllItems,
 	elasticsearchBulkApiRequest,
 } from './GenericFunctions';
-
-import { documentFields, documentOperations, indexFields, indexOperations } from './descriptions';
-
 import type { DocumentGetAllOptions, FieldsUiValues } from './types';
 
 export class Elasticsearch implements INodeType {
@@ -172,7 +170,7 @@ export class Elasticsearch implements INodeType {
 						} else {
 							responseData = await elasticsearchApiRequest.call(
 								this,
-								'GET',
+								'POST',
 								`/${indexId}/_search`,
 								body,
 								qs,
@@ -184,7 +182,7 @@ export class Elasticsearch implements INodeType {
 
 						responseData = await elasticsearchApiRequest.call(
 							this,
-							'GET',
+							'POST',
 							`/${indexId}/_search`,
 							body,
 							qs,
diff --git a/packages/nodes-base/nodes/Elastic/Elasticsearch/GenericFunctions.ts b/packages/nodes-base/nodes/Elastic/Elasticsearch/GenericFunctions.ts
index 333a412a02ce2..29804736e25ed 100644
--- a/packages/nodes-base/nodes/Elastic/Elasticsearch/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Elastic/Elasticsearch/GenericFunctions.ts
@@ -10,9 +10,8 @@ import { NodeApiError } from 'n8n-workflow';
 import type { ElasticsearchApiCredentials } from './types';
 
 export async function elasticsearchBulkApiRequest(this: IExecuteFunctions, body: IDataObject) {
-	const { baseUrl, ignoreSSLIssues } = (await this.getCredentials(
-		'elasticsearchApi',
-	)) as ElasticsearchApiCredentials;
+	const { baseUrl, ignoreSSLIssues } =
+		await this.getCredentials<ElasticsearchApiCredentials>('elasticsearchApi');
 
 	const bulkBody = Object.values(body).flat().join('\n') + '\n';
 
@@ -20,7 +19,7 @@ export async function elasticsearchBulkApiRequest(this: IExecuteFunctions, body:
 		method: 'POST',
 		headers: { 'Content-Type': 'application/x-ndjson' },
 		body: bulkBody,
-		url: `${baseUrl}/_bulk`,
+		url: `${baseUrl.replace(/\/$/, '')}/_bulk`,
 		skipSslCertificateValidation: ignoreSSLIssues,
 		returnFullResponse: true,
 		ignoreHttpStatusErrors: true,
@@ -58,15 +57,14 @@ export async function elasticsearchApiRequest(
 	body: IDataObject = {},
 	qs: IDataObject = {},
 ) {
-	const { baseUrl, ignoreSSLIssues } = (await this.getCredentials(
-		'elasticsearchApi',
-	)) as ElasticsearchApiCredentials;
+	const { baseUrl, ignoreSSLIssues } =
+		await this.getCredentials<ElasticsearchApiCredentials>('elasticsearchApi');
 
 	const options: IHttpRequestOptions = {
 		method,
 		body,
 		qs,
-		url: `${baseUrl}${endpoint}`,
+		url: `${baseUrl.replace(/\/$/, '')}${endpoint}`,
 		json: true,
 		skipSslCertificateValidation: ignoreSSLIssues,
 	};
diff --git a/packages/nodes-base/nodes/Elastic/Elasticsearch/tests/GenericFunctions.test.ts b/packages/nodes-base/nodes/Elastic/Elasticsearch/tests/GenericFunctions.test.ts
new file mode 100644
index 0000000000000..a57834441099e
--- /dev/null
+++ b/packages/nodes-base/nodes/Elastic/Elasticsearch/tests/GenericFunctions.test.ts
@@ -0,0 +1,112 @@
+import { type IExecuteFunctions, NodeApiError } from 'n8n-workflow';
+
+import { elasticsearchApiRequest } from '../GenericFunctions';
+
+describe('Elasticsearch -> elasticsearchApiRequest', () => {
+	let mockExecuteFunctions: IExecuteFunctions;
+
+	const mockHttpRequestWithAuthentication = jest.fn();
+
+	const setupMockFunctions = () => {
+		mockExecuteFunctions = {
+			getCredentials: jest.fn().mockResolvedValue({
+				baseUrl: 'https://example.com',
+				ignoreSSLIssues: false,
+			}),
+			helpers: {
+				httpRequestWithAuthentication: mockHttpRequestWithAuthentication,
+			},
+			getNode: jest.fn().mockReturnValue({}),
+		} as unknown as IExecuteFunctions;
+		jest.clearAllMocks();
+	};
+
+	beforeEach(() => {
+		setupMockFunctions();
+		mockHttpRequestWithAuthentication.mockClear();
+	});
+
+	const response = { success: true };
+
+	it('should make a successful GET API request', async () => {
+		mockHttpRequestWithAuthentication.mockResolvedValue(response);
+
+		const result = await elasticsearchApiRequest.call(
+			mockExecuteFunctions,
+			'GET',
+			'/test-endpoint',
+		);
+
+		expect(result).toEqual(response);
+		expect(mockExecuteFunctions.helpers.httpRequestWithAuthentication).toHaveBeenCalledWith(
+			'elasticsearchApi',
+			expect.objectContaining({
+				method: 'GET',
+				url: 'https://example.com/test-endpoint',
+				json: true,
+				skipSslCertificateValidation: false,
+			}),
+		);
+	});
+
+	it('should make a successful POST API request', async () => {
+		const body = { key: 'value' };
+
+		mockHttpRequestWithAuthentication.mockResolvedValue(response);
+
+		const result = await elasticsearchApiRequest.call(
+			mockExecuteFunctions,
+			'POST',
+			'/test-endpoint',
+			body,
+		);
+
+		expect(result).toEqual(response);
+		expect(mockExecuteFunctions.helpers.httpRequestWithAuthentication).toHaveBeenCalledWith(
+			'elasticsearchApi',
+			expect.objectContaining({
+				body,
+				method: 'POST',
+				url: 'https://example.com/test-endpoint',
+				json: true,
+				skipSslCertificateValidation: false,
+			}),
+		);
+	});
+
+	it('should handle API request errors', async () => {
+		const errorResponse = { message: 'Error occurred' };
+		mockHttpRequestWithAuthentication.mockRejectedValue(errorResponse);
+
+		await expect(
+			elasticsearchApiRequest.call(mockExecuteFunctions, 'GET', '/test-endpoint'),
+		).rejects.toThrow(NodeApiError);
+
+		expect(mockExecuteFunctions.helpers.httpRequestWithAuthentication).toHaveBeenCalledWith(
+			'elasticsearchApi',
+			expect.objectContaining({
+				method: 'GET',
+				url: 'https://example.com/test-endpoint',
+				json: true,
+				skipSslCertificateValidation: false,
+			}),
+		);
+	});
+
+	it('should ignore trailing slashes in the base URL', async () => {
+		mockHttpRequestWithAuthentication.mockResolvedValue(response);
+
+		mockExecuteFunctions.getCredentials = jest.fn().mockResolvedValue({
+			baseUrl: 'https://elastic.domain.com/',
+			ignoreSSLIssues: false,
+		});
+		await elasticsearchApiRequest.call(mockExecuteFunctions, 'GET', '/test-endpoint');
+
+		expect(mockExecuteFunctions.helpers.httpRequestWithAuthentication).toHaveBeenCalledWith(
+			'elasticsearchApi',
+			expect.objectContaining({
+				url: 'https://elastic.domain.com/test-endpoint',
+			}),
+		);
+	});
+});
diff --git a/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts b/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts
index 9f66dec09c84e..669f027e6ccde 100644
--- a/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts
+++ b/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts
@@ -1,3 +1,10 @@
+import type { ImapSimple, ImapSimpleOptions, Message } from '@n8n/imap';
+import { connect as imapConnect, getParts } from '@n8n/imap';
+import find from 'lodash/find';
+import isEmpty from 'lodash/isEmpty';
+import type { Source as ParserSource } from 'mailparser';
+import { simpleParser } from 'mailparser';
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import type {
 	ITriggerFunctions,
 	IBinaryData,
@@ -13,15 +20,6 @@ import type {
 	INodeTypeDescription,
 	ITriggerResponse,
 } from 'n8n-workflow';
-import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-
-import type { ImapSimple, ImapSimpleOptions, Message } from '@n8n/imap';
-import { connect as imapConnect, getParts } from '@n8n/imap';
-import type { Source as ParserSource } from 'mailparser';
-import { simpleParser } from 'mailparser';
-
-import isEmpty from 'lodash/isEmpty';
-import find from 'lodash/find';
 
 export async function parseRawEmail(
 	this: ITriggerFunctions,
diff --git a/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts b/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts
index 74f7540188563..48ce9b3766d66 100644
--- a/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts
+++ b/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts
@@ -1,3 +1,9 @@
+import type { ImapSimple, ImapSimpleOptions, Message, MessagePart } from '@n8n/imap';
+import { connect as imapConnect, getParts } from '@n8n/imap';
+import find from 'lodash/find';
+import isEmpty from 'lodash/isEmpty';
+import type { Source as ParserSource } from 'mailparser';
+import { simpleParser } from 'mailparser';
 import type {
 	ITriggerFunctions,
 	IBinaryData,
@@ -14,14 +20,7 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError, TriggerCloseError } from 'n8n-workflow';
-
-import type { ImapSimple, ImapSimpleOptions, Message, MessagePart } from '@n8n/imap';
-import { connect as imapConnect, getParts } from '@n8n/imap';
-import type { Source as ParserSource } from 'mailparser';
-import { simpleParser } from 'mailparser';
 import rfc2047 from 'rfc2047';
-import isEmpty from 'lodash/isEmpty';
-import find from 'lodash/find';
 
 import type { ICredentialsDataImap } from '../../../credentials/Imap.credentials';
 import { isCredentialsDataImap } from '../../../credentials/Imap.credentials';
diff --git a/packages/nodes-base/nodes/EmailSend/v1/EmailSendV1.node.ts b/packages/nodes-base/nodes/EmailSend/v1/EmailSendV1.node.ts
index cfe18a75ded79..c0dd00af01cdb 100644
--- a/packages/nodes-base/nodes/EmailSend/v1/EmailSendV1.node.ts
+++ b/packages/nodes-base/nodes/EmailSend/v1/EmailSendV1.node.ts
@@ -7,7 +7,6 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
-
 import { createTransport } from 'nodemailer';
 import type SMTPTransport from 'nodemailer/lib/smtp-transport';
 
diff --git a/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts b/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts
index 2f182c5862d29..b8f065a8b7096 100644
--- a/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts
+++ b/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts
@@ -9,11 +9,11 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
-
 import { createTransport } from 'nodemailer';
 import type SMTPTransport from 'nodemailer/lib/smtp-transport';
 
 import { updateDisplayOptions } from '@utils/utilities';
+
 import { appendAttributionOption } from '../../../utils/descriptions';
 
 const properties: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/Emelia/Emelia.node.ts b/packages/nodes-base/nodes/Emelia/Emelia.node.ts
index 121a5d4233568..8c4b710211d41 100644
--- a/packages/nodes-base/nodes/Emelia/Emelia.node.ts
+++ b/packages/nodes-base/nodes/Emelia/Emelia.node.ts
@@ -1,3 +1,4 @@
+import isEmpty from 'lodash/isEmpty';
 import {
 	type IExecuteFunctions,
 	type IDataObject,
@@ -8,12 +9,9 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import isEmpty from 'lodash/isEmpty';
-import { emeliaApiTest, emeliaGraphqlRequest, loadResource } from './GenericFunctions';
-
 import { campaignFields, campaignOperations } from './CampaignDescription';
-
 import { contactListFields, contactListOperations } from './ContactListDescription';
+import { emeliaApiTest, emeliaGraphqlRequest, loadResource } from './GenericFunctions';
 
 export class Emelia implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.json b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.json
similarity index 100%
rename from packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.json
rename to packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.json
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.test.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.test.ts
new file mode 100644
index 0000000000000..f0352c9a3170e
--- /dev/null
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.test.ts
@@ -0,0 +1,113 @@
+import { mock } from 'jest-mock-extended';
+import type { IExecuteFunctions, IWorkflowDataProxyData } from 'n8n-workflow';
+
+import { ExecuteWorkflow } from './ExecuteWorkflow.node';
+import { getWorkflowInfo } from './GenericFunctions';
+
+jest.mock('./GenericFunctions');
+jest.mock('../../../utils/utilities');
+
+describe('ExecuteWorkflow', () => {
+	const executeWorkflow = new ExecuteWorkflow();
+	const executeFunctions = mock<IExecuteFunctions>({
+		getNodeParameter: jest.fn(),
+		getInputData: jest.fn(),
+		getWorkflowDataProxy: jest.fn(),
+		executeWorkflow: jest.fn(),
+		continueOnFail: jest.fn(),
+		setMetadata: jest.fn(),
+		getNode: jest.fn(),
+	});
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		executeFunctions.getInputData.mockReturnValue([{ json: { key: 'value' } }]);
+		executeFunctions.getWorkflowDataProxy.mockReturnValue({
+			$workflow: { id: 'workflowId' },
+			$execution: { id: 'executionId' },
+		} as unknown as IWorkflowDataProxyData);
+	});
+
+	test('should execute workflow in "each" mode and wait for sub-workflow completion', async () => {
+		executeFunctions.getNodeParameter
+			.mockReturnValueOnce('database') // source
+			.mockReturnValueOnce('each') // mode
+			.mockReturnValueOnce(true) // waitForSubWorkflow
+			.mockReturnValueOnce([]); // workflowInputs.schema
+
+		executeFunctions.getInputData.mockReturnValue([{ json: { key: 'value' } }]);
+		executeFunctions.getWorkflowDataProxy.mockReturnValue({
+			$workflow: { id: 'workflowId' },
+			$execution: { id: 'executionId' },
+		} as unknown as IWorkflowDataProxyData);
+		(getWorkflowInfo as jest.Mock).mockResolvedValue({ id: 'subWorkflowId' });
+		(executeFunctions.executeWorkflow as jest.Mock).mockResolvedValue({
+			executionId: 'subExecutionId',
+			data: [[{ json: { key: 'subValue' } }]],
+		});
+
+		const result = await executeWorkflow.execute.call(executeFunctions);
+
+		expect(result).toEqual([
+			[
+				{
+					json: { key: 'value' },
+					index: 0,
+					pairedItem: { item: 0 },
+					metadata: {
+						subExecution: { workflowId: 'subWorkflowId', executionId: 'subExecutionId' },
+					},
+				},
+			],
+		]);
+	});
+
+	test('should execute workflow in "once" mode and not wait for sub-workflow completion', async () => {
+		executeFunctions.getNodeParameter
+			.mockReturnValueOnce('database') // source
+			.mockReturnValueOnce('once') // mode
+			.mockReturnValueOnce(false) // waitForSubWorkflow
+			.mockReturnValueOnce([]); // workflowInputs.schema
+
+		executeFunctions.getInputData.mockReturnValue([{ json: { key: 'value' } }]);
+
+		executeFunctions.executeWorkflow.mockResolvedValue({
+			executionId: 'subExecutionId',
+			data: [[{ json: { key: 'subValue' } }]],
+		});
+
+		const result = await executeWorkflow.execute.call(executeFunctions);
+
+		expect(result).toEqual([[{ json: { key: 'value' }, index: 0, pairedItem: { item: 0 } }]]);
+	});
+
+	test('should handle errors and continue on fail', async () => {
+		executeFunctions.getNodeParameter
+			.mockReturnValueOnce('database') // source
+			.mockReturnValueOnce('each') // mode
+			.mockReturnValueOnce(true) // waitForSubWorkflow
+			.mockReturnValueOnce([]); // workflowInputs.schema
+
+		(getWorkflowInfo as jest.Mock).mockRejectedValue(new Error('Test error'));
+		(executeFunctions.continueOnFail as jest.Mock).mockReturnValue(true);
+
+		const result = await executeWorkflow.execute.call(executeFunctions);
+
+		expect(result).toEqual([[{ json: { error: 'Test error' }, pairedItem: { item: 0 } }]]);
+	});
+
+	test('should throw error if not continuing on fail', async () => {
+		executeFunctions.getNodeParameter
+			.mockReturnValueOnce('database') // source
+			.mockReturnValueOnce('each') // mode
+			.mockReturnValueOnce(true) // waitForSubWorkflow
+			.mockReturnValueOnce([]); // workflowInputs.schema
+
+		(getWorkflowInfo as jest.Mock).mockRejectedValue(new Error('Test error'));
+		(executeFunctions.continueOnFail as jest.Mock).mockReturnValue(false);
+
+		await expect(executeWorkflow.execute.call(executeFunctions)).rejects.toThrow(
+			'Error executing workflow with item at index 0',
+		);
+	});
+});
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.ts
similarity index 82%
rename from packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts
rename to packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.ts
index 52e80655f9ae6..a04ef4375c538 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.ts
@@ -6,9 +6,13 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { generatePairedItemData } from '../../utils/utilities';
-import { getWorkflowInfo } from './GenericFunctions';
 
+import { getWorkflowInfo } from './GenericFunctions';
+import { generatePairedItemData } from '../../../utils/utilities';
+import {
+	getCurrentWorkflowInputData,
+	loadWorkflowInputMappings,
+} from '../../../utils/workflowInputsResourceMapping/GenericFunctions';
 export class ExecuteWorkflow implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Execute Workflow',
@@ -16,7 +20,7 @@ export class ExecuteWorkflow implements INodeType {
 		icon: 'fa:sign-in-alt',
 		iconColor: 'orange-red',
 		group: ['transform'],
-		version: [1, 1.1],
+		version: [1, 1.1, 1.2],
 		subtitle: '={{"Workflow: " + $parameter["workflowId"]}}',
 		description: 'Execute another workflow',
 		defaults: {
@@ -39,6 +43,13 @@ export class ExecuteWorkflow implements INodeType {
 					},
 				],
 			},
+			{
+				displayName: 'This node is out of date. Please upgrade by removing it and adding a new one',
+				name: 'outdatedVersionWarning',
+				type: 'notice',
+				displayOptions: { show: { '@version': [{ _cnd: { lte: 1.1 } }] } },
+				default: '',
+			},
 			{
 				displayName: 'Source',
 				name: 'source',
@@ -67,6 +78,27 @@ export class ExecuteWorkflow implements INodeType {
 				],
 				default: 'database',
 				description: 'Where to get the workflow to execute from',
+				displayOptions: { show: { '@version': [{ _cnd: { lte: 1.1 } }] } },
+			},
+			{
+				displayName: 'Source',
+				name: 'source',
+				type: 'options',
+				options: [
+					{
+						name: 'Database',
+						value: 'database',
+						description: 'Load the workflow from the database by ID',
+					},
+					{
+						name: 'Define Below',
+						value: 'parameter',
+						description: 'Pass the JSON code of a workflow',
+					},
+				],
+				default: 'database',
+				description: 'Where to get the workflow to execute from',
+				displayOptions: { show: { '@version': [{ _cnd: { gte: 1.2 } }] } },
 			},
 
 			// ----------------------------------
@@ -163,6 +195,43 @@ export class ExecuteWorkflow implements INodeType {
 				name: 'executeWorkflowNotice',
 				type: 'notice',
 				default: '',
+				displayOptions: { show: { '@version': [{ _cnd: { lte: 1.1 } }] } },
+			},
+			{
+				displayName: 'Workflow Inputs',
+				name: 'workflowInputs',
+				type: 'resourceMapper',
+				noDataExpression: true,
+				default: {
+					mappingMode: 'defineBelow',
+					value: null,
+				},
+				required: true,
+				typeOptions: {
+					loadOptionsDependsOn: ['workflowId.value'],
+					resourceMapper: {
+						localResourceMapperMethod: 'loadWorkflowInputMappings',
+						valuesLabel: 'Workflow Inputs',
+						mode: 'map',
+						fieldWords: {
+							singular: 'input',
+							plural: 'inputs',
+						},
+						addAllFields: true,
+						multiKeyMatch: false,
+						supportAutoMap: false,
+						showTypeConversionOptions: true,
+					},
+				},
+				displayOptions: {
+					show: {
+						source: ['database'],
+						'@version': [{ _cnd: { gte: 1.2 } }],
+					},
+					hide: {
+						workflowId: [''],
+					},
+				},
 			},
 			{
 				displayName: 'Mode',
@@ -205,10 +274,16 @@ export class ExecuteWorkflow implements INodeType {
 		],
 	};
 
+	methods = {
+		localResourceMapping: {
+			loadWorkflowInputMappings,
+		},
+	};
+
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const source = this.getNodeParameter('source', 0) as string;
 		const mode = this.getNodeParameter('mode', 0, false) as string;
-		const items = this.getInputData();
+		const items = getCurrentWorkflowInputData.call(this);
 
 		const workflowProxy = this.getWorkflowDataProxy(0);
 		const currentWorkflowId = workflowProxy.$workflow.id as string;
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/GenericFunctions.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/GenericFunctions.ts
similarity index 92%
rename from packages/nodes-base/nodes/ExecuteWorkflow/GenericFunctions.ts
rename to packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/GenericFunctions.ts
index 7588040bf8ecd..450a268dfa137 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/GenericFunctions.ts
@@ -3,11 +3,16 @@ import { NodeOperationError, jsonParse } from 'n8n-workflow';
 import type {
 	IExecuteFunctions,
 	IExecuteWorkflowInfo,
+	ILoadOptionsFunctions,
 	INodeParameterResourceLocator,
 	IRequestOptions,
 } from 'n8n-workflow';
 
-export async function getWorkflowInfo(this: IExecuteFunctions, source: string, itemIndex = 0) {
+export async function getWorkflowInfo(
+	this: ILoadOptionsFunctions | IExecuteFunctions,
+	source: string,
+	itemIndex = 0,
+) {
 	const workflowInfo: IExecuteWorkflowInfo = {};
 	const nodeVersion = this.getNode().typeVersion;
 	if (source === 'database') {
diff --git a/packages/nodes-base/nodes/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.json b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.json
similarity index 100%
rename from packages/nodes-base/nodes/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.json
rename to packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.json
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.test.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.test.ts
new file mode 100644
index 0000000000000..b479538c3a727
--- /dev/null
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.test.ts
@@ -0,0 +1,53 @@
+import { mock } from 'jest-mock-extended';
+import type { FieldValueOption, IExecuteFunctions, INode, INodeExecutionData } from 'n8n-workflow';
+
+import { ExecuteWorkflowTrigger } from './ExecuteWorkflowTrigger.node';
+import { WORKFLOW_INPUTS } from '../../../utils/workflowInputsResourceMapping/constants';
+import { getFieldEntries } from '../../../utils/workflowInputsResourceMapping/GenericFunctions';
+
+jest.mock('../../../utils/workflowInputsResourceMapping/GenericFunctions', () => ({
+	getFieldEntries: jest.fn(),
+	getWorkflowInputData: jest.fn(),
+}));
+
+describe('ExecuteWorkflowTrigger', () => {
+	const mockInputData: INodeExecutionData[] = [
+		{ json: { item: 0, foo: 'bar' }, index: 0 },
+		{ json: { item: 1, foo: 'quz' }, index: 1 },
+	];
+	const mockNode = mock<INode>({ typeVersion: 1 });
+	const executeFns = mock<IExecuteFunctions>({
+		getInputData: () => mockInputData,
+		getNode: () => mockNode,
+		getNodeParameter: jest.fn(),
+	});
+
+	it('should return its input data on V1 or V1.1 passthrough', async () => {
+		// User selection in V1.1, or fallback return value in V1 with dropdown not displayed
+		executeFns.getNodeParameter.mockReturnValueOnce('passthrough');
+		const result = await new ExecuteWorkflowTrigger().execute.call(executeFns);
+
+		expect(result).toEqual([mockInputData]);
+	});
+
+	it('should filter out parent input in `Using Fields below` mode', async () => {
+		executeFns.getNodeParameter.mockReturnValueOnce(WORKFLOW_INPUTS);
+		const mockNewParams = [
+			{ name: 'value1', type: 'string' },
+			{ name: 'value2', type: 'number' },
+			{ name: 'foo', type: 'string' },
+		] as FieldValueOption[];
+		const getFieldEntriesMock = (getFieldEntries as jest.Mock).mockReturnValue(mockNewParams);
+
+		const result = await new ExecuteWorkflowTrigger().execute.call(executeFns);
+		const expected = [
+			[
+				{ index: 0, json: { value1: null, value2: null, foo: mockInputData[0].json.foo } },
+				{ index: 1, json: { value1: null, value2: null, foo: mockInputData[1].json.foo } },
+			],
+		];
+
+		expect(result).toEqual(expected);
+		expect(getFieldEntriesMock).toHaveBeenCalledWith(executeFns);
+	});
+});
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
new file mode 100644
index 0000000000000..a15780a80ea7a
--- /dev/null
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
@@ -0,0 +1,225 @@
+import _ from 'lodash';
+import {
+	type INodeExecutionData,
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+} from 'n8n-workflow';
+
+import {
+	INPUT_SOURCE,
+	WORKFLOW_INPUTS,
+	JSON_EXAMPLE,
+	VALUES,
+	TYPE_OPTIONS,
+	PASSTHROUGH,
+	FALLBACK_DEFAULT_VALUE,
+} from '../../../utils/workflowInputsResourceMapping/constants';
+import { getFieldEntries } from '../../../utils/workflowInputsResourceMapping/GenericFunctions';
+
+export class ExecuteWorkflowTrigger implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Execute Workflow Trigger',
+		name: 'executeWorkflowTrigger',
+		icon: 'fa:sign-out-alt',
+		group: ['trigger'],
+		version: [1, 1.1],
+		description:
+			'Helpers for calling other n8n workflows. Used for designing modular, microservice-like workflows.',
+		eventTriggerDescription: '',
+		maxNodes: 1,
+		defaults: {
+			name: 'Workflow Input Trigger',
+			color: '#ff6d5a',
+		},
+		inputs: [],
+		outputs: [NodeConnectionType.Main],
+		hints: [
+			{
+				message: 'Please make sure to define your input fields.',
+				// This condition checks if we have no input fields, which gets a bit awkward:
+				// For WORKFLOW_INPUTS: keys() only contains `VALUES` if at least one value is provided
+				// For JSON_EXAMPLE: We remove all whitespace and check if we're left with an empty object. Note that we already error if the example is not valid JSON
+				displayCondition:
+					`={{$parameter['${INPUT_SOURCE}'] === '${WORKFLOW_INPUTS}' && !$parameter['${WORKFLOW_INPUTS}'].keys().length ` +
+					`|| $parameter['${INPUT_SOURCE}'] === '${JSON_EXAMPLE}' && $parameter['${JSON_EXAMPLE}'].toString().replaceAll(' ', '').replaceAll('\\n', '') === '{}' }}`,
+				whenToDisplay: 'always',
+				location: 'ndv',
+			},
+		],
+		properties: [
+			{
+				displayName: 'Events',
+				name: 'events',
+				type: 'hidden',
+				noDataExpression: true,
+				options: [
+					{
+						name: 'Workflow Call',
+						value: 'worklfow_call',
+						description: 'When called by another workflow using Execute Workflow Trigger',
+						action: 'When Called by Another Workflow',
+					},
+				],
+				default: 'worklfow_call',
+			},
+			{
+				displayName:
+					"When an ‘execute workflow’ node calls this workflow, the execution starts here. Any data passed into the 'execute workflow' node will be output by this node.",
+				name: 'notice',
+				type: 'notice',
+				default: '',
+				displayOptions: {
+					show: { '@version': [{ _cnd: { eq: 1 } }] },
+				},
+			},
+			{
+				displayName: 'This node is out of date. Please upgrade by removing it and adding a new one',
+				name: 'outdatedVersionWarning',
+				type: 'notice',
+				displayOptions: { show: { '@version': [{ _cnd: { eq: 1 } }] } },
+				default: '',
+			},
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+				displayName: 'Input data mode',
+				name: INPUT_SOURCE,
+				type: 'options',
+				options: [
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+						name: 'Define using fields below',
+						value: WORKFLOW_INPUTS,
+						description: 'Provide input fields via UI',
+					},
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+						name: 'Define using JSON example',
+						value: JSON_EXAMPLE,
+						description: 'Generate a schema from an example JSON object',
+					},
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+						name: 'Accept all data',
+						value: PASSTHROUGH,
+						description: 'Use all incoming data from the parent workflow',
+					},
+				],
+				default: WORKFLOW_INPUTS,
+				noDataExpression: true,
+				displayOptions: {
+					show: { '@version': [{ _cnd: { gte: 1.1 } }] },
+				},
+			},
+			{
+				displayName:
+					'Provide an example object to infer fields and their types.<br>To allow any type for a given field, set the value to null.',
+				name: `${JSON_EXAMPLE}_notice`,
+				type: 'notice',
+				default: '',
+				displayOptions: {
+					show: { '@version': [{ _cnd: { gte: 1.1 } }], inputSource: [JSON_EXAMPLE] },
+				},
+			},
+			{
+				displayName: 'JSON Example',
+				name: JSON_EXAMPLE,
+				type: 'json',
+				default: JSON.stringify(
+					{
+						aField: 'a string',
+						aNumber: 123,
+						thisFieldAcceptsAnyType: null,
+						anArray: [],
+					},
+					null,
+					2,
+				),
+				noDataExpression: true,
+				displayOptions: {
+					show: { '@version': [{ _cnd: { gte: 1.1 } }], inputSource: [JSON_EXAMPLE] },
+				},
+			},
+			{
+				displayName: 'Workflow Inputs',
+				name: WORKFLOW_INPUTS,
+				placeholder: 'Add field',
+				type: 'fixedCollection',
+				description:
+					'Define expected input fields. If no inputs are provided, all data from the calling workflow will be passed through.',
+				typeOptions: {
+					multipleValues: true,
+					sortable: true,
+					minRequiredFields: 1,
+				},
+				displayOptions: {
+					show: { '@version': [{ _cnd: { gte: 1.1 } }], inputSource: [WORKFLOW_INPUTS] },
+				},
+				default: {},
+				options: [
+					{
+						name: VALUES,
+						displayName: 'Values',
+						values: [
+							{
+								displayName: 'Name',
+								name: 'name',
+								type: 'string',
+								default: '',
+								placeholder: 'e.g. fieldName',
+								description: 'Name of the field',
+								required: true,
+								noDataExpression: true,
+							},
+							{
+								displayName: 'Type',
+								name: 'type',
+								type: 'options',
+								description: 'The field value type',
+								options: TYPE_OPTIONS,
+								required: true,
+								default: 'string',
+								noDataExpression: true,
+							},
+						],
+					},
+				],
+			},
+		],
+	};
+
+	async execute(this: IExecuteFunctions) {
+		const inputData = this.getInputData();
+		const inputSource = this.getNodeParameter(INPUT_SOURCE, 0, PASSTHROUGH) as string;
+
+		// Note on the data we receive from ExecuteWorkflow caller:
+		//
+		// The ExecuteWorkflow node typechecks all fields explicitly provided by the user here via the resourceMapper
+		// and removes all fields that are in the schema, but `removed` in the resourceMapper.
+		//
+		// In passthrough and legacy node versions, inputData will line up since the resourceMapper is empty,
+		// in which case all input is passed through.
+		// In other cases we will already have matching types and fields provided by the resource mapper,
+		// so we just need to be permissive on this end,
+		// while ensuring we provide default values for fields in our schema, which are removed in the resourceMapper.
+
+		if (inputSource === PASSTHROUGH) {
+			return [inputData];
+		} else {
+			const newParams = getFieldEntries(this);
+			const newKeys = new Set(newParams.map((x) => x.name));
+			const itemsInSchema: INodeExecutionData[] = inputData.map((row, index) => ({
+				json: {
+					...Object.fromEntries(newParams.map((x) => [x.name, FALLBACK_DEFAULT_VALUE])),
+					// Need to trim to the expected schema to support legacy Execute Workflow callers passing through all their data
+					// which we do not want to expose past this node.
+					..._.pickBy(row.json, (_value, key) => newKeys.has(key)),
+				},
+				index,
+			}));
+
+			return [itemsInSchema];
+		}
+	}
+}
diff --git a/packages/nodes-base/nodes/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts b/packages/nodes-base/nodes/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
deleted file mode 100644
index feb33a160da8f..0000000000000
--- a/packages/nodes-base/nodes/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import {
-	NodeConnectionType,
-	type IExecuteFunctions,
-	type INodeType,
-	type INodeTypeDescription,
-} from 'n8n-workflow';
-
-export class ExecuteWorkflowTrigger implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'Execute Workflow Trigger',
-		name: 'executeWorkflowTrigger',
-		icon: 'fa:sign-out-alt',
-		group: ['trigger'],
-		version: 1,
-		description:
-			'Helpers for calling other n8n workflows. Used for designing modular, microservice-like workflows.',
-		eventTriggerDescription: '',
-		maxNodes: 1,
-		defaults: {
-			name: 'Execute Workflow Trigger',
-			color: '#ff6d5a',
-		},
-
-		inputs: [],
-		outputs: [NodeConnectionType.Main],
-		properties: [
-			{
-				displayName:
-					"When an ‘execute workflow’ node calls this workflow, the execution starts here. Any data passed into the 'execute workflow' node will be output by this node.",
-				name: 'notice',
-				type: 'notice',
-				default: '',
-			},
-			{
-				displayName: 'Events',
-				name: 'events',
-				type: 'hidden',
-				noDataExpression: true,
-				options: [
-					{
-						name: 'Workflow Call',
-						value: 'worklfow_call',
-						description: 'When called by another workflow using Execute Workflow Trigger',
-						action: 'When Called by Another Workflow',
-					},
-				],
-				default: 'worklfow_call',
-			},
-		],
-	};
-
-	async execute(this: IExecuteFunctions) {
-		return [this.getInputData()];
-	}
-}
diff --git a/packages/nodes-base/nodes/ExecuteWorkflowTrigger/test/ExecuteWorkflowTrigger.node.test.ts b/packages/nodes-base/nodes/ExecutionData/test/ExecutionData.node.test.ts
similarity index 53%
rename from packages/nodes-base/nodes/ExecuteWorkflowTrigger/test/ExecuteWorkflowTrigger.node.test.ts
rename to packages/nodes-base/nodes/ExecutionData/test/ExecutionData.node.test.ts
index ad35bff192d02..19496b5de09a2 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflowTrigger/test/ExecuteWorkflowTrigger.node.test.ts
+++ b/packages/nodes-base/nodes/ExecutionData/test/ExecutionData.node.test.ts
@@ -1,9 +1,10 @@
 import { mock } from 'jest-mock-extended';
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 
-import { ExecuteWorkflowTrigger } from '../ExecuteWorkflowTrigger.node';
+import { testWorkflows, getWorkflowFilenames } from '../../../test/nodes/Helpers';
+import { ExecutionData } from '../ExecutionData.node';
 
-describe('ExecuteWorkflowTrigger', () => {
+describe('ExecutionData Node', () => {
 	it('should return its input data', async () => {
 		const mockInputData: INodeExecutionData[] = [
 			{ json: { item: 0, foo: 'bar' } },
@@ -12,8 +13,11 @@ describe('ExecuteWorkflowTrigger', () => {
 		const executeFns = mock<IExecuteFunctions>({
 			getInputData: () => mockInputData,
 		});
-		const result = await new ExecuteWorkflowTrigger().execute.call(executeFns);
+		const result = await new ExecutionData().execute.call(executeFns);
 
 		expect(result).toEqual([mockInputData]);
 	});
 });
+
+const workflows = getWorkflowFilenames(__dirname);
+describe('ExecutionData -> Should run the workflow', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/ExecutionData/test/ExecutionData.workflow.json b/packages/nodes-base/nodes/ExecutionData/test/ExecutionData.workflow.json
new file mode 100644
index 0000000000000..91835bccf89da
--- /dev/null
+++ b/packages/nodes-base/nodes/ExecutionData/test/ExecutionData.workflow.json
@@ -0,0 +1,112 @@
+{
+	"name": "[TEST] Execution Data",
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [60, -240],
+			"id": "03be3862-c311-48d8-8898-2ffac5fe65b7",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"dataToSave": {
+					"values": [
+						{
+							"key": "id",
+							"value": "={{ $json.id }}"
+						}
+					]
+				}
+			},
+			"type": "n8n-nodes-base.executionData",
+			"typeVersion": 1,
+			"position": [480, -240],
+			"id": "60d009ae-0101-48bd-a0b5-f8d548b22b5d",
+			"name": "Execution Data"
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "ab35ef53-bffd-43d9-99eb-289f3722999d",
+							"name": "id",
+							"value": "123456",
+							"type": "string"
+						}
+					]
+				},
+				"options": {}
+			},
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.4,
+			"position": [280, -240],
+			"id": "32447090-1a29-45ab-b967-a80b7222bce4",
+			"name": "Edit Fields"
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [720, -240],
+			"id": "59e3fc3b-de67-4b2e-9489-a0918c45fc5c",
+			"name": "No Operation, do nothing"
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": "123456"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Edit Fields",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Edit Fields": {
+			"main": [
+				[
+					{
+						"node": "Execution Data",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Execution Data": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "2721b08b-dd2e-4b68-8df7-6c7fedd31e5d",
+	"meta": {
+		"instanceId": "8c8c5237b8e37b006a7adce87f4369350c58e41f3ca9de16196d3197f69eabcd"
+	},
+	"id": "h6wEFzHoR7UTz8JJ",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts b/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
index 359417e1de759..f4d9d2853970f 100644
--- a/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
+++ b/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
@@ -80,6 +80,10 @@ export class FacebookGraphApi implements INodeType {
 						name: 'Default',
 						value: '',
 					},
+					{
+						name: 'v21.0',
+						value: 'v21.0',
+					},
 					{
 						name: 'v20.0',
 						value: 'v20.0',
diff --git a/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts b/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
index 5e0f9e897f173..99066f047821d 100644
--- a/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
+++ b/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
@@ -1,3 +1,4 @@
+import { snakeCase } from 'change-case';
 import { createHmac } from 'crypto';
 import type {
 	IDataObject,
@@ -11,13 +12,9 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-
 import { v4 as uuid } from 'uuid';
 
-import { snakeCase } from 'change-case';
-
 import { facebookApiRequest, getAllFields, getFields } from './GenericFunctions';
-
 import type { FacebookWebhookSubscription } from './types';
 
 export class FacebookTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Facebook/GenericFunctions.ts b/packages/nodes-base/nodes/Facebook/GenericFunctions.ts
index 94d36bd1830d4..f1a4e72359f0d 100644
--- a/packages/nodes-base/nodes/Facebook/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Facebook/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import { capitalCase } from 'change-case';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -10,8 +11,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import { capitalCase } from 'change-case';
-
 export async function facebookApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
 	method: IHttpRequestMethods,
diff --git a/packages/nodes-base/nodes/FacebookLeadAds/FacebookLeadAdsTrigger.node.ts b/packages/nodes-base/nodes/FacebookLeadAds/FacebookLeadAdsTrigger.node.ts
index 325ac81d4a67e..752ae8783074c 100644
--- a/packages/nodes-base/nodes/FacebookLeadAds/FacebookLeadAdsTrigger.node.ts
+++ b/packages/nodes-base/nodes/FacebookLeadAds/FacebookLeadAdsTrigger.node.ts
@@ -9,6 +9,7 @@ import {
 	type IWebhookResponseData,
 	NodeConnectionType,
 } from 'n8n-workflow';
+
 import {
 	appWebhookSubscriptionCreate,
 	appWebhookSubscriptionDelete,
diff --git a/packages/nodes-base/nodes/FacebookLeadAds/GenericFunctions.ts b/packages/nodes-base/nodes/FacebookLeadAds/GenericFunctions.ts
index 5d4950ea0705a..bccfef3a4f8c4 100644
--- a/packages/nodes-base/nodes/FacebookLeadAds/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/FacebookLeadAds/GenericFunctions.ts
@@ -9,6 +9,7 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
+
 import type {
 	CreateFacebookAppWebhookSubscription,
 	FacebookAppWebhookSubscription,
diff --git a/packages/nodes-base/nodes/FacebookLeadAds/methods/listSearch.ts b/packages/nodes-base/nodes/FacebookLeadAds/methods/listSearch.ts
index 3f9e1f82b9b42..f2289d32babfc 100644
--- a/packages/nodes-base/nodes/FacebookLeadAds/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/FacebookLeadAds/methods/listSearch.ts
@@ -1,4 +1,5 @@
 import type { ILoadOptionsFunctions, INodeListSearchResult } from 'n8n-workflow';
+
 import { facebookFormList, facebookPageList } from '../GenericFunctions';
 
 const filterMatches = (name: string, filter?: string): boolean =>
diff --git a/packages/nodes-base/nodes/Figma/FigmaTrigger.node.ts b/packages/nodes-base/nodes/Figma/FigmaTrigger.node.ts
index c76998bd11286..0d87f83ef96e2 100644
--- a/packages/nodes-base/nodes/Figma/FigmaTrigger.node.ts
+++ b/packages/nodes-base/nodes/Figma/FigmaTrigger.node.ts
@@ -1,3 +1,4 @@
+import { snakeCase } from 'change-case';
 import { randomBytes } from 'crypto';
 import type {
 	IHookFunctions,
@@ -9,7 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
 import { figmaApiRequest } from './GenericFunctions';
 
 export class FigmaTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Files/ConvertToFile/ConvertToFile.node.ts b/packages/nodes-base/nodes/Files/ConvertToFile/ConvertToFile.node.ts
index 364bd629f60ea..460d8298e3a86 100644
--- a/packages/nodes-base/nodes/Files/ConvertToFile/ConvertToFile.node.ts
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/ConvertToFile.node.ts
@@ -6,11 +6,11 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
+import * as iCall from './actions/iCall.operation';
 import * as spreadsheet from './actions/spreadsheet.operation';
 import * as toBinary from './actions/toBinary.operation';
-import * as toText from './actions/toText.operation';
 import * as toJson from './actions/toJson.operation';
-import * as iCall from './actions/iCall.operation';
+import * as toText from './actions/toText.operation';
 
 export class ConvertToFile implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Files/ConvertToFile/actions/iCall.operation.ts b/packages/nodes-base/nodes/Files/ConvertToFile/actions/iCall.operation.ts
index 7fcca69b4cd0e..c3fc66690abe5 100644
--- a/packages/nodes-base/nodes/Files/ConvertToFile/actions/iCall.operation.ts
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/actions/iCall.operation.ts
@@ -1,9 +1,9 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
 
-import * as createEvent from '../../../ICalendar/createEvent.operation';
-
 import { updateDisplayOptions } from '@utils/utilities';
 
+import * as createEvent from '../../../ICalendar/createEvent.operation';
+
 export const description: INodeProperties[] = updateDisplayOptions(
 	{
 		show: {
diff --git a/packages/nodes-base/nodes/Files/ConvertToFile/actions/spreadsheet.operation.ts b/packages/nodes-base/nodes/Files/ConvertToFile/actions/spreadsheet.operation.ts
index f0683b6a6f100..96f87bddc6077 100644
--- a/packages/nodes-base/nodes/Files/ConvertToFile/actions/spreadsheet.operation.ts
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/actions/spreadsheet.operation.ts
@@ -5,10 +5,9 @@ import {
 	type INodeProperties,
 } from 'n8n-workflow';
 
-import { generatePairedItemData, updateDisplayOptions } from '@utils/utilities';
 import type { JsonToSpreadsheetBinaryOptions, JsonToSpreadsheetBinaryFormat } from '@utils/binary';
-
 import { convertJsonToSpreadsheetBinary } from '@utils/binary';
+import { generatePairedItemData, updateDisplayOptions } from '@utils/utilities';
 
 export const operations = ['csv', 'html', 'rtf', 'ods', 'xls', 'xlsx'];
 
diff --git a/packages/nodes-base/nodes/Files/ConvertToFile/actions/toBinary.operation.ts b/packages/nodes-base/nodes/Files/ConvertToFile/actions/toBinary.operation.ts
index f2f329c160bec..47030bb706bc1 100644
--- a/packages/nodes-base/nodes/Files/ConvertToFile/actions/toBinary.operation.ts
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/actions/toBinary.operation.ts
@@ -1,5 +1,4 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-
 import { NodeOperationError } from 'n8n-workflow';
 
 import type { JsonToBinaryOptions } from '@utils/binary';
diff --git a/packages/nodes-base/nodes/Files/ConvertToFile/actions/toJson.operation.ts b/packages/nodes-base/nodes/Files/ConvertToFile/actions/toJson.operation.ts
index 94415d82caa49..cabcfa8da1ea2 100644
--- a/packages/nodes-base/nodes/Files/ConvertToFile/actions/toJson.operation.ts
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/actions/toJson.operation.ts
@@ -1,9 +1,9 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { generatePairedItemData, updateDisplayOptions } from '@utils/utilities';
 import { createBinaryFromJson } from '@utils/binary';
 import { encodeDecodeOptions } from '@utils/descriptions';
+import { generatePairedItemData, updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Files/ConvertToFile/actions/toText.operation.ts b/packages/nodes-base/nodes/Files/ConvertToFile/actions/toText.operation.ts
index 925bf50668f77..cb4ffe23e70c5 100644
--- a/packages/nodes-base/nodes/Files/ConvertToFile/actions/toText.operation.ts
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/actions/toText.operation.ts
@@ -1,5 +1,4 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-
 import { NodeOperationError } from 'n8n-workflow';
 
 import type { JsonToBinaryOptions } from '@utils/binary';
diff --git a/packages/nodes-base/nodes/Files/ExtractFromFile/ExtractFromFile.node.ts b/packages/nodes-base/nodes/Files/ExtractFromFile/ExtractFromFile.node.ts
index 66f6ca2c9c632..c863d84818a28 100644
--- a/packages/nodes-base/nodes/Files/ExtractFromFile/ExtractFromFile.node.ts
+++ b/packages/nodes-base/nodes/Files/ExtractFromFile/ExtractFromFile.node.ts
@@ -6,9 +6,9 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import * as spreadsheet from './actions/spreadsheet.operation';
 import * as moveTo from './actions/moveTo.operation';
 import * as pdf from './actions/pdf.operation';
+import * as spreadsheet from './actions/spreadsheet.operation';
 
 export class ExtractFromFile implements INodeType {
 	// eslint-disable-next-line n8n-nodes-base/node-class-description-missing-subtitle
diff --git a/packages/nodes-base/nodes/Files/ExtractFromFile/actions/moveTo.operation.ts b/packages/nodes-base/nodes/Files/ExtractFromFile/actions/moveTo.operation.ts
index e4f36afc06c14..85cf1309b3138 100644
--- a/packages/nodes-base/nodes/Files/ExtractFromFile/actions/moveTo.operation.ts
+++ b/packages/nodes-base/nodes/Files/ExtractFromFile/actions/moveTo.operation.ts
@@ -1,21 +1,18 @@
+import iconv from 'iconv-lite';
+import get from 'lodash/get';
+import set from 'lodash/set';
+import unset from 'lodash/unset';
 import type {
 	IDataObject,
 	IExecuteFunctions,
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-
 import { BINARY_ENCODING, NodeOperationError, deepCopy, jsonParse } from 'n8n-workflow';
-
-import get from 'lodash/get';
-import set from 'lodash/set';
-import unset from 'lodash/unset';
-
-import iconv from 'iconv-lite';
-
 import { icsCalendarToObject } from 'ts-ics';
-import { updateDisplayOptions } from '@utils/utilities';
+
 import { encodeDecodeOptions } from '@utils/descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	{
@@ -121,8 +118,8 @@ export async function execute(
 
 			if (!value) continue;
 
-			const encoding = (options.encoding as string) || 'utf8';
 			const buffer = await this.helpers.getBinaryDataBuffer(itemIndex, binaryPropertyName);
+			const encoding = (options.encoding as string) || this.helpers.detectBinaryEncoding(buffer);
 
 			if (options.keepSource && options.keepSource !== 'binary') {
 				newItem.json = deepCopy(item.json);
diff --git a/packages/nodes-base/nodes/Files/ExtractFromFile/actions/pdf.operation.ts b/packages/nodes-base/nodes/Files/ExtractFromFile/actions/pdf.operation.ts
index e2e7f2a911ab1..89ce5bc8fcc51 100644
--- a/packages/nodes-base/nodes/Files/ExtractFromFile/actions/pdf.operation.ts
+++ b/packages/nodes-base/nodes/Files/ExtractFromFile/actions/pdf.operation.ts
@@ -1,9 +1,7 @@
+import unset from 'lodash/unset';
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-
 import { NodeOperationError, deepCopy } from 'n8n-workflow';
 
-import unset from 'lodash/unset';
-
 import { extractDataFromPDF } from '@utils/binary';
 import { updateDisplayOptions } from '@utils/utilities';
 
diff --git a/packages/nodes-base/nodes/Files/ExtractFromFile/test/ExtractFromFile.node.test.ts b/packages/nodes-base/nodes/Files/ExtractFromFile/test/ExtractFromFile.node.test.ts
new file mode 100644
index 0000000000000..aebf28eb73a57
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ExtractFromFile/test/ExtractFromFile.node.test.ts
@@ -0,0 +1,6 @@
+import { getWorkflowFilenames, testWorkflows } from '@test/nodes/Helpers';
+
+describe('ExtractFromFile', () => {
+	const workflows = getWorkflowFilenames(__dirname);
+	testWorkflows(workflows);
+});
diff --git a/packages/nodes-base/nodes/Files/ExtractFromFile/test/workflow.non_utf8_encoding.json b/packages/nodes-base/nodes/Files/ExtractFromFile/test/workflow.non_utf8_encoding.json
new file mode 100644
index 0000000000000..8462d93b936d2
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ExtractFromFile/test/workflow.non_utf8_encoding.json
@@ -0,0 +1,98 @@
+{
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [-200, -40],
+			"id": "64686c0a-64a4-4a33-9e70-038c9d23c25b",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"operation": "text",
+				"binaryPropertyName": "myfile",
+				"options": {}
+			},
+			"type": "n8n-nodes-base.extractFromFile",
+			"typeVersion": 1,
+			"position": [420, -40],
+			"id": "aaac18d3-1e99-4c47-9de8-2dc8bf95abd7",
+			"name": "Extract from File"
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "39b5f05f-85c5-499a-86d6-591d6440f147",
+							"name": "text",
+							"value": "Karlovy Vary město lázní Příliš žluťoučký kůň úpěl ďábelské ódy.",
+							"type": "string"
+						}
+					]
+				},
+				"options": {}
+			},
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.4,
+			"position": [-20, -40],
+			"id": "e74c67f1-171a-42a7-be12-b6687935988f",
+			"name": "Edit Fields"
+		},
+		{
+			"parameters": {
+				"operation": "toText",
+				"sourceProperty": "text",
+				"binaryPropertyName": "myfile",
+				"options": {
+					"encoding": "windows1256"
+				}
+			},
+			"type": "n8n-nodes-base.convertToFile",
+			"typeVersion": 1.1,
+			"position": [180, -40],
+			"id": "77ddd6d4-1d75-4ad2-8301-e70213d8371e",
+			"name": "windows1256"
+		}
+	],
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Edit Fields",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Extract from File": {
+			"main": [[]]
+		},
+		"Edit Fields": {
+			"main": [
+				[
+					{
+						"node": "windows1256",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"windows1256": {
+			"main": [
+				[
+					{
+						"node": "Extract from File",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"pinData": {}
+}
diff --git a/packages/nodes-base/nodes/Files/ReadWriteFile/actions/read.operation.ts b/packages/nodes-base/nodes/Files/ReadWriteFile/actions/read.operation.ts
index 9d34b46c57572..d46c3ef648a5d 100644
--- a/packages/nodes-base/nodes/Files/ReadWriteFile/actions/read.operation.ts
+++ b/packages/nodes-base/nodes/Files/ReadWriteFile/actions/read.operation.ts
@@ -1,3 +1,4 @@
+import glob from 'fast-glob';
 import { NodeApiError } from 'n8n-workflow';
 import type {
 	IExecuteFunctions,
@@ -6,10 +7,10 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 
-import glob from 'fast-glob';
-import { errorMapper, escapeSpecialCharacters } from '../helpers/utils';
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { errorMapper, escapeSpecialCharacters } from '../helpers/utils';
+
 export const properties: INodeProperties[] = [
 	{
 		displayName: 'File(s) Selector',
diff --git a/packages/nodes-base/nodes/Files/ReadWriteFile/actions/write.operation.ts b/packages/nodes-base/nodes/Files/ReadWriteFile/actions/write.operation.ts
index fd4a94761787b..5f4d28775a6f3 100644
--- a/packages/nodes-base/nodes/Files/ReadWriteFile/actions/write.operation.ts
+++ b/packages/nodes-base/nodes/Files/ReadWriteFile/actions/write.operation.ts
@@ -1,4 +1,3 @@
-import type { Readable } from 'stream';
 import type {
 	IExecuteFunctions,
 	INodeExecutionData,
@@ -6,10 +5,12 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { BINARY_ENCODING, NodeApiError } from 'n8n-workflow';
+import type { Readable } from 'stream';
 
-import { errorMapper } from '../helpers/utils';
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { errorMapper } from '../helpers/utils';
+
 export const properties: INodeProperties[] = [
 	{
 		displayName: 'File Path and Name',
diff --git a/packages/nodes-base/nodes/Files/ReadWriteFile/test/ReadWriteFile.test.ts b/packages/nodes-base/nodes/Files/ReadWriteFile/test/ReadWriteFile.test.ts
index 38c8d0057e9c2..b4ae9971b38c6 100644
--- a/packages/nodes-base/nodes/Files/ReadWriteFile/test/ReadWriteFile.test.ts
+++ b/packages/nodes-base/nodes/Files/ReadWriteFile/test/ReadWriteFile.test.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import * as Helpers from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 
 describe('Test ReadWriteFile Node', () => {
 	beforeEach(async () => {
diff --git a/packages/nodes-base/nodes/Filter/V1/GenericFunctions.ts b/packages/nodes-base/nodes/Filter/V1/GenericFunctions.ts
index 06288535b1401..cabd5d2f89666 100644
--- a/packages/nodes-base/nodes/Filter/V1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Filter/V1/GenericFunctions.ts
@@ -1,8 +1,7 @@
+import moment from 'moment-timezone';
 import type { INode, NodeParameterValue } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
 const isDateObject = (value: NodeParameterValue) =>
 	Object.prototype.toString.call(value) === '[object Date]';
 
diff --git a/packages/nodes-base/nodes/Filter/V2/FilterV2.node.ts b/packages/nodes-base/nodes/Filter/V2/FilterV2.node.ts
index 46c32d5912df4..6a50c35725341 100644
--- a/packages/nodes-base/nodes/Filter/V2/FilterV2.node.ts
+++ b/packages/nodes-base/nodes/Filter/V2/FilterV2.node.ts
@@ -9,9 +9,10 @@ import {
 	type INodeTypeDescription,
 	NodeConnectionType,
 } from 'n8n-workflow';
+
 import { ENABLE_LESS_STRICT_TYPE_VALIDATION } from '../../../utils/constants';
-import { getTypeValidationParameter, getTypeValidationStrictness } from '../../If/V2/utils';
 import { looseTypeValidationProperty } from '../../../utils/descriptions';
+import { getTypeValidationParameter, getTypeValidationStrictness } from '../../If/V2/utils';
 
 export class FilterV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/Flow/Flow.node.ts b/packages/nodes-base/nodes/Flow/Flow.node.ts
index 06caf25a8267d..39a3b7e56473b 100644
--- a/packages/nodes-base/nodes/Flow/Flow.node.ts
+++ b/packages/nodes-base/nodes/Flow/Flow.node.ts
@@ -7,6 +7,7 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeApiError } from 'n8n-workflow';
+
 import { flowApiRequest, FlowApiRequestAllItems } from './GenericFunctions';
 import { taskFields, taskOperations } from './TaskDescription';
 import type { ITask, TaskInfo } from './TaskInterface';
diff --git a/packages/nodes-base/nodes/Flow/GenericFunctions.ts b/packages/nodes-base/nodes/Flow/GenericFunctions.ts
index 0f304e64150ef..151fe2acc57e3 100644
--- a/packages/nodes-base/nodes/Flow/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Flow/GenericFunctions.ts
@@ -67,7 +67,6 @@ export async function FlowApiRequestAllItems(
 			resolveWithFullResponse: true,
 		});
 		uri = responseData.headers.link;
-		// @ts-ignore
 		returnData.push.apply(returnData, responseData.body[propertyName] as IDataObject[]);
 	} while (responseData.headers.link !== undefined && responseData.headers.link !== '');
 
diff --git a/packages/nodes-base/nodes/Form/Form.node.ts b/packages/nodes-base/nodes/Form/Form.node.ts
index 020bf44aed3b3..9c50dc988dda5 100644
--- a/packages/nodes-base/nodes/Form/Form.node.ts
+++ b/packages/nodes-base/nodes/Form/Form.node.ts
@@ -2,6 +2,7 @@ import type {
 	FormFieldsParameter,
 	IExecuteFunctions,
 	INodeExecutionData,
+	INodeProperties,
 	INodeTypeDescription,
 	IWebhookFunctions,
 	NodeTypeAndVersion,
@@ -18,9 +19,48 @@ import {
 	WAIT_INDEFINITELY,
 } from 'n8n-workflow';
 
+import { type CompletionPageConfig } from './interfaces';
 import { formDescription, formFields, formTitle } from '../Form/common.descriptions';
 import { prepareFormReturnItem, renderForm, resolveRawData } from '../Form/utils';
-import { type CompletionPageConfig } from './interfaces';
+
+export const formFieldsProperties: INodeProperties[] = [
+	{
+		displayName: 'Define Form',
+		name: 'defineForm',
+		type: 'options',
+		noDataExpression: true,
+		options: [
+			{
+				name: 'Using Fields Below',
+				value: 'fields',
+			},
+			{
+				name: 'Using JSON',
+				value: 'json',
+			},
+		],
+		default: 'fields',
+	},
+	{
+		displayName: 'Form Fields',
+		name: 'jsonOutput',
+		type: 'json',
+		typeOptions: {
+			rows: 5,
+		},
+		default:
+			'[\n   {\n      "fieldLabel":"Name",\n      "placeholder":"enter you name",\n      "requiredField":true\n   },\n   {\n      "fieldLabel":"Age",\n      "fieldType":"number",\n      "placeholder":"enter your age"\n   },\n   {\n      "fieldLabel":"Email",\n      "fieldType":"email",\n      "requiredField":true\n   }\n]',
+		validateType: 'form-fields',
+		ignoreValidationDuringExecution: true,
+		hint: '<a href="hhttps://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.form/" target="_blank">See docs</a> for field syntax',
+		displayOptions: {
+			show: {
+				defineForm: ['json'],
+			},
+		},
+	},
+	{ ...formFields, displayOptions: { show: { defineForm: ['fields'] } } },
+];
 
 const pageProperties = updateDisplayOptions(
 	{
@@ -29,42 +69,7 @@ const pageProperties = updateDisplayOptions(
 		},
 	},
 	[
-		{
-			displayName: 'Define Form',
-			name: 'defineForm',
-			type: 'options',
-			noDataExpression: true,
-			options: [
-				{
-					name: 'Using Fields Below',
-					value: 'fields',
-				},
-				{
-					name: 'Using JSON',
-					value: 'json',
-				},
-			],
-			default: 'fields',
-		},
-		{
-			displayName: 'Form Fields',
-			name: 'jsonOutput',
-			type: 'json',
-			typeOptions: {
-				rows: 5,
-			},
-			default:
-				'[\n   {\n      "fieldLabel":"Name",\n      "placeholder":"enter you name",\n      "requiredField":true\n   },\n   {\n      "fieldLabel":"Age",\n      "fieldType":"number",\n      "placeholder":"enter your age"\n   },\n   {\n      "fieldLabel":"Email",\n      "fieldType":"email",\n      "requiredField":true\n   }\n]',
-			validateType: 'form-fields',
-			ignoreValidationDuringExecution: true,
-			hint: '<a href="hhttps://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.form/" target="_blank">See docs</a> for field syntax',
-			displayOptions: {
-				show: {
-					defineForm: ['json'],
-				},
-			},
-		},
-		{ ...formFields, displayOptions: { show: { defineForm: ['fields'] } } },
+		...formFieldsProperties,
 		{
 			displayName: 'Options',
 			name: 'options',
@@ -267,7 +272,7 @@ export class Form extends Node {
 
 		const method = context.getRequestObject().method;
 
-		if (operation === 'completion') {
+		if (operation === 'completion' && method === 'GET') {
 			const staticData = context.getWorkflowStaticData('node');
 			const id = `${context.getExecutionId()}-${context.getNode().name}`;
 			const config = staticData?.[id] as CompletionPageConfig;
@@ -300,6 +305,12 @@ export class Form extends Node {
 			return { noWebhookResponse: true };
 		}
 
+		if (operation === 'completion' && method === 'POST') {
+			return {
+				workflowData: [context.evaluateExpression('{{ $input.all() }}') as INodeExecutionData[]],
+			};
+		}
+
 		if (method === 'GET') {
 			const options = context.getNodeParameter('options', {}) as {
 				formTitle: string;
@@ -336,7 +347,7 @@ export class Form extends Node {
 			const connectedNodes = context.getChildNodes(context.getNode().name);
 
 			const hasNextPage = connectedNodes.some(
-				(node) => node.type === FORM_NODE_TYPE || node.type === WAIT_NODE_TYPE,
+				(node) => !node.disabled && (node.type === FORM_NODE_TYPE || node.type === WAIT_NODE_TYPE),
 			);
 
 			if (hasNextPage) {
@@ -426,6 +437,9 @@ export class Form extends Node {
 			};
 
 			staticData[id] = config;
+
+			const waitTill = new Date(WAIT_INDEFINITELY);
+			await context.putExecutionToWait(waitTill);
 		}
 
 		return [context.getInputData()];
diff --git a/packages/nodes-base/nodes/Form/FormTrigger.node.ts b/packages/nodes-base/nodes/Form/FormTrigger.node.ts
index a486d1b72749a..1ee1399aa00a9 100644
--- a/packages/nodes-base/nodes/Form/FormTrigger.node.ts
+++ b/packages/nodes-base/nodes/Form/FormTrigger.node.ts
@@ -1,5 +1,6 @@
 import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
 import { VersionedNodeType } from 'n8n-workflow';
+
 import { FormTriggerV1 } from './v1/FormTriggerV1.node';
 import { FormTriggerV2 } from './v2/FormTriggerV2.node';
 
diff --git a/packages/nodes-base/nodes/Form/common.descriptions.ts b/packages/nodes-base/nodes/Form/common.descriptions.ts
index fe777edd83384..ad66330c275dc 100644
--- a/packages/nodes-base/nodes/Form/common.descriptions.ts
+++ b/packages/nodes-base/nodes/Form/common.descriptions.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { appendAttributionOption } from '../../utils/descriptions';
 
 export const webhookPath: INodeProperties = {
diff --git a/packages/nodes-base/nodes/Form/interfaces.ts b/packages/nodes-base/nodes/Form/interfaces.ts
index ce2196949a437..bf69644c77441 100644
--- a/packages/nodes-base/nodes/Form/interfaces.ts
+++ b/packages/nodes-base/nodes/Form/interfaces.ts
@@ -22,6 +22,7 @@ export type FormTriggerData = {
 	validForm: boolean;
 	formTitle: string;
 	formDescription?: string;
+	formSubmittedHeader?: string;
 	formSubmittedText?: string;
 	redirectUrl?: string;
 	n8nWebsiteLink: string;
diff --git a/packages/nodes-base/nodes/Form/test/Form.node.test.ts b/packages/nodes-base/nodes/Form/test/Form.node.test.ts
index ecd24d8ca54b3..8b1a24abcca09 100644
--- a/packages/nodes-base/nodes/Form/test/Form.node.test.ts
+++ b/packages/nodes-base/nodes/Form/test/Form.node.test.ts
@@ -94,7 +94,12 @@ describe('Form Node', () => {
 			);
 			mockWebhookFunctions.getRequestObject.mockReturnValue({ method: 'GET' } as Request);
 			mockWebhookFunctions.getParentNodes.mockReturnValue([
-				{ type: 'n8n-nodes-base.formTrigger', name: 'Form Trigger', typeVersion: 2.1 },
+				{
+					type: 'n8n-nodes-base.formTrigger',
+					name: 'Form Trigger',
+					typeVersion: 2.1,
+					disabled: false,
+				},
 			]);
 			mockWebhookFunctions.evaluateExpression.mockReturnValue('test');
 			mockWebhookFunctions.getNode.mockReturnValue(mock<INode>());
@@ -122,7 +127,12 @@ describe('Form Node', () => {
 		it('should return form data for POST request', async () => {
 			mockWebhookFunctions.getRequestObject.mockReturnValue({ method: 'POST' } as Request);
 			mockWebhookFunctions.getParentNodes.mockReturnValue([
-				{ type: 'n8n-nodes-base.formTrigger', name: 'Form Trigger', typeVersion: 2.1 },
+				{
+					type: 'n8n-nodes-base.formTrigger',
+					name: 'Form Trigger',
+					typeVersion: 2.1,
+					disabled: false,
+				},
 			]);
 			mockWebhookFunctions.evaluateExpression.mockReturnValue('test');
 			mockWebhookFunctions.getNode.mockReturnValue(mock<INode>());
@@ -174,7 +184,12 @@ describe('Form Node', () => {
 				return {};
 			});
 			mockWebhookFunctions.getParentNodes.mockReturnValue([
-				{ type: 'n8n-nodes-base.formTrigger', name: 'Form Trigger', typeVersion: 2.1 },
+				{
+					type: 'n8n-nodes-base.formTrigger',
+					name: 'Form Trigger',
+					typeVersion: 2.1,
+					disabled: false,
+				},
 			]);
 			mockWebhookFunctions.evaluateExpression.mockReturnValue('test');
 
diff --git a/packages/nodes-base/nodes/Form/test/FormTriggerV2.node.test.ts b/packages/nodes-base/nodes/Form/test/FormTriggerV2.node.test.ts
index d3c96783c5ae2..63dbfd4986a4e 100644
--- a/packages/nodes-base/nodes/Form/test/FormTriggerV2.node.test.ts
+++ b/packages/nodes-base/nodes/Form/test/FormTriggerV2.node.test.ts
@@ -201,6 +201,7 @@ describe('FormTrigger', () => {
 							name: 'Test Respond To Webhook',
 							type: 'n8n-nodes-base.respondToWebhook',
 							typeVersion: 1,
+							disabled: false,
 						},
 					],
 				}),
diff --git a/packages/nodes-base/nodes/Form/test/utils.test.ts b/packages/nodes-base/nodes/Form/test/utils.test.ts
index 3cd71b9a926d7..455e288ec784a 100644
--- a/packages/nodes-base/nodes/Form/test/utils.test.ts
+++ b/packages/nodes-base/nodes/Form/test/utils.test.ts
@@ -1,11 +1,12 @@
 import { mock } from 'jest-mock-extended';
+import { DateTime } from 'luxon';
 import type {
 	FormFieldsParameter,
 	INode,
 	IWebhookFunctions,
 	MultiPartFormData,
 } from 'n8n-workflow';
-import { DateTime } from 'luxon';
+
 import { formWebhook, prepareFormData, prepareFormReturnItem, resolveRawData } from '../utils';
 
 describe('FormTrigger, formWebhook', () => {
diff --git a/packages/nodes-base/nodes/Form/utils.ts b/packages/nodes-base/nodes/Form/utils.ts
index 2809024e2b6d1..87dda98f8862d 100644
--- a/packages/nodes-base/nodes/Form/utils.ts
+++ b/packages/nodes-base/nodes/Form/utils.ts
@@ -1,3 +1,6 @@
+import type { Response } from 'express';
+import isbot from 'isbot';
+import { DateTime } from 'luxon';
 import type {
 	INodeExecutionData,
 	MultiPartFormData,
@@ -16,18 +19,14 @@ import {
 
 import type { FormTriggerData, FormTriggerInput } from './interfaces';
 import { FORM_TRIGGER_AUTHENTICATION_PROPERTY } from './interfaces';
-
+import { getResolvables } from '../../utils/utilities';
 import { WebhookAuthorizationError } from '../Webhook/error';
 import { validateWebhookAuthentication } from '../Webhook/utils';
 
-import { DateTime } from 'luxon';
-import isbot from 'isbot';
-import type { Response } from 'express';
-import { getResolvables } from '../../utils/utilities';
-
 export function prepareFormData({
 	formTitle,
 	formDescription,
+	formSubmittedHeader,
 	formSubmittedText,
 	redirectUrl,
 	formFields,
@@ -49,6 +48,7 @@ export function prepareFormData({
 	useResponseData?: boolean;
 	appendAttribution?: boolean;
 	buttonLabel?: string;
+	formSubmittedHeader?: string;
 }) {
 	const validForm = formFields.length > 0;
 	const utm_campaign = instanceId ? `&utm_campaign=${instanceId}` : '';
@@ -63,6 +63,7 @@ export function prepareFormData({
 		validForm,
 		formTitle,
 		formDescription,
+		formSubmittedHeader,
 		formSubmittedText,
 		n8nWebsiteLink,
 		formFields: [],
diff --git a/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts b/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts
index 7e09170d6a04c..da813c758d08c 100644
--- a/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts
+++ b/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts
@@ -9,7 +9,6 @@ import {
 	type IWebhookFunctions,
 } from 'n8n-workflow';
 
-import { formWebhook } from '../utils';
 import {
 	appendAttributionToForm,
 	formDescription,
@@ -21,6 +20,7 @@ import {
 	webhookPath,
 } from '../common.descriptions';
 import { FORM_TRIGGER_AUTHENTICATION_PROPERTY } from '../interfaces';
+import { formWebhook } from '../utils';
 
 const useWorkflowTimezone: INodeProperties = {
 	displayName: 'Use Workflow Timezone',
diff --git a/packages/nodes-base/nodes/Formstack/FormstackTrigger.node.ts b/packages/nodes-base/nodes/Formstack/FormstackTrigger.node.ts
index 988c93b1475aa..747ed095fbd90 100644
--- a/packages/nodes-base/nodes/Formstack/FormstackTrigger.node.ts
+++ b/packages/nodes-base/nodes/Formstack/FormstackTrigger.node.ts
@@ -163,7 +163,6 @@ export class FormstackTrigger implements INodeType {
 		},
 	};
 
-	// @ts-ignore
 	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
 		const bodyData = this.getBodyData() as unknown as IFormstackWebhookResponseBody;
 		const simple = this.getNodeParameter('simple') as string;
diff --git a/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts b/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts
index 3f1c7d73322b0..1345725a69fa3 100644
--- a/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts
+++ b/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts
@@ -9,6 +9,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
+import { contactFields, contactOperations } from './ContactDescription';
+import type { ICreateContactBody } from './ContactInterface';
 import {
 	capitalize,
 	freshdeskApiRequest,
@@ -16,10 +18,6 @@ import {
 	// validateJSON,
 } from './GenericFunctions';
 
-import type { ICreateContactBody } from './ContactInterface';
-
-import { contactFields, contactOperations } from './ContactDescription';
-
 const enum Status {
 	Open = 2,
 	Pending = 3,
@@ -1205,7 +1203,6 @@ export class Freshdesk implements INodeType {
 						if (updateFields.requester) {
 							const value = updateFields.requesterIdentificationValue as string;
 							if (updateFields.requester === 'requesterId') {
-								// @ts-ignore
 								if (isNaN(parseInt(value, 10))) {
 									throw new NodeOperationError(this.getNode(), 'Requester Id must be a number', {
 										itemIndex: i,
diff --git a/packages/nodes-base/nodes/Freshservice/Freshservice.node.ts b/packages/nodes-base/nodes/Freshservice/Freshservice.node.ts
index 3a1fafc6e0e14..d2dd220e041a5 100644
--- a/packages/nodes-base/nodes/Freshservice/Freshservice.node.ts
+++ b/packages/nodes-base/nodes/Freshservice/Freshservice.node.ts
@@ -1,3 +1,4 @@
+import { tz } from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,21 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { tz } from 'moment-timezone';
-import {
-	adjustAddress,
-	adjustAgentRoles,
-	formatFilters,
-	freshserviceApiRequest,
-	handleListing,
-	sanitizeAssignmentScopeGroup,
-	toArray,
-	toOptions,
-	toUserOptions,
-	validateAssignmentScopeGroup,
-	validateUpdateFields,
-} from './GenericFunctions';
-
 import {
 	agentFields,
 	agentGroupFields,
@@ -56,7 +42,19 @@ import {
 	ticketFields,
 	ticketOperations,
 } from './descriptions';
-
+import {
+	adjustAddress,
+	adjustAgentRoles,
+	formatFilters,
+	freshserviceApiRequest,
+	handleListing,
+	sanitizeAssignmentScopeGroup,
+	toArray,
+	toOptions,
+	toUserOptions,
+	validateAssignmentScopeGroup,
+	validateUpdateFields,
+} from './GenericFunctions';
 import type { AddressFixedCollection, LoadedResource, LoadedUser, RolesParameter } from './types';
 
 export class Freshservice implements INodeType {
diff --git a/packages/nodes-base/nodes/Freshservice/GenericFunctions.ts b/packages/nodes-base/nodes/Freshservice/GenericFunctions.ts
index 558a34c125ab9..359d6e1b4d3e3 100644
--- a/packages/nodes-base/nodes/Freshservice/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Freshservice/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import { omit } from 'lodash';
 import type {
 	IExecuteFunctions,
 	IHookFunctions,
@@ -9,7 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import { omit } from 'lodash';
 import type {
 	AddressFixedCollection,
 	FreshserviceCredentials,
@@ -24,9 +24,7 @@ export async function freshserviceApiRequest(
 	body: IDataObject = {},
 	qs: IDataObject = {},
 ) {
-	const { apiKey, domain } = (await this.getCredentials(
-		'freshserviceApi',
-	)) as FreshserviceCredentials;
+	const { apiKey, domain } = await this.getCredentials<FreshserviceCredentials>('freshserviceApi');
 	const encodedApiKey = Buffer.from(`${apiKey}:X`).toString('base64');
 
 	const options: IRequestOptions = {
diff --git a/packages/nodes-base/nodes/Freshservice/descriptions/RequesterDescription.ts b/packages/nodes-base/nodes/Freshservice/descriptions/RequesterDescription.ts
index 4a7bd830ef693..1d1e508a182bb 100644
--- a/packages/nodes-base/nodes/Freshservice/descriptions/RequesterDescription.ts
+++ b/packages/nodes-base/nodes/Freshservice/descriptions/RequesterDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { LANGUAGES } from '../constants';
 
 export const requesterOperations: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.ts b/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.ts
index c6e828ed291b5..3e8a246fbdf13 100644
--- a/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.ts
+++ b/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.ts
@@ -1,3 +1,4 @@
+import { tz } from 'moment-timezone';
 import {
 	type IExecuteFunctions,
 	type IDataObject,
@@ -8,17 +9,6 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { tz } from 'moment-timezone';
-import {
-	adjustAccounts,
-	adjustAttendees,
-	freshworksCrmApiRequest,
-	getAllItemsViewId,
-	handleListing,
-	loadResource,
-	throwOnEmptyUpdate,
-} from './GenericFunctions';
-
 import {
 	accountFields,
 	accountOperations,
@@ -37,7 +27,15 @@ import {
 	taskFields,
 	taskOperations,
 } from './descriptions';
-
+import {
+	adjustAccounts,
+	adjustAttendees,
+	freshworksCrmApiRequest,
+	getAllItemsViewId,
+	handleListing,
+	loadResource,
+	throwOnEmptyUpdate,
+} from './GenericFunctions';
 import type { FreshworksConfigResponse, LoadedCurrency, LoadedUser, LoadOption } from './types';
 
 export class FreshworksCrm implements INodeType {
diff --git a/packages/nodes-base/nodes/FreshworksCrm/GenericFunctions.ts b/packages/nodes-base/nodes/FreshworksCrm/GenericFunctions.ts
index 0d9e7fad2c029..e34aa8e160c7a 100644
--- a/packages/nodes-base/nodes/FreshworksCrm/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/FreshworksCrm/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import omit from 'lodash/omit';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -8,7 +9,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import omit from 'lodash/omit';
 import type {
 	FreshworksConfigResponse,
 	FreshworksCrmApiCredentials,
diff --git a/packages/nodes-base/nodes/FreshworksCrm/descriptions/AppointmentDescription.ts b/packages/nodes-base/nodes/FreshworksCrm/descriptions/AppointmentDescription.ts
index 65228c1c75008..32922cb93c5db 100644
--- a/packages/nodes-base/nodes/FreshworksCrm/descriptions/AppointmentDescription.ts
+++ b/packages/nodes-base/nodes/FreshworksCrm/descriptions/AppointmentDescription.ts
@@ -1,5 +1,4 @@
 import { tz } from 'moment-timezone';
-
 import type { INodeProperties } from 'n8n-workflow';
 
 export const appointmentOperations: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/Ftp/Ftp.node.ts b/packages/nodes-base/nodes/Ftp/Ftp.node.ts
index 99d9e4b77da8a..682eee343c2fe 100644
--- a/packages/nodes-base/nodes/Ftp/Ftp.node.ts
+++ b/packages/nodes-base/nodes/Ftp/Ftp.node.ts
@@ -1,10 +1,4 @@
 import { createWriteStream } from 'fs';
-import { basename, dirname } from 'path';
-import type { Readable } from 'stream';
-import { pipeline } from 'stream/promises';
-import { file as tmpFile } from 'tmp-promise';
-import ftpClient from 'promise-ftp';
-import sftpClient from 'ssh2-sftp-client';
 import { BINARY_ENCODING, NodeApiError, NodeConnectionType } from 'n8n-workflow';
 import type {
 	ICredentialDataDecryptedObject,
@@ -18,6 +12,13 @@ import type {
 	INodeTypeDescription,
 	JsonObject,
 } from 'n8n-workflow';
+import { basename, dirname } from 'path';
+import ftpClient from 'promise-ftp';
+import sftpClient from 'ssh2-sftp-client';
+import type { Readable } from 'stream';
+import { pipeline } from 'stream/promises';
+import { file as tmpFile } from 'tmp-promise';
+
 import { formatPrivateKey, generatePairedItemData } from '@utils/utilities';
 
 interface ReturnFtpItem {
@@ -752,10 +753,20 @@ export class Ftp implements INodeType {
 
 						if (operation === 'rename') {
 							const oldPath = this.getNodeParameter('oldPath', i) as string;
-
 							const newPath = this.getNodeParameter('newPath', i) as string;
+							const options = this.getNodeParameter('options', i);
 
-							await ftp!.rename(oldPath, newPath);
+							try {
+								await ftp!.rename(oldPath, newPath);
+							} catch (error) {
+								if ([451, 550].includes(error.code) && options.createDirectories) {
+									const dirPath = newPath.replace(basename(newPath), '');
+									await ftp!.mkdir(dirPath, true);
+									await ftp!.rename(oldPath, newPath);
+								} else {
+									throw new NodeApiError(this.getNode(), error as JsonObject);
+								}
+							}
 							const executionData = this.helpers.constructExecutionMetaData(
 								[{ json: { success: true } }],
 								{ itemData: { item: i } },
diff --git a/packages/nodes-base/nodes/Function/Function.node.ts b/packages/nodes-base/nodes/Function/Function.node.ts
index 4819e27642925..8c56b98e6b2e5 100644
--- a/packages/nodes-base/nodes/Function/Function.node.ts
+++ b/packages/nodes-base/nodes/Function/Function.node.ts
@@ -9,6 +9,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, deepCopy, NodeOperationError } from 'n8n-workflow';
+
 import { vmResolver } from '../Code/JavaScriptSandbox';
 
 export class Function implements INodeType {
diff --git a/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts b/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
index 9f08f05c8e987..f033930298137 100644
--- a/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
+++ b/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
@@ -10,6 +10,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, deepCopy, NodeOperationError } from 'n8n-workflow';
+
 import { vmResolver } from '../Code/JavaScriptSandbox';
 
 export class FunctionItem implements INodeType {
diff --git a/packages/nodes-base/nodes/GetResponse/GenericFunctions.ts b/packages/nodes-base/nodes/GetResponse/GenericFunctions.ts
index 1271dea98ca07..5083bcdcc7d63 100644
--- a/packages/nodes-base/nodes/GetResponse/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/GetResponse/GenericFunctions.ts
@@ -41,7 +41,6 @@ export async function getresponseApiRequest(
 		if (authentication === 'apiKey') {
 			return await this.helpers.requestWithAuthentication.call(this, 'getResponseApi', options);
 		} else {
-			//@ts-ignore
 			return await this.helpers.requestOAuth2.call(this, 'getResponseOAuth2Api', options);
 		}
 	} catch (error) {
diff --git a/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts b/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts
index 6bdf841944147..74a54e61d2cb3 100644
--- a/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts
+++ b/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,10 +10,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-import { getresponseApiRequest, getResponseApiRequestAllItems } from './GenericFunctions';
-
 import { contactFields, contactOperations } from './ContactDescription';
+import { getresponseApiRequest, getResponseApiRequestAllItems } from './GenericFunctions';
 
 export class GetResponse implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Ghost/Ghost.node.ts b/packages/nodes-base/nodes/Ghost/Ghost.node.ts
index 1ed2381045702..a28e40ae5d400 100644
--- a/packages/nodes-base/nodes/Ghost/Ghost.node.ts
+++ b/packages/nodes-base/nodes/Ghost/Ghost.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,9 +10,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import { ghostApiRequest, ghostApiRequestAllItems, validateJSON } from './GenericFunctions';
-
 import { postFields, postOperations } from './PostDescription';
 
 export class Ghost implements INodeType {
diff --git a/packages/nodes-base/nodes/Git/Git.node.ts b/packages/nodes-base/nodes/Git/Git.node.ts
index 33a14be8b7dea..75b2631cbd745 100644
--- a/packages/nodes-base/nodes/Git/Git.node.ts
+++ b/packages/nodes-base/nodes/Git/Git.node.ts
@@ -1,5 +1,4 @@
 import { access, mkdir } from 'fs/promises';
-import { URL } from 'url';
 import type {
 	IExecuteFunctions,
 	INodeExecutionData,
@@ -7,9 +6,10 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
-
 import type { LogOptions, SimpleGit, SimpleGitOptions } from 'simple-git';
 import simpleGit from 'simple-git';
+import { URL } from 'url';
+
 import {
 	addConfigFields,
 	addFields,
@@ -439,7 +439,6 @@ export class Git implements INodeType {
 						});
 					}
 
-					// @ts-ignore
 					returnItems.push(
 						...this.helpers.returnJsonArray(data).map((item) => {
 							return {
diff --git a/packages/nodes-base/nodes/Github/Github.node.ts b/packages/nodes-base/nodes/Github/Github.node.ts
index 2e29b467caab3..07b6826bb71e6 100644
--- a/packages/nodes-base/nodes/Github/Github.node.ts
+++ b/packages/nodes-base/nodes/Github/Github.node.ts
@@ -1,3 +1,4 @@
+import { snakeCase } from 'change-case';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -8,7 +9,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
 import {
 	getFileSha,
 	githubApiRequest,
@@ -2128,7 +2128,7 @@ export class Github implements INodeType {
 							}
 						}
 
-						endpoint = `/repos/${owner}/${repository}/contents/${encodeURI(filePath)}`;
+						endpoint = `/repos/${owner}/${repository}/contents/${encodeURIComponent(filePath)}`;
 					} else if (operation === 'delete') {
 						// ----------------------------------
 						//         delete
@@ -2165,7 +2165,7 @@ export class Github implements INodeType {
 							body.branch as string | undefined,
 						);
 
-						endpoint = `/repos/${owner}/${repository}/contents/${encodeURI(filePath)}`;
+						endpoint = `/repos/${owner}/${repository}/contents/${encodeURIComponent(filePath)}`;
 					} else if (operation === 'get') {
 						requestMethod = 'GET';
 
@@ -2179,11 +2179,11 @@ export class Github implements INodeType {
 							qs.ref = additionalParameters.reference;
 						}
 
-						endpoint = `/repos/${owner}/${repository}/contents/${encodeURI(filePath)}`;
+						endpoint = `/repos/${owner}/${repository}/contents/${encodeURIComponent(filePath)}`;
 					} else if (operation === 'list') {
 						requestMethod = 'GET';
 						const filePath = this.getNodeParameter('filePath', i);
-						endpoint = `/repos/${owner}/${repository}/contents/${encodeURI(filePath)}`;
+						endpoint = `/repos/${owner}/${repository}/contents/${encodeURIComponent(filePath)}`;
 					}
 				} else if (resource === 'issue') {
 					if (operation === 'create') {
diff --git a/packages/nodes-base/nodes/Github/SearchFunctions.ts b/packages/nodes-base/nodes/Github/SearchFunctions.ts
index 7c2d5fed2ad64..ff77121464723 100644
--- a/packages/nodes-base/nodes/Github/SearchFunctions.ts
+++ b/packages/nodes-base/nodes/Github/SearchFunctions.ts
@@ -3,6 +3,7 @@ import type {
 	INodeListSearchItems,
 	INodeListSearchResult,
 } from 'n8n-workflow';
+
 import { githubApiRequest } from './GenericFunctions';
 
 type UserSearchItem = {
diff --git a/packages/nodes-base/nodes/GoToWebinar/GenericFunctions.ts b/packages/nodes-base/nodes/GoToWebinar/GenericFunctions.ts
index 6748ad78d8a39..da0ac5f1cddd4 100644
--- a/packages/nodes-base/nodes/GoToWebinar/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/GoToWebinar/GenericFunctions.ts
@@ -1,3 +1,5 @@
+import * as losslessJSON from 'lossless-json';
+import moment from 'moment-timezone';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -10,10 +12,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
-import * as losslessJSON from 'lossless-json';
-
 function convertLosslessNumber(_: any, value: any) {
 	if (value?.isLosslessNumber) {
 		return value.toString();
diff --git a/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts b/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts
index cd8c57c00f702..96acec9be6742 100644
--- a/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts
+++ b/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts
@@ -1,3 +1,7 @@
+import isEmpty from 'lodash/isEmpty';
+import omit from 'lodash/omit';
+import moment from 'moment-timezone';
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -7,22 +11,7 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-
-import isEmpty from 'lodash/isEmpty';
-import omit from 'lodash/omit';
 
-import moment from 'moment-timezone';
-import {
-	goToWebinarApiRequest,
-	goToWebinarApiRequestAllItems,
-	handleGetAll,
-	loadAnswers,
-	loadRegistranMultiChoiceQuestions,
-	loadRegistranSimpleQuestions,
-	loadWebinars,
-	loadWebinarSessions,
-} from './GenericFunctions';
 import {
 	attendeeFields,
 	attendeeOperations,
@@ -37,6 +26,16 @@ import {
 	webinarFields,
 	webinarOperations,
 } from './descriptions';
+import {
+	goToWebinarApiRequest,
+	goToWebinarApiRequestAllItems,
+	handleGetAll,
+	loadAnswers,
+	loadRegistranMultiChoiceQuestions,
+	loadRegistranSimpleQuestions,
+	loadWebinars,
+	loadWebinarSessions,
+} from './GenericFunctions';
 
 export class GoToWebinar implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Gong/test/Gong.node.test.ts b/packages/nodes-base/nodes/Gong/test/Gong.node.test.ts
index d4e3e307fd7a5..cee940a5cd7e7 100644
--- a/packages/nodes-base/nodes/Gong/test/Gong.node.test.ts
+++ b/packages/nodes-base/nodes/Gong/test/Gong.node.test.ts
@@ -1,6 +1,3 @@
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
-import * as Helpers from '@test/nodes/Helpers';
-import type { WorkflowTestData } from '@test/nodes/types';
 import type {
 	ICredentialDataDecryptedObject,
 	IDataObject,
@@ -9,6 +6,10 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 import nock from 'nock';
 
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+import * as Helpers from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+
 import { gongApiResponse, gongNodeResponse } from './mocks';
 import { FAKE_CREDENTIALS_DATA } from '../../../test/nodes/FakeCredentialsMap';
 
diff --git a/packages/nodes-base/nodes/Google/Analytics/v1/GoogleAnalyticsV1.node.ts b/packages/nodes-base/nodes/Google/Analytics/v1/GoogleAnalyticsV1.node.ts
index 72a07b2f64eba..bc3da66d63523 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v1/GoogleAnalyticsV1.node.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v1/GoogleAnalyticsV1.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import {
 	type IExecuteFunctions,
 	type IDataObject,
@@ -11,13 +12,12 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-import { reportFields, reportOperations } from './ReportDescription';
-import { userActivityFields, userActivityOperations } from './UserActivityDescription';
+import { oldVersionNotice } from '@utils/descriptions';
+
 import { googleApiRequest, googleApiRequestAllItems, merge, simplify } from './GenericFunctions';
 import type { IData } from './Interfaces';
-
-import { oldVersionNotice } from '@utils/descriptions';
+import { reportFields, reportOperations } from './ReportDescription';
+import { userActivityFields, userActivityOperations } from './UserActivityDescription';
 
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Google Analytics',
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/GoogleAnalyticsV2.node.ts b/packages/nodes-base/nodes/Google/Analytics/v2/GoogleAnalyticsV2.node.ts
index 7c42fdc246b72..1988e4e9889d2 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/GoogleAnalyticsV2.node.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/GoogleAnalyticsV2.node.ts
@@ -5,9 +5,10 @@ import type {
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { listSearch, loadOptions } from './methods';
+
 import { router } from './actions/router';
 import { versionDescription } from './actions/versionDescription';
+import { listSearch, loadOptions } from './methods';
 
 export class GoogleAnalyticsV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/Report.resource.ts b/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/Report.resource.ts
index 52fbee06eb5a4..49e14b91ec1d7 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/Report.resource.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/Report.resource.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as getga4 from './get.ga4.operation';
 import * as getuniversal from './get.universal.operation';
 
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/get.ga4.operation.ts b/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/get.ga4.operation.ts
index 2faea66ef0a91..738b5bc5470fb 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/get.ga4.operation.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/get.ga4.operation.ts
@@ -4,6 +4,13 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import {
+	dimensionDropdown,
+	dimensionFilterField,
+	metricDropdown,
+	metricsFilterField,
+} from './FiltersDescription';
 import {
 	checkDuplicates,
 	defaultEndDate,
@@ -13,12 +20,6 @@ import {
 	simplifyGA4,
 } from '../../helpers/utils';
 import { googleApiRequest, googleApiRequestAllItems } from '../../transport';
-import {
-	dimensionDropdown,
-	dimensionFilterField,
-	metricDropdown,
-	metricsFilterField,
-} from './FiltersDescription';
 
 export const description: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/get.universal.operation.ts b/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/get.universal.operation.ts
index 4027277123f90..df24f6bb126e2 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/get.universal.operation.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/get.universal.operation.ts
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
 import type { IData, IDimension, IMetric } from '../../helpers/Interfaces';
 import {
 	checkDuplicates,
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/actions/router.ts b/packages/nodes-base/nodes/Google/Analytics/v2/actions/router.ts
index 1d9cae99009a1..da3aa6526082f 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/actions/router.ts
@@ -2,8 +2,8 @@ import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
 import type { GoogleAnalytics, ReportBasedOnProperty } from './node.type';
-import * as userActivity from './userActivity/UserActivity.resource';
 import * as report from './report/Report.resource';
+import * as userActivity from './userActivity/UserActivity.resource';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	const items = this.getInputData();
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/actions/userActivity/UserActivity.resource.ts b/packages/nodes-base/nodes/Google/Analytics/v2/actions/userActivity/UserActivity.resource.ts
index bbb7e3613e577..11070dbc5b332 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/actions/userActivity/UserActivity.resource.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/actions/userActivity/UserActivity.resource.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as search from './search.operation';
 
 export { search };
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/actions/userActivity/search.operation.ts b/packages/nodes-base/nodes/Google/Analytics/v2/actions/userActivity/search.operation.ts
index 2fc8c9c368463..4c28b86139047 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/actions/userActivity/search.operation.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/actions/userActivity/search.operation.ts
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
 import { googleApiRequest, googleApiRequestAllItems } from '../../transport';
 
 export const description: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/actions/versionDescription.ts b/packages/nodes-base/nodes/Google/Analytics/v2/actions/versionDescription.ts
index 773eee9afb68a..fad6dfaa6514e 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/actions/versionDescription.ts
@@ -1,7 +1,8 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import { NodeConnectionType, type INodeTypeDescription } from 'n8n-workflow';
-import * as userActivity from './userActivity/UserActivity.resource';
+
 import * as report from './report/Report.resource';
+import * as userActivity from './userActivity/UserActivity.resource';
 
 export const versionDescription: INodeTypeDescription = {
 	displayName: 'Google Analytics',
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/helpers/utils.ts b/packages/nodes-base/nodes/Google/Analytics/v2/helpers/utils.ts
index d0fcde930d32d..4de28b9ca180c 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/helpers/utils.ts
@@ -1,3 +1,4 @@
+import { DateTime } from 'luxon';
 import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
@@ -6,7 +7,6 @@ import type {
 	INodePropertyOptions,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import { DateTime } from 'luxon';
 
 // tslint:disable-next-line:no-any
 export function simplify(responseData: any | [any]) {
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Google/Analytics/v2/methods/listSearch.ts
index ea060139bed9a..13b394b4a3ba9 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/methods/listSearch.ts
@@ -3,6 +3,7 @@ import type {
 	INodeListSearchItems,
 	INodeListSearchResult,
 } from 'n8n-workflow';
+
 import { sortLoadOptions } from '../helpers/utils';
 import { googleApiRequest } from '../transport';
 
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/Google/Analytics/v2/methods/loadOptions.ts
index 8a3ceffad121d..084c68efbee0b 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/methods/loadOptions.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/methods/loadOptions.ts
@@ -1,4 +1,5 @@
 import type { ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
+
 import { sortLoadOptions } from '../helpers/utils';
 import { googleApiRequest } from '../transport';
 
diff --git a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/executeQuery.test.ts b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/executeQuery.test.ts
index f7a0965d3d2ac..542f3206b1509 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/executeQuery.test.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/executeQuery.test.ts
@@ -1,10 +1,11 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../v2/transport';
 
 jest.mock('../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.autoMapMode.test.ts b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.autoMapMode.test.ts
index 4ee4627838cce..6a8effcb81835 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.autoMapMode.test.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.autoMapMode.test.ts
@@ -1,10 +1,11 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../v2/transport';
 
 jest.mock('../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.manualMode.test.ts b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.manualMode.test.ts
index f4d94dda8b963..4be27d3b3e475 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.manualMode.test.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.manualMode.test.ts
@@ -1,10 +1,11 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../v2/transport';
 
 jest.mock('../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Google/BigQuery/test/v2/utils/utils.test.ts b/packages/nodes-base/nodes/Google/BigQuery/test/v2/utils/utils.test.ts
index 454831014025d..1a8b53c80ab87 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/test/v2/utils/utils.test.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/test/v2/utils/utils.test.ts
@@ -1,6 +1,7 @@
-import type { IDataObject, IExecuteFunctions, INode } from 'n8n-workflow';
-import { constructExecutionMetaData } from 'n8n-core';
 import { mock } from 'jest-mock-extended';
+import { constructExecutionMetaData } from 'n8n-core';
+import type { IDataObject, IExecuteFunctions, INode } from 'n8n-workflow';
+
 import { prepareOutput } from '../../../v2/helpers/utils';
 
 describe('Google BigQuery v2 Utils', () => {
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v1/GenericFunctions.ts b/packages/nodes-base/nodes/Google/BigQuery/v1/GenericFunctions.ts
index d4456f318b2ca..cd2fa59d38b1e 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v1/GenericFunctions.ts
@@ -7,6 +7,7 @@ import type {
 	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
+
 import { getGoogleAccessToken } from '../../GenericFunctions';
 
 export async function googleApiRequest(
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v1/GoogleBigQueryV1.node.ts b/packages/nodes-base/nodes/Google/BigQuery/v1/GoogleBigQueryV1.node.ts
index 2d29b89ce70b7..160360ede3016 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v1/GoogleBigQueryV1.node.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v1/GoogleBigQueryV1.node.ts
@@ -10,15 +10,14 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeApiError } from 'n8n-workflow';
-
 import { v4 as uuid } from 'uuid';
-import { generatePairedItemData } from '../../../../utils/utilities';
-import { googleApiRequest, googleApiRequestAllItems, simplify } from './GenericFunctions';
-
-import { recordFields, recordOperations } from './RecordDescription';
 
 import { oldVersionNotice } from '@utils/descriptions';
 
+import { googleApiRequest, googleApiRequestAllItems, simplify } from './GenericFunctions';
+import { recordFields, recordOperations } from './RecordDescription';
+import { generatePairedItemData } from '../../../../utils/utilities';
+
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Google BigQuery',
 	name: 'googleBigQuery',
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/GoogleBigQueryV2.node.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/GoogleBigQueryV2.node.ts
index 9d55d463288a4..b3276e6904b54 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/GoogleBigQueryV2.node.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/GoogleBigQueryV2.node.ts
@@ -6,9 +6,9 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import { loadOptions, listSearch } from './methods';
-import { versionDescription } from './actions/versionDescription';
 import { router } from './actions/router';
+import { versionDescription } from './actions/versionDescription';
+import { loadOptions, listSearch } from './methods';
 
 export class GoogleBigQueryV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/Database.resource.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/Database.resource.ts
index 76aa6d612f2db..7686c890cf2aa 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/Database.resource.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/Database.resource.ts
@@ -1,7 +1,8 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { datasetRLC, projectRLC, tableRLC } from '../commonDescriptions/RLC.description';
-import * as insert from './insert.operation';
+
 import * as executeQuery from './executeQuery.operation';
+import * as insert from './insert.operation';
+import { datasetRLC, projectRLC, tableRLC } from '../commonDescriptions/RLC.description';
 
 export { executeQuery, insert };
 
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/executeQuery.operation.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/executeQuery.operation.ts
index a361a3517e318..38dcb91f3a520 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/executeQuery.operation.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/executeQuery.operation.ts
@@ -4,13 +4,13 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-
 import { ApplicationError, NodeOperationError, sleep } from 'n8n-workflow';
-import type { ResponseWithJobReference } from '../../helpers/interfaces';
 
+import { getResolvables, updateDisplayOptions } from '@utils/utilities';
+
+import type { ResponseWithJobReference } from '../../helpers/interfaces';
 import { prepareOutput } from '../../helpers/utils';
 import { googleBigQueryApiRequestAllItems, googleBigQueryApiRequest } from '../../transport';
-import { getResolvables, updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/insert.operation.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/insert.operation.ts
index 18d53996c1c9a..c0c197d96b533 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/insert.operation.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/insert.operation.ts
@@ -6,10 +6,12 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 import { v4 as uuid } from 'uuid';
+
+import { generatePairedItemData, updateDisplayOptions } from '@utils/utilities';
+
 import type { TableSchema } from '../../helpers/interfaces';
 import { checkSchema, wrapData } from '../../helpers/utils';
 import { googleBigQueryApiRequest } from '../../transport';
-import { generatePairedItemData, updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/router.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/router.ts
index 9b6d45aa245a5..96276b487b0c3 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/router.ts
@@ -1,8 +1,8 @@
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import type { GoogleBigQuery } from './node.type';
 
 import * as record from './database/Database.resource';
+import type { GoogleBigQuery } from './node.type';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	const resource = this.getNodeParameter<GoogleBigQuery>('resource', 0);
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/versionDescription.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/versionDescription.ts
index 202c26d88c70c..8e30e9ac1f2db 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/versionDescription.ts
@@ -1,5 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import { NodeConnectionType, type INodeTypeDescription } from 'n8n-workflow';
+
 import * as database from './database/Database.resource';
 
 export const versionDescription: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/helpers/utils.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/helpers/utils.ts
index 34fd023c6e2e1..5030a846b248c 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/helpers/utils.ts
@@ -1,6 +1,7 @@
 import { DateTime } from 'luxon';
 import type { IDataObject, IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { jsonParse, NodeOperationError } from 'n8n-workflow';
+
 import type { SchemaField, TableRawData, TableSchema } from './interfaces';
 
 function getFieldValue(schemaField: SchemaField, field: IDataObject, parseTimestamps = false) {
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/methods/listSearch.ts
index 2fb7cae03b3c7..1d0ccc863c4ae 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/methods/listSearch.ts
@@ -1,4 +1,5 @@
 import type { IDataObject, ILoadOptionsFunctions, INodeListSearchResult } from 'n8n-workflow';
+
 import { googleBigQueryApiRequest } from '../transport';
 
 export async function searchProjects(
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/methods/loadOptions.ts
index 7b69f91570510..91e6f694c7cd5 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/methods/loadOptions.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/methods/loadOptions.ts
@@ -1,4 +1,5 @@
 import type { IDataObject, ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
+
 import { googleBigQueryApiRequest } from '../transport';
 
 export async function getDatasets(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/transport/index.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/transport/index.ts
index 0f121b2a09259..91359dd35d6c3 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/transport/index.ts
@@ -7,6 +7,7 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
+
 import { getGoogleAccessToken } from '../../../GenericFunctions';
 
 export async function googleBigQueryApiRequest(
diff --git a/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts
index 7b64332747398..4f66901ae2f96 100644
--- a/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts
@@ -7,6 +7,7 @@ import type {
 	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
+
 import { getGoogleAccessToken } from '../GenericFunctions';
 
 export async function googleApiRequest(
diff --git a/packages/nodes-base/nodes/Google/Calendar/CalendarDescription.ts b/packages/nodes-base/nodes/Google/Calendar/CalendarDescription.ts
index 68725c010ecca..d2d2950f17193 100644
--- a/packages/nodes-base/nodes/Google/Calendar/CalendarDescription.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/CalendarDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { TIMEZONE_VALIDATION_REGEX } from './GenericFunctions';
 
 export const calendarOperations: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts
index 819e67cd4665d..f440efaee9d4b 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -10,8 +11,6 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
-
-import moment from 'moment-timezone';
 import { RRule } from 'rrule';
 
 export async function googleApiRequest(
@@ -40,7 +39,6 @@ export async function googleApiRequest(
 		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'googleCalendarOAuth2Api', options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
index 93866afaf9f7c..189f737888623 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,9 +10,11 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeApiError, NodeOperationError } from 'n8n-workflow';
-
-import moment from 'moment-timezone';
 import { v4 as uuid } from 'uuid';
+
+import { calendarFields, calendarOperations } from './CalendarDescription';
+import { eventFields, eventOperations } from './EventDescription';
+import type { IEvent } from './EventInterface';
 import {
 	addNextOccurrence,
 	addTimezoneToDate,
@@ -22,12 +25,6 @@ import {
 	googleApiRequestAllItems,
 } from './GenericFunctions';
 
-import { eventFields, eventOperations } from './EventDescription';
-
-import { calendarFields, calendarOperations } from './CalendarDescription';
-
-import type { IEvent } from './EventInterface';
-
 export class GoogleCalendar implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Google Calendar',
@@ -536,7 +533,7 @@ export class GoogleCalendar implements INodeType {
 									body.attendees?.push(attendee);
 								});
 							}
-							(attendees as string[]).forEach((attendee) => {
+							attendees.forEach((attendee) => {
 								body.attendees!.push.apply(
 									body.attendees,
 									attendee
diff --git a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendarTrigger.node.ts b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendarTrigger.node.ts
index 30c890487aa2f..5a6f1fab7dd59 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendarTrigger.node.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendarTrigger.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IDataObject,
 	INodeExecutionData,
@@ -7,8 +8,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
 import {
 	encodeURIComponentOnce,
 	getCalendars,
diff --git a/packages/nodes-base/nodes/Google/Calendar/test/node/event.update.test.ts b/packages/nodes-base/nodes/Google/Calendar/test/node/event.update.test.ts
index 39fa8a3b0a1b5..b242c73063c61 100644
--- a/packages/nodes-base/nodes/Google/Calendar/test/node/event.update.test.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/test/node/event.update.test.ts
@@ -2,9 +2,8 @@ import type { MockProxy } from 'jest-mock-extended';
 import { mock } from 'jest-mock-extended';
 import type { INode, IExecuteFunctions } from 'n8n-workflow';
 
-import { GoogleCalendar } from '../../GoogleCalendar.node';
-
 import * as genericFunctions from '../../GenericFunctions';
+import { GoogleCalendar } from '../../GoogleCalendar.node';
 
 jest.mock('../../GenericFunctions', () => ({
 	getTimezones: jest.fn(),
diff --git a/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.ts b/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.ts
index 4501b7b7df3a9..7a66126762c16 100644
--- a/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.ts
+++ b/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.ts
@@ -1,3 +1,5 @@
+import jwt from 'jsonwebtoken';
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	ICredentialsDecrypted,
@@ -13,10 +15,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-import jwt from 'jsonwebtoken';
-import type { IMessage, IMessageUi } from './MessageInterface';
-
 import {
 	// attachmentFields,
 	// attachmentOperations,
@@ -31,8 +29,8 @@ import {
 	spaceFields,
 	spaceOperations,
 } from './descriptions';
-
 import { googleApiRequest, googleApiRequestAllItems, validateJSON } from './GenericFunctions';
+import type { IMessage, IMessageUi } from './MessageInterface';
 
 export class GoogleChat implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GenericFunctions.ts b/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GenericFunctions.ts
index 58cb39c8b0b08..c9f4ebd7f8a02 100644
--- a/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GenericFunctions.ts
@@ -36,7 +36,6 @@ export async function googleApiRequest(
 		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(
 			this,
 			'googleCloudNaturalLanguageOAuth2Api',
diff --git a/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GoogleCloudNaturalLanguage.node.ts b/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GoogleCloudNaturalLanguage.node.ts
index 25c7ad6266593..674302b3d021b 100644
--- a/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GoogleCloudNaturalLanguage.node.ts
+++ b/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GoogleCloudNaturalLanguage.node.ts
@@ -6,9 +6,8 @@ import {
 	type INodeTypeDescription,
 } from 'n8n-workflow';
 
-import type { IData } from './Interface';
-
 import { googleApiRequest } from './GenericFunctions';
+import type { IData } from './Interface';
 
 export class GoogleCloudNaturalLanguage implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Google/CloudStorage/ObjectDescription.ts b/packages/nodes-base/nodes/Google/CloudStorage/ObjectDescription.ts
index a4378515b96c0..0ccf88ee8b2e5 100644
--- a/packages/nodes-base/nodes/Google/CloudStorage/ObjectDescription.ts
+++ b/packages/nodes-base/nodes/Google/CloudStorage/ObjectDescription.ts
@@ -1,4 +1,3 @@
-import type { Readable } from 'stream';
 import FormData from 'form-data';
 import {
 	BINARY_ENCODING,
@@ -6,6 +5,7 @@ import {
 	type INodeExecutionData,
 	type INodeProperties,
 } from 'n8n-workflow';
+import type { Readable } from 'stream';
 
 // Define these because we'll be using them in two separate places
 const metagenerationFilters: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts
index 6c07a1a0daedb..0ab273c1277b2 100644
--- a/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts
@@ -36,7 +36,6 @@ export async function googleApiRequest(
 			delete options.body;
 		}
 
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'googleContactsOAuth2Api', options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts b/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts
index 7b2bfa361678a..a6da7b13fbe35 100644
--- a/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts
+++ b/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,7 +10,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
+import { contactFields, contactOperations } from './ContactDescription';
 import {
 	allFields,
 	cleanData,
@@ -17,8 +18,6 @@ import {
 	googleApiRequestAllItems,
 } from './GenericFunctions';
 
-import { contactFields, contactOperations } from './ContactDescription';
-
 export class GoogleContacts implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Google Contacts',
diff --git a/packages/nodes-base/nodes/Google/Docs/GoogleDocs.node.ts b/packages/nodes-base/nodes/Google/Docs/GoogleDocs.node.ts
index 2c5fb28682ee8..f8647cabda4d6 100644
--- a/packages/nodes-base/nodes/Google/Docs/GoogleDocs.node.ts
+++ b/packages/nodes-base/nodes/Google/Docs/GoogleDocs.node.ts
@@ -10,6 +10,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeConnectionType } from 'n8n-workflow';
 
+import { documentFields, documentOperations } from './DocumentDescription';
 import {
 	extractID,
 	googleApiRequest,
@@ -17,9 +18,6 @@ import {
 	hasKeys,
 	upperFirst,
 } from './GenericFunctions';
-
-import { documentFields, documentOperations } from './DocumentDescription';
-
 import type { IUpdateBody, IUpdateFields } from './interfaces';
 
 export class GoogleDocs implements INodeType {
diff --git a/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts b/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts
index 68c04b8799d5a..b41d548796275 100644
--- a/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts
+++ b/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IPollFunctions,
 	IDataObject,
@@ -9,10 +10,9 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeApiError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-import { GOOGLE_DRIVE_FILE_URL_REGEX, GOOGLE_DRIVE_FOLDER_URL_REGEX } from '../constants';
 import { extractId, googleApiRequest, googleApiRequestAllItems } from './v1/GenericFunctions';
 import { fileSearch, folderSearch } from './v2/methods/listSearch';
+import { GOOGLE_DRIVE_FILE_URL_REGEX, GOOGLE_DRIVE_FOLDER_URL_REGEX } from '../constants';
 
 export class GoogleDriveTrigger implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/create.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/create.test.ts
index 42a17bfdad3cb..7053c241656fd 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/create.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/create.test.ts
@@ -1,9 +1,7 @@
 import nock from 'nock';
 
 import * as create from '../../../../v2/actions/drive/create.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/deleteDrive.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/deleteDrive.test.ts
index b249195a8a12e..05b5002ab58bd 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/deleteDrive.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/deleteDrive.test.ts
@@ -1,9 +1,7 @@
 import nock from 'nock';
 
 import * as deleteDrive from '../../../../v2/actions/drive/deleteDrive.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/get.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/get.test.ts
index 55cb301fcca05..128b74a2201cd 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/get.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/get.test.ts
@@ -1,9 +1,7 @@
 import nock from 'nock';
 
 import * as get from '../../../../v2/actions/drive/get.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/list.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/list.test.ts
index 8865e7b303365..ca8e6deb10adb 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/list.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/list.test.ts
@@ -1,10 +1,8 @@
-import nock from 'nock';
 import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
 
 import * as list from '../../../../v2/actions/drive/list.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/update.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/update.test.ts
index d60521cf0057f..afa01998b8229 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/update.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/update.test.ts
@@ -1,9 +1,7 @@
 import nock from 'nock';
 
 import * as update from '../../../../v2/actions/drive/update.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/copy.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/copy.test.ts
index ddc4891cbf0ee..18812ba157db8 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/copy.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/copy.test.ts
@@ -1,9 +1,7 @@
 import nock from 'nock';
 
 import * as copy from '../../../../v2/actions/file/copy.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/createFromText.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/createFromText.test.ts
index 040c9aa8806c0..5fc45c8d9827d 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/createFromText.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/createFromText.test.ts
@@ -1,9 +1,7 @@
 import nock from 'nock';
 
 import * as createFromText from '../../../../v2/actions/file/createFromText.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/deleteFile.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/deleteFile.test.ts
index cbfd2edf6b70b..13fb7ae791569 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/deleteFile.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/deleteFile.test.ts
@@ -1,9 +1,7 @@
 import nock from 'nock';
 
 import * as deleteFile from '../../../../v2/actions/file/deleteFile.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/download.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/download.test.ts
index 3061f74953418..e7f4be6294678 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/download.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/download.test.ts
@@ -1,9 +1,7 @@
 import nock from 'nock';
 
 import * as download from '../../../../v2/actions/file/download.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/move.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/move.test.ts
index 51196a28581ec..03498e06ec784 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/move.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/move.test.ts
@@ -1,10 +1,8 @@
-import nock from 'nock';
 import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
 
 import * as move from '../../../../v2/actions/file/move.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/share.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/share.test.ts
index c7111f4e94bfc..e8ed98a124155 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/share.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/share.test.ts
@@ -1,9 +1,7 @@
 import nock from 'nock';
 
 import * as share from '../../../../v2/actions/file/share.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/update.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/update.test.ts
index 868f727a47e3a..a8dbfa55708a8 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/update.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/update.test.ts
@@ -1,9 +1,7 @@
 import nock from 'nock';
 
 import * as update from '../../../../v2/actions/file/update.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/upload.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/upload.test.ts
index 80446db6ce91c..fa39890cb78e3 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/upload.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/upload.test.ts
@@ -1,11 +1,9 @@
-import nock from 'nock';
 import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
 
 import * as upload from '../../../../v2/actions/file/upload.operation';
-
-import * as transport from '../../../../v2/transport';
 import * as utils from '../../../../v2/helpers/utils';
-
+import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction, createTestStream, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/fileFolder/search.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/fileFolder/search.test.ts
index f971edfc30ff7..630bd9469defc 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/fileFolder/search.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/fileFolder/search.test.ts
@@ -1,10 +1,8 @@
-import nock from 'nock';
 import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
 
 import * as search from '../../../../v2/actions/fileFolder/search.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/create.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/create.test.ts
index ec3c17b287aef..26855b6e5c47d 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/create.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/create.test.ts
@@ -1,9 +1,7 @@
 import nock from 'nock';
 
 import * as create from '../../../../v2/actions/folder/create.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/deleteFolder.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/deleteFolder.test.ts
index 36c2f0abc265a..ed486720f9be6 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/deleteFolder.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/deleteFolder.test.ts
@@ -1,9 +1,7 @@
 import nock from 'nock';
 
 import * as deleteFolder from '../../../../v2/actions/folder/deleteFolder.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/share.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/share.test.ts
index 0f1692caac822..4940b6b90af62 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/share.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/share.test.ts
@@ -1,9 +1,7 @@
 import nock from 'nock';
 
 import * as share from '../../../../v2/actions/folder/share.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/helpers.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/helpers.ts
index 522f28afdb081..780de933af3ae 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/helpers.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/helpers.ts
@@ -1,7 +1,6 @@
-import type { IDataObject, IExecuteFunctions, IGetNodeParameterOptions, INode } from 'n8n-workflow';
-
 import { get } from 'lodash';
 import { constructExecutionMetaData, returnJsonArray } from 'n8n-core';
+import type { IDataObject, IExecuteFunctions, IGetNodeParameterOptions, INode } from 'n8n-workflow';
 import { Readable } from 'stream';
 
 export const driveNode: INode = {
diff --git a/packages/nodes-base/nodes/Google/Drive/v1/GoogleDriveV1.node.ts b/packages/nodes-base/nodes/Google/Drive/v1/GoogleDriveV1.node.ts
index f34426e065eec..61e510ccbeca3 100644
--- a/packages/nodes-base/nodes/Google/Drive/v1/GoogleDriveV1.node.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v1/GoogleDriveV1.node.ts
@@ -1,4 +1,3 @@
-import type { Readable } from 'stream';
 import type {
 	IBinaryKeyData,
 	IDataObject,
@@ -9,15 +8,15 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { BINARY_ENCODING, NodeConnectionType } from 'n8n-workflow';
-
+import type { Readable } from 'stream';
 import { v4 as uuid } from 'uuid';
-import { GOOGLE_DRIVE_FILE_URL_REGEX, GOOGLE_DRIVE_FOLDER_URL_REGEX } from '../../constants';
-import { googleApiRequest, googleApiRequestAllItems } from './GenericFunctions';
-
-import { driveSearch, fileSearch, folderSearch } from './SearchFunctions';
 
 import { oldVersionNotice } from '@utils/descriptions';
 
+import { googleApiRequest, googleApiRequestAllItems } from './GenericFunctions';
+import { driveSearch, fileSearch, folderSearch } from './SearchFunctions';
+import { GOOGLE_DRIVE_FILE_URL_REGEX, GOOGLE_DRIVE_FOLDER_URL_REGEX } from '../../constants';
+
 const UPLOAD_CHUNK_SIZE = 256 * 1024;
 
 const versionDescription: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Google/Drive/v1/SearchFunctions.ts b/packages/nodes-base/nodes/Google/Drive/v1/SearchFunctions.ts
index 41c4da16ea87f..fa6f3894c864f 100644
--- a/packages/nodes-base/nodes/Google/Drive/v1/SearchFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v1/SearchFunctions.ts
@@ -1,4 +1,5 @@
 import type { ILoadOptionsFunctions, INodeListSearchResult } from 'n8n-workflow';
+
 import { googleApiRequest } from './GenericFunctions';
 
 interface GoogleDriveFilesItem {
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/GoogleDriveV2.node.ts b/packages/nodes-base/nodes/Google/Drive/v2/GoogleDriveV2.node.ts
index 5e147d81bf235..d2b7e5fa6b79c 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/GoogleDriveV2.node.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/GoogleDriveV2.node.ts
@@ -5,9 +5,9 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import { router } from './actions/router';
 import { versionDescription } from './actions/versionDescription';
 import { listSearch } from './methods';
-import { router } from './actions/router';
 
 export class GoogleDriveV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/common.descriptions.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/common.descriptions.ts
index acdd2780d186f..773f1cf9c3a49 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/common.descriptions.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/common.descriptions.ts
@@ -1,6 +1,7 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { DRIVE, RLC_DRIVE_DEFAULT } from '../helpers/interfaces';
+
 import { GOOGLE_DRIVE_FILE_URL_REGEX, GOOGLE_DRIVE_FOLDER_URL_REGEX } from '../../../constants';
+import { DRIVE, RLC_DRIVE_DEFAULT } from '../helpers/interfaces';
 
 export const fileRLC: INodeProperties = {
 	displayName: 'File',
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/create.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/create.operation.ts
index b5f7980c6970c..fe72effcb34a1 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/create.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/create.operation.ts
@@ -4,11 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-
 import { v4 as uuid } from 'uuid';
-import { googleApiRequest } from '../../transport';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { googleApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	{
 		displayName: 'Name',
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/deleteDrive.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/deleteDrive.operation.ts
index 1c63a0f1fe642..309d997c4f64c 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/deleteDrive.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/deleteDrive.operation.ts
@@ -1,8 +1,9 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { googleApiRequest } from '../../transport';
 import { sharedDriveRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/get.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/get.operation.ts
index 1ccf2bd745e48..eedbdf5d74626 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/get.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/get.operation.ts
@@ -5,9 +5,10 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { googleApiRequest } from '../../transport';
 import { sharedDriveRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/list.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/list.operation.ts
index d2cd34e901a63..2d6c098f87d82 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/list.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/list.operation.ts
@@ -5,9 +5,10 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { googleApiRequest, googleApiRequestAllItems } from '../../transport';
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { googleApiRequest, googleApiRequestAllItems } from '../../transport';
+
 const properties: INodeProperties[] = [
 	{
 		displayName: 'Return All',
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/update.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/update.operation.ts
index d80be9968ba84..59ba5075a967b 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/update.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/update.operation.ts
@@ -5,9 +5,10 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { googleApiRequest } from '../../transport';
 import { sharedDriveRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/copy.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/copy.operation.ts
index e019c7c55517c..f181b47d81cf3 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/copy.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/copy.operation.ts
@@ -6,10 +6,11 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { setParentFolder } from '../../helpers/utils';
 import { googleApiRequest } from '../../transport';
 import { driveRLC, fileRLC, folderRLC } from '../common.descriptions';
-import { setParentFolder } from '../../helpers/utils';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/createFromText.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/createFromText.operation.ts
index d9c92a972aa35..e89233fcaf91f 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/createFromText.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/createFromText.operation.ts
@@ -5,11 +5,12 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { driveRLC, folderRLC, updateCommonOptions } from '../common.descriptions';
-import { googleApiRequest } from '../../transport';
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { DRIVE } from '../../helpers/interfaces';
 import { setFileProperties, setParentFolder, setUpdateCommonParams } from '../../helpers/utils';
-import { updateDisplayOptions } from '@utils/utilities';
+import { googleApiRequest } from '../../transport';
+import { driveRLC, folderRLC, updateCommonOptions } from '../common.descriptions';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/deleteFile.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/deleteFile.operation.ts
index af8f03839d133..cd1aad328c049 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/deleteFile.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/deleteFile.operation.ts
@@ -1,8 +1,9 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { googleApiRequest } from '../../transport';
 import { fileRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/download.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/download.operation.ts
index 55e1124c58cf7..1f011e5c0738c 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/download.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/download.operation.ts
@@ -6,9 +6,10 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { googleApiRequest } from '../../transport';
 import { fileRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/move.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/move.operation.ts
index d6770f596c963..4c1ab04de99eb 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/move.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/move.operation.ts
@@ -5,11 +5,12 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { driveRLC, fileRLC, folderRLC } from '../common.descriptions';
-import { googleApiRequest } from '../../transport';
-import { setParentFolder } from '../../helpers/utils';
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { setParentFolder } from '../../helpers/utils';
+import { googleApiRequest } from '../../transport';
+import { driveRLC, fileRLC, folderRLC } from '../common.descriptions';
+
 const properties: INodeProperties[] = [
 	{
 		...fileRLC,
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/share.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/share.operation.ts
index 93a5fe77d3d21..7fb017ec6ce47 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/share.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/share.operation.ts
@@ -5,9 +5,10 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { googleApiRequest } from '../../transport';
 import { fileRLC, permissionsOptions, shareOptions } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/update.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/update.operation.ts
index 27f19e8b61922..933fa3b46f53a 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/update.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/update.operation.ts
@@ -6,6 +6,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import {
 	getItemBinaryData,
 	prepareQueryString,
@@ -14,7 +16,6 @@ import {
 } from '../../helpers/utils';
 import { googleApiRequest } from '../../transport';
 import { fileRLC, updateCommonOptions } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/upload.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/upload.operation.ts
index f81dc3478e673..c54820477239c 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/upload.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/upload.operation.ts
@@ -5,8 +5,8 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { googleApiRequest } from '../../transport';
-import { driveRLC, folderRLC, updateCommonOptions } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
 import {
 	getItemBinaryData,
 	setFileProperties,
@@ -14,7 +14,8 @@ import {
 	setParentFolder,
 	processInChunks,
 } from '../../helpers/utils';
-import { updateDisplayOptions } from '@utils/utilities';
+import { googleApiRequest } from '../../transport';
+import { driveRLC, folderRLC, updateCommonOptions } from '../common.descriptions';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/fileFolder/search.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/fileFolder/search.operation.ts
index 8774216197446..36dc97fbb8883 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/fileFolder/search.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/fileFolder/search.operation.ts
@@ -5,12 +5,13 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { driveRLC, fileTypesOptions, folderRLC } from '../common.descriptions';
-import { googleApiRequest, googleApiRequestAllItems } from '../../transport';
-import { prepareQueryString, updateDriveScopes } from '../../helpers/utils';
+import { updateDisplayOptions } from '@utils/utilities';
+
 import type { SearchFilter } from '../../helpers/interfaces';
 import { DRIVE, RLC_FOLDER_DEFAULT } from '../../helpers/interfaces';
-import { updateDisplayOptions } from '@utils/utilities';
+import { prepareQueryString, updateDriveScopes } from '../../helpers/utils';
+import { googleApiRequest, googleApiRequestAllItems } from '../../transport';
+import { driveRLC, fileTypesOptions, folderRLC } from '../common.descriptions';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/create.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/create.operation.ts
index 9b5e845d9286f..bbe0c24f3dac0 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/create.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/create.operation.ts
@@ -5,11 +5,12 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { googleApiRequest } from '../../transport';
-import { driveRLC, folderRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { DRIVE } from '../../helpers/interfaces';
 import { setParentFolder } from '../../helpers/utils';
-import { updateDisplayOptions } from '@utils/utilities';
+import { googleApiRequest } from '../../transport';
+import { driveRLC, folderRLC } from '../common.descriptions';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/deleteFolder.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/deleteFolder.operation.ts
index ed85388da6d9d..f6ef7f51e4713 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/deleteFolder.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/deleteFolder.operation.ts
@@ -1,8 +1,9 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { googleApiRequest } from '../../transport';
 import { folderNoRootRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/share.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/share.operation.ts
index a3908b2c293ef..3b4abfacaf96a 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/share.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/share.operation.ts
@@ -5,9 +5,10 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { googleApiRequest } from '../../transport';
 import { folderNoRootRLC, permissionsOptions, shareOptions } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/router.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/router.ts
index feffd170d9eb0..917e51e1199d9 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/router.ts
@@ -1,12 +1,11 @@
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import type { GoogleDriveType } from './node.type';
-
 import * as drive from './drive/Drive.resource';
 import * as file from './file/File.resource';
 import * as fileFolder from './fileFolder/FileFolder.resource';
 import * as folder from './folder/Folder.resource';
+import type { GoogleDriveType } from './node.type';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	const items = this.getInputData();
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/helpers/utils.ts b/packages/nodes-base/nodes/Google/Drive/v2/helpers/utils.ts
index a31f85beeb20c..aebdf5ae429ea 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/helpers/utils.ts
@@ -1,6 +1,6 @@
-import type { Readable } from 'stream';
 import type { IDataObject, IExecuteFunctions } from 'n8n-workflow';
 import { BINARY_ENCODING, NodeOperationError } from 'n8n-workflow';
+import type { Readable } from 'stream';
 
 import { RLC_DRIVE_DEFAULT, RLC_FOLDER_DEFAULT, UPLOAD_CHUNK_SIZE } from './interfaces';
 
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Google/Drive/v2/methods/listSearch.ts
index c31502cfcc2fe..ec1fc6cf1d616 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/methods/listSearch.ts
@@ -4,10 +4,11 @@ import type {
 	INodeListSearchItems,
 	INodeListSearchResult,
 } from 'n8n-workflow';
-import { googleApiRequest } from '../transport';
+
 import type { SearchFilter } from '../helpers/interfaces';
 import { DRIVE, RLC_DRIVE_DEFAULT, RLC_FOLDER_DEFAULT } from '../helpers/interfaces';
 import { updateDriveScopes } from '../helpers/utils';
+import { googleApiRequest } from '../transport';
 
 interface FilesItem {
 	id: string;
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/transport/index.ts b/packages/nodes-base/nodes/Google/Drive/v2/transport/index.ts
index 13d20a99acaf4..04c5b459e9353 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/transport/index.ts
@@ -8,6 +8,7 @@ import type {
 	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
+
 import { getGoogleAccessToken } from '../../../GenericFunctions';
 
 export async function googleApiRequest(
diff --git a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts
index 5ac452f728778..672b7d1ada36c 100644
--- a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
@@ -8,7 +9,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import { getGoogleAccessToken } from '../../GenericFunctions';
 
 export async function googleApiRequest(
@@ -49,7 +49,6 @@ export async function googleApiRequest(
 			(options.headers as IDataObject).Authorization = `Bearer ${access_token}`;
 		}
 
-		//@ts-ignore
 		return await this.helpers.requestWithAuthentication.call(this, credentialType, options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GoogleFirebaseCloudFirestore.node.ts b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GoogleFirebaseCloudFirestore.node.ts
index fdb80509fbf15..d7a3a40d61ab9 100644
--- a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GoogleFirebaseCloudFirestore.node.ts
+++ b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GoogleFirebaseCloudFirestore.node.ts
@@ -9,17 +9,15 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, jsonParse } from 'n8n-workflow';
 
-import { generatePairedItemData } from '../../../../utils/utilities';
+import { collectionFields, collectionOperations } from './CollectionDescription';
+import { documentFields, documentOperations } from './DocumentDescription';
 import {
 	fullDocumentToJson,
 	googleApiRequest,
 	googleApiRequestAllItems,
 	jsonToDocument,
 } from './GenericFunctions';
-
-import { collectionFields, collectionOperations } from './CollectionDescription';
-
-import { documentFields, documentOperations } from './DocumentDescription';
+import { generatePairedItemData } from '../../../../utils/utilities';
 
 export class GoogleFirebaseCloudFirestore implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts b/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts
index 455c65dae36d3..cb2593c83cd79 100644
--- a/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts
+++ b/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts
@@ -10,10 +10,8 @@ import type {
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
 import { googleApiRequest, googleApiRequestAllItems } from './GenericFunctions';
-
-import { userFields, userOperations } from './UserDescription';
-
 import { groupFields, groupOperations } from './GroupDescripion';
+import { userFields, userOperations } from './UserDescription';
 
 export class GSuiteAdmin implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Google/GSuiteAdmin/GenericFunctions.ts b/packages/nodes-base/nodes/Google/GSuiteAdmin/GenericFunctions.ts
index 7f30fe6812e29..1e3d85aae52ba 100644
--- a/packages/nodes-base/nodes/Google/GSuiteAdmin/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/GSuiteAdmin/GenericFunctions.ts
@@ -35,7 +35,6 @@ export async function googleApiRequest(
 		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'gSuiteAdminOAuth2Api', options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/Google/GenericFunctions.ts b/packages/nodes-base/nodes/Google/GenericFunctions.ts
index 4a893ded009a5..6bbb177a54d5d 100644
--- a/packages/nodes-base/nodes/Google/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/GenericFunctions.ts
@@ -1,3 +1,6 @@
+import * as jwt from 'jsonwebtoken';
+import { DateTime } from 'luxon';
+import moment from 'moment-timezone';
 import {
 	type IExecuteFunctions,
 	type ILoadOptionsFunctions,
@@ -8,11 +11,7 @@ import {
 	NodeOperationError,
 } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-import * as jwt from 'jsonwebtoken';
-
 import { formatPrivateKey } from '@utils/utilities';
-import { DateTime } from 'luxon';
 
 const googleServiceAccountScopes = {
 	bigquery: ['https://www.googleapis.com/auth/bigquery'],
diff --git a/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
index e856174b38bb9..6993ab1930e60 100644
--- a/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
@@ -1,5 +1,6 @@
+import isEmpty from 'lodash/isEmpty';
+import { DateTime } from 'luxon';
 import { simpleParser } from 'mailparser';
-
 import type {
 	IBinaryKeyData,
 	IDataObject,
@@ -13,10 +14,11 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
+import MailComposer from 'nodemailer/lib/mail-composer';
 
-import { DateTime } from 'luxon';
-
-import isEmpty from 'lodash/isEmpty';
+import type { IEmail } from '../../../utils/sendAndWait/interfaces';
+import { escapeHtml } from '../../../utils/utilities';
+import { getGoogleAccessToken } from '../GenericFunctions';
 
 export interface IAttachments {
 	type: string;
@@ -24,11 +26,6 @@ export interface IAttachments {
 	content: string;
 }
 
-import MailComposer from 'nodemailer/lib/mail-composer';
-import { getGoogleAccessToken } from '../GenericFunctions';
-import { escapeHtml } from '../../../utils/utilities';
-import type { IEmail } from '../../../utils/sendAndWait/interfaces';
-
 export async function googleApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
 	method: IHttpRequestMethods,
diff --git a/packages/nodes-base/nodes/Google/Gmail/Gmail.node.json b/packages/nodes-base/nodes/Google/Gmail/Gmail.node.json
index f55b13a1667db..878e9c06778ee 100644
--- a/packages/nodes-base/nodes/Google/Gmail/Gmail.node.json
+++ b/packages/nodes-base/nodes/Google/Gmail/Gmail.node.json
@@ -52,5 +52,5 @@
 			}
 		]
 	},
-	"alias": ["email"]
+	"alias": ["email", "human", "form", "wait"]
 }
diff --git a/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.ts b/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.ts
index 9fcac0e41dca3..b82a578b94ca5 100644
--- a/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.ts
@@ -1,3 +1,4 @@
+import { DateTime } from 'luxon';
 import type {
 	IPollFunctions,
 	IDataObject,
@@ -9,7 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { DateTime } from 'luxon';
 import {
 	googleApiRequest,
 	googleApiRequestAllItems,
diff --git a/packages/nodes-base/nodes/Google/Gmail/test/GmailTrigger.test.ts b/packages/nodes-base/nodes/Google/Gmail/test/GmailTrigger.test.ts
index 4cd2ae0742948..9ab54ece28607 100644
--- a/packages/nodes-base/nodes/Google/Gmail/test/GmailTrigger.test.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/test/GmailTrigger.test.ts
@@ -1,5 +1,5 @@
-import nock from 'nock';
 import * as mailparser from 'mailparser';
+import nock from 'nock';
 
 import { testPollingTriggerNode } from '@test/nodes/TriggerHelpers';
 
diff --git a/packages/nodes-base/nodes/Google/Gmail/test/v2/GmailV2.node.test.ts b/packages/nodes-base/nodes/Google/Gmail/test/v2/GmailV2.node.test.ts
new file mode 100644
index 0000000000000..b14fe8132c3b8
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/test/v2/GmailV2.node.test.ts
@@ -0,0 +1,396 @@
+/* eslint-disable n8n-nodes-base/node-param-display-name-miscased */
+import { mock, mockDeep } from 'jest-mock-extended';
+import { jsonParse, type ILoadOptionsFunctions, type INode } from 'n8n-workflow';
+import nock from 'nock';
+
+import { testWorkflows } from '@test/nodes/Helpers';
+
+import labels from './fixtures/labels.json';
+import messages from './fixtures/messages.json';
+import { getGmailAliases, getLabels, getThreadMessages } from '../../v2/loadOptions';
+
+describe('Test Gmail Node v2', () => {
+	beforeAll(() => {
+		jest
+			.useFakeTimers({ doNotFake: ['setImmediate', 'nextTick'] })
+			.setSystemTime(new Date('2024-12-16 12:34:56.789Z'));
+
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.resetAllMocks();
+	});
+
+	describe('Messages', () => {
+		const gmailNock = nock('https://www.googleapis.com/gmail');
+
+		beforeAll(() => {
+			gmailNock.get('/v1/users/me/messages').query({ maxResults: 2 }).reply(200, {
+				messages,
+			});
+			gmailNock
+				.get('/v1/users/me/messages')
+				.query({
+					includeSpamTrash: 'true',
+					labelIds: 'CHAT',
+					q: 'test from:Test Sender after:1734393600 before:1735171200',
+					readStatus: 'both',
+					dataPropertyAttachmentsPrefixName: 'attachment_',
+					downloadAttachments: 'true',
+					maxResults: '2',
+				})
+				.reply(200, { messages });
+			gmailNock
+				.get('/v1/users/me/messages/a1b2c3d4e5f6g7h8')
+				.query({
+					maxResults: '2',
+					format: 'metadata',
+					metadataHeaders: ['From', 'To', 'Cc', 'Bcc', 'Subject'],
+				})
+				.reply(200, messages[0]);
+			gmailNock
+				.get('/v1/users/me/messages/a1b2c3d4e5f6g7h8')
+				.query({
+					includeSpamTrash: 'true',
+					labelIds: 'CHAT',
+					q: 'test from:Test Sender after:1734393600 before:1735171200',
+					readStatus: 'both',
+					dataPropertyAttachmentsPrefixName: 'attachment_',
+					downloadAttachments: 'true',
+					maxResults: '2',
+					format: 'raw',
+				})
+				.reply(200, {
+					...messages[0],
+					raw: 'TUlNRS1WZXJzaW9uOiAxLjANCkRhdGU6IEZyaSwgMTMgRGVjIDIwMjQgMTE6MTU6MDEgKzAxMDANCk1lc3NhZ2UtSUQ6IDxDQUVHQVByb3d1ZEduS1h4cXJoTWpPdXhhbVRoN3lBcmp3UDdPRDlVQnEtSnBrYjBYOXdAbWFpbC5nbWFpbC5jb20-DQpTdWJqZWN0OiBUZXN0IGRyYWZ0DQpGcm9tOiBub2RlIHFhIDxub2RlOHFhQGdtYWlsLmNvbT4NClRvOiB0ZXN0QGdtYWlsLmNvbQ0KQ29udGVudC1UeXBlOiBtdWx0aXBhcnQvYWx0ZXJuYXRpdmU7IGJvdW5kYXJ5PSIwMDAwMDAwMDAwMDA5ZDU4YjYwNjI5MjQxYTIyIg0KDQotLTAwMDAwMDAwMDAwMDlkNThiNjA2MjkyNDFhMjINCkNvbnRlbnQtVHlwZTogdGV4dC9wbGFpbjsgY2hhcnNldD0iVVRGLTgiDQoNCmRyYWZ0IGJvZHkNCg0KLS0wMDAwMDAwMDAwMDA5ZDU4YjYwNjI5MjQxYTIyDQpDb250ZW50LVR5cGU6IHRleHQvaHRtbDsgY2hhcnNldD0iVVRGLTgiDQoNCjxkaXYgZGlyPSJsdHIiPmRyYWZ0IGJvZHk8YnI-PC9kaXY-DQoNCi0tMDAwMDAwMDAwMDAwOWQ1OGI2MDYyOTI0MWEyMi0t',
+				});
+			gmailNock
+				.get('/v1/users/me/messages/z9y8x7w6v5u4t3s2')
+				.query({
+					includeSpamTrash: 'true',
+					labelIds: 'CHAT',
+					q: 'test from:Test Sender after:1734393600 before:1735171200',
+					readStatus: 'both',
+					dataPropertyAttachmentsPrefixName: 'attachment_',
+					downloadAttachments: 'true',
+					maxResults: '2',
+					format: 'raw',
+				})
+				.reply(200, {
+					...messages[1],
+					raw: 'TUlNRS1WZXJzaW9uOiAxLjANCkRhdGU6IEZyaSwgMTMgRGVjIDIwMjQgMTE6MTU6MDEgKzAxMDANCk1lc3NhZ2UtSUQ6IDxDQUVHQVByb3d1ZEduS1h4cXJoTWpPdXhhbVRoN3lBcmp3UDdPRDlVQnEtSnBrYjBYOXdAbWFpbC5nbWFpbC5jb20-DQpTdWJqZWN0OiBUZXN0IGRyYWZ0DQpGcm9tOiBub2RlIHFhIDxub2RlOHFhQGdtYWlsLmNvbT4NClRvOiB0ZXN0QGdtYWlsLmNvbQ0KQ29udGVudC1UeXBlOiBtdWx0aXBhcnQvYWx0ZXJuYXRpdmU7IGJvdW5kYXJ5PSIwMDAwMDAwMDAwMDA5ZDU4YjYwNjI5MjQxYTIyIg0KDQotLTAwMDAwMDAwMDAwMDlkNThiNjA2MjkyNDFhMjINCkNvbnRlbnQtVHlwZTogdGV4dC9wbGFpbjsgY2hhcnNldD0iVVRGLTgiDQoNCmRyYWZ0IGJvZHkNCg0KLS0wMDAwMDAwMDAwMDA5ZDU4YjYwNjI5MjQxYTIyDQpDb250ZW50LVR5cGU6IHRleHQvaHRtbDsgY2hhcnNldD0iVVRGLTgiDQoNCjxkaXYgZGlyPSJsdHIiPmRyYWZ0IGJvZHk8YnI-PC9kaXY-DQoNCi0tMDAwMDAwMDAwMDAwOWQ1OGI2MDYyOTI0MWEyMi0t',
+				});
+			gmailNock
+				.get('/v1/users/me/messages/z9y8x7w6v5u4t3s2')
+				.query({
+					maxResults: '2',
+					format: 'metadata',
+					metadataHeaders: ['From', 'To', 'Cc', 'Bcc', 'Subject'],
+				})
+				.reply(200, messages[0]);
+			gmailNock.get('/v1/users/me/labels').reply(200, {
+				labels,
+			});
+			gmailNock.get('/v1/users/me/profile').times(2).reply(200, { emailAddress: 'test@n8n.io' });
+			gmailNock
+				.post('/v1/users/me/messages/send')
+				.query({ format: 'metadata' })
+				.reply(200, messages[0]);
+			gmailNock.post('/v1/users/me/messages/send').reply(200, messages[0]);
+			gmailNock
+				.post('/v1/users/me/messages/send')
+				.query({ userId: 'me', uploadType: 'media' })
+				.reply(200, messages[0]);
+			gmailNock
+				.post('/v1/users/me/messages/test/modify', (body) => 'addLabelIds' in body)
+				.reply(200, messages[0]);
+			gmailNock
+				.post('/v1/users/me/messages/test/modify', (body) => 'removeLabelIds' in body)
+				.reply(200, messages[0]);
+			gmailNock.delete('/v1/users/me/messages/test').reply(200, messages[0]);
+			gmailNock
+				.get('/v1/users/me/messages/test')
+				.query({
+					format: 'metadata',
+					metadataHeaders: ['From', 'To', 'Cc', 'Bcc', 'Subject'],
+				})
+				.reply(200, messages[0]);
+			gmailNock.get('/v1/users/me/labels').reply(200, { labels });
+			gmailNock
+				.get('/v1/users/me/messages/test')
+				.query({ format: 'raw' })
+				.reply(200, { raw: 'test email content' });
+			gmailNock
+				.post('/v1/users/me/messages/test/modify', { removeLabelIds: ['UNREAD'] })
+				.reply(200, messages[0]);
+			gmailNock
+				.post('/v1/users/me/messages/test/modify', { addLabelIds: ['UNREAD'] })
+				.reply(200, messages[0]);
+			gmailNock
+				.get('/v1/users/me/messages/test')
+				.query({
+					format: 'metadata',
+				})
+				.reply(200, messages[0]);
+		});
+
+		testWorkflows(['nodes/Google/Gmail/test/v2/messages.workflow.json']);
+
+		it('should make the correct network calls', () => {
+			gmailNock.done();
+		});
+	});
+
+	describe('Labels', () => {
+		const gmailNock = nock('https://www.googleapis.com/gmail');
+
+		beforeAll(() => {
+			gmailNock
+				.post('/v1/users/me/labels', {
+					labelListVisibility: 'labelShow',
+					messageListVisibility: 'show',
+					name: 'Test Label Name',
+				})
+				.reply(200, labels[0]);
+			gmailNock.delete('/v1/users/me/labels/test-label-id').reply(200, labels[0]);
+			gmailNock.get('/v1/users/me/labels/test-label-id').reply(200, labels[0]);
+			gmailNock.get('/v1/users/me/labels').reply(200, {
+				labels,
+			});
+		});
+
+		testWorkflows(['nodes/Google/Gmail/test/v2/labels.workflow.json']);
+
+		it('should make the correct network calls', () => {
+			gmailNock.done();
+		});
+	});
+
+	describe('Drafts', () => {
+		const gmailNock = nock('https://www.googleapis.com/gmail');
+
+		beforeAll(() => {
+			gmailNock
+				.filteringRequestBody((body) => {
+					try {
+						const parsedBody = jsonParse<{ message: { raw: string; threadId: string } }>(body);
+						const mail = Buffer.from(parsedBody.message.raw, 'base64').toString('utf-8');
+
+						// Remove dynamic fields from mail
+						parsedBody.message.raw = Buffer.from(
+							mail
+								.replace(/boundary=".*"/g, 'boundary="--test-boundary"')
+								.replace(/----.*/g, '----test-boundary')
+								.replace(/Message-ID:.*/g, 'Message-ID: test-message-id'),
+							'utf-8',
+						).toString('base64');
+
+						return JSON.stringify(parsedBody);
+					} catch (error) {
+						return body;
+					}
+				})
+				.post('/v1/users/me/drafts', {
+					message: {
+						raw: 'Q29udGVudC1UeXBlOiBtdWx0aXBhcnQvbWl4ZWQ7IGJvdW5kYXJ5PSItLXRlc3QtYm91bmRhcnkiDQpGcm9tOiB0ZXN0LWFsaWFzQG44bi5pbw0KVG86IHRlc3QtdG9AbjhuLmlvDQpDYzogdGVzdC1jY0BuOG4uaW8NCkJjYzogdGVzdC1iY2NAbjhuLmlvDQpSZXBseS1UbzogdGVzdC1yZXBseUBuOG4uaW8NClN1YmplY3Q6IFRlc3QgRHJhZnQgU3ViamVjdA0KTWVzc2FnZS1JRDogdGVzdC1tZXNzYWdlLWlkDQpEYXRlOiBNb24sIDE2IERlYyAyMDI0IDEyOjM0OjU2ICswMDAwDQpNSU1FLVZlcnNpb246IDEuMA0KDQotLS0tdGVzdC1ib3VuZGFyeQ0KQ29udGVudC1UeXBlOiB0ZXh0L3BsYWluOyBjaGFyc2V0PXV0Zi04DQpDb250ZW50LVRyYW5zZmVyLUVuY29kaW5nOiA3Yml0DQoNClRlc3QgRHJhZnQgTWVzc2FnZQ0KLS0tLXRlc3QtYm91bmRhcnkNCkNvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbjsgbmFtZT1maWxlLmpzb24NCkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IGJhc2U2NA0KQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVudDsgZmlsZW5hbWU9ZmlsZS5qc29uDQoNClczc2lZbWx1WVhKNUlqcDBjblZsZlYwPQ0KLS0tLXRlc3QtYm91bmRhcnkNCg==',
+						threadId: 'test-thread-id',
+					},
+				})
+				.query({ userId: 'me', uploadType: 'media' })
+				.reply(200, messages[0]);
+			gmailNock.delete('/v1/users/me/drafts/test-draft-id').reply(200, messages[0]);
+			gmailNock
+				.get('/v1/users/me/drafts/test-draft-id')
+				.query({ format: 'raw' })
+				.reply(200, {
+					message: {
+						...messages[0],
+						raw: 'TUlNRS1WZXJzaW9uOiAxLjANCkRhdGU6IEZyaSwgMTMgRGVjIDIwMjQgMTE6MTU6MDEgKzAxMDANCk1lc3NhZ2UtSUQ6IDxDQUVHQVByb3d1ZEduS1h4cXJoTWpPdXhhbVRoN3lBcmp3UDdPRDlVQnEtSnBrYjBYOXdAbWFpbC5nbWFpbC5jb20-DQpTdWJqZWN0OiBUZXN0IGRyYWZ0DQpGcm9tOiBub2RlIHFhIDxub2RlOHFhQGdtYWlsLmNvbT4NClRvOiB0ZXN0QGdtYWlsLmNvbQ0KQ29udGVudC1UeXBlOiBtdWx0aXBhcnQvYWx0ZXJuYXRpdmU7IGJvdW5kYXJ5PSIwMDAwMDAwMDAwMDA5ZDU4YjYwNjI5MjQxYTIyIg0KDQotLTAwMDAwMDAwMDAwMDlkNThiNjA2MjkyNDFhMjINCkNvbnRlbnQtVHlwZTogdGV4dC9wbGFpbjsgY2hhcnNldD0iVVRGLTgiDQoNCmRyYWZ0IGJvZHkNCg0KLS0wMDAwMDAwMDAwMDA5ZDU4YjYwNjI5MjQxYTIyDQpDb250ZW50LVR5cGU6IHRleHQvaHRtbDsgY2hhcnNldD0iVVRGLTgiDQoNCjxkaXYgZGlyPSJsdHIiPmRyYWZ0IGJvZHk8YnI-PC9kaXY-DQoNCi0tMDAwMDAwMDAwMDAwOWQ1OGI2MDYyOTI0MWEyMi0t',
+					},
+				});
+			gmailNock
+				.get('/v1/users/me/drafts')
+				.query({
+					dataPropertyAttachmentsPrefixName: 'attachment_',
+					downloadAttachments: true,
+					includeSpamTrash: true,
+					maxResults: 100,
+				})
+				.reply(200, { drafts: messages });
+			gmailNock
+				.get('/v1/users/me/drafts/a1b2c3d4e5f6g7h8')
+				.query({
+					dataPropertyAttachmentsPrefixName: 'attachment_',
+					downloadAttachments: true,
+					includeSpamTrash: true,
+					maxResults: 100,
+					format: 'raw',
+				})
+				.reply(200, {
+					message: {
+						...messages[0],
+						raw: 'TUlNRS1WZXJzaW9uOiAxLjANCkRhdGU6IEZyaSwgMTMgRGVjIDIwMjQgMTE6MTU6MDEgKzAxMDANCk1lc3NhZ2UtSUQ6IDxDQUVHQVByb3d1ZEduS1h4cXJoTWpPdXhhbVRoN3lBcmp3UDdPRDlVQnEtSnBrYjBYOXdAbWFpbC5nbWFpbC5jb20-DQpTdWJqZWN0OiBUZXN0IGRyYWZ0DQpGcm9tOiBub2RlIHFhIDxub2RlOHFhQGdtYWlsLmNvbT4NClRvOiB0ZXN0QGdtYWlsLmNvbQ0KQ29udGVudC1UeXBlOiBtdWx0aXBhcnQvYWx0ZXJuYXRpdmU7IGJvdW5kYXJ5PSIwMDAwMDAwMDAwMDA5ZDU4YjYwNjI5MjQxYTIyIg0KDQotLTAwMDAwMDAwMDAwMDlkNThiNjA2MjkyNDFhMjINCkNvbnRlbnQtVHlwZTogdGV4dC9wbGFpbjsgY2hhcnNldD0iVVRGLTgiDQoNCmRyYWZ0IGJvZHkNCg0KLS0wMDAwMDAwMDAwMDA5ZDU4YjYwNjI5MjQxYTIyDQpDb250ZW50LVR5cGU6IHRleHQvaHRtbDsgY2hhcnNldD0iVVRGLTgiDQoNCjxkaXYgZGlyPSJsdHIiPmRyYWZ0IGJvZHk8YnI-PC9kaXY-DQoNCi0tMDAwMDAwMDAwMDAwOWQ1OGI2MDYyOTI0MWEyMi0t',
+					},
+				});
+			gmailNock
+				.get('/v1/users/me/drafts/z9y8x7w6v5u4t3s2')
+				.query({
+					dataPropertyAttachmentsPrefixName: 'attachment_',
+					downloadAttachments: true,
+					includeSpamTrash: true,
+					maxResults: 100,
+					format: 'raw',
+				})
+				.reply(200, {
+					message: {
+						...messages[1],
+						raw: 'TUlNRS1WZXJzaW9uOiAxLjANCkRhdGU6IEZyaSwgMTMgRGVjIDIwMjQgMTE6MTU6MDEgKzAxMDANCk1lc3NhZ2UtSUQ6IDxDQUVHQVByb3d1ZEduS1h4cXJoTWpPdXhhbVRoN3lBcmp3UDdPRDlVQnEtSnBrYjBYOXdAbWFpbC5nbWFpbC5jb20-DQpTdWJqZWN0OiBUZXN0IGRyYWZ0DQpGcm9tOiBub2RlIHFhIDxub2RlOHFhQGdtYWlsLmNvbT4NClRvOiB0ZXN0QGdtYWlsLmNvbQ0KQ29udGVudC1UeXBlOiBtdWx0aXBhcnQvYWx0ZXJuYXRpdmU7IGJvdW5kYXJ5PSIwMDAwMDAwMDAwMDA5ZDU4YjYwNjI5MjQxYTIyIg0KDQotLTAwMDAwMDAwMDAwMDlkNThiNjA2MjkyNDFhMjINCkNvbnRlbnQtVHlwZTogdGV4dC9wbGFpbjsgY2hhcnNldD0iVVRGLTgiDQoNCmRyYWZ0IGJvZHkNCg0KLS0wMDAwMDAwMDAwMDA5ZDU4YjYwNjI5MjQxYTIyDQpDb250ZW50LVR5cGU6IHRleHQvaHRtbDsgY2hhcnNldD0iVVRGLTgiDQoNCjxkaXYgZGlyPSJsdHIiPmRyYWZ0IGJvZHk8YnI-PC9kaXY-DQoNCi0tMDAwMDAwMDAwMDAwOWQ1OGI2MDYyOTI0MWEyMi0t',
+					},
+				});
+		});
+
+		testWorkflows(['nodes/Google/Gmail/test/v2/drafts.workflow.json']);
+
+		it('should make the correct network calls', () => {
+			gmailNock.done();
+		});
+	});
+
+	describe('Threads', () => {
+		const gmailNock = nock('https://www.googleapis.com/gmail');
+
+		beforeAll(() => {
+			gmailNock.get('/v1/users/me/threads').query({ maxResults: 2 }).reply(200, {
+				threads: messages,
+			});
+			gmailNock
+				.get('/v1/users/me/threads')
+				.query((query) => {
+					return (
+						query.includeSpamTrash === 'true' &&
+						query.labelIds === 'CHAT' &&
+						!!query.q &&
+						query.q.includes('has:attachment') &&
+						query.q.includes('before:') &&
+						query.q.includes('after:')
+					);
+				})
+				.reply(200, { threads: messages });
+			gmailNock
+				.post('/v1/users/me/threads/test-thread-id/modify', { addLabelIds: ['CHAT'] })
+				.reply(200, messages[0]);
+			gmailNock
+				.post('/v1/users/me/threads/test-thread-id/modify', { removeLabelIds: ['CHAT'] })
+				.reply(200, messages[0]);
+			gmailNock.delete('/v1/users/me/threads/test-thread-id').reply(200, messages[0]);
+			gmailNock
+				.get('/v1/users/me/threads/test-thread-id')
+				.query({
+					format: 'metadata',
+					metadataHeaders: ['From', 'To', 'Cc', 'Bcc', 'Subject'],
+				})
+				.reply(200, messages[0]);
+			gmailNock.get('/v1/users/me/labels').times(2).reply(200, { labels });
+			gmailNock
+				.get('/v1/users/me/threads/test-thread-id')
+				.query({ format: 'full' })
+				.reply(200, messages[0]);
+			gmailNock.post('/v1/users/me/threads/test-thread-id/trash').reply(200, messages[0]);
+			gmailNock.post('/v1/users/me/threads/test-thread-id/untrash').reply(200, messages[0]);
+			gmailNock
+				.get('/v1/users/me/messages/test%20snippet')
+				.query({
+					userId: 'me',
+					uploadType: 'media',
+					format: 'metadata',
+				})
+				.reply(200, messages[0]);
+			gmailNock.get('/v1/users/me/profile').reply(200, { emailAddress: 'test@n8n.io' });
+			gmailNock
+				.post('/v1/users/me/messages/send')
+				.query({ userId: 'me', uploadType: 'media', format: 'metadata' })
+				.reply(200, messages[0]);
+		});
+
+		testWorkflows(['nodes/Google/Gmail/test/v2/threads.workflow.json']);
+
+		it('should make the correct network calls', () => {
+			gmailNock.done();
+		});
+	});
+
+	describe('loadOptions', () => {
+		describe('getLabels', () => {
+			it('should return a list of Gmail labels', async () => {
+				const loadOptionsFunctions = mockDeep<ILoadOptionsFunctions>({
+					getNode: jest.fn(() => mock<INode>()),
+					helpers: mock<ILoadOptionsFunctions['helpers']>({
+						requestWithAuthentication: jest
+							.fn()
+							// 2 pages of labels
+							.mockImplementationOnce(async () => ({ labels, nextPageToken: 'nextPageToken' }))
+							.mockImplementationOnce(async () => ({ labels })),
+					}),
+				});
+
+				expect(await getLabels.call(loadOptionsFunctions)).toEqual([
+					{ name: 'CHAT', value: 'CHAT' },
+					{ name: 'CHAT', value: 'CHAT' },
+					{ name: 'SENT', value: 'SENT' },
+					{ name: 'SENT', value: 'SENT' },
+				]);
+			});
+		});
+
+		describe('getThreadMessages', () => {
+			it('should return a list of Gmail thread messages', async () => {
+				const loadOptionsFunctions = mockDeep<ILoadOptionsFunctions>({
+					getNode: jest.fn(() => mock<INode>()),
+					helpers: mock<ILoadOptionsFunctions['helpers']>({
+						requestWithAuthentication: jest.fn(async () => ({ messages })),
+					}),
+				});
+
+				expect(await getThreadMessages.call(loadOptionsFunctions)).toEqual([
+					{
+						name: "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+						value: 'a1b2c3d4e5f6g7h8',
+					},
+					{
+						name: 'Your friend John just shared a new photo with you! Check it out now.',
+						value: 'z9y8x7w6v5u4t3s2',
+					},
+				]);
+			});
+		});
+
+		describe('getGmailAliases', () => {
+			it('should return a list of Gmail aliases', async () => {
+				const loadOptionsFunctions = mockDeep<ILoadOptionsFunctions>({
+					getNode: jest.fn(() => mock<INode>()),
+					helpers: mock<ILoadOptionsFunctions['helpers']>({
+						requestWithAuthentication: jest.fn(async () => ({
+							sendAs: [
+								{ isDefault: false, sendAsEmail: 'alias1@n8n.io' },
+								{ isDefault: true, sendAsEmail: 'alias2@n8n.io' },
+							],
+						})),
+					}),
+				});
+
+				expect(await getGmailAliases.call(loadOptionsFunctions)).toEqual([
+					{
+						name: 'alias1@n8n.io',
+						value: 'alias1@n8n.io',
+					},
+					{
+						name: 'alias2@n8n.io (Default)',
+						value: 'alias2@n8n.io',
+					},
+				]);
+			});
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Google/Gmail/test/v2/drafts.workflow.json b/packages/nodes-base/nodes/Google/Gmail/test/v2/drafts.workflow.json
new file mode 100644
index 0000000000000..8000286e88ee7
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/test/v2/drafts.workflow.json
@@ -0,0 +1,386 @@
+{
+	"name": "My workflow 130",
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [-60, 100],
+			"id": "636b40bc-2c98-4b9a-8ce2-9d1322294518",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"resource": "draft",
+				"operation": "get",
+				"messageId": "test-draft-id",
+				"options": {}
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [440, 200],
+			"id": "8802fdb5-2741-407b-82a4-ccedc4055076",
+			"name": "Gmail - Drafts - Get",
+			"webhookId": "3b8b38e0-2f4b-40bc-8b67-37e7ea95cb60",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "draft",
+				"operation": "delete",
+				"messageId": "test-draft-id"
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [440, 20],
+			"id": "ed979c3a-b2ea-413e-be63-0392cc1714a5",
+			"name": "Gmail - Drafts - Delete",
+			"webhookId": "3b8b38e0-2f4b-40bc-8b67-37e7ea95cb60",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "draft",
+				"subject": "Test Draft Subject",
+				"message": "Test Draft Message",
+				"options": {
+					"attachmentsUi": {
+						"attachmentsBinary": [
+							{
+								"property": "data"
+							}
+						]
+					},
+					"bccList": "test-bcc@n8n.io",
+					"ccList": "test-cc@n8n.io",
+					"fromAlias": "=test-alias@n8n.io",
+					"replyTo": "test-reply@n8n.io",
+					"threadId": "test-thread-id",
+					"sendTo": "test-to@n8n.io"
+				}
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [840, -180],
+			"id": "45758452-3b5b-478d-aece-001e117ce69d",
+			"name": "Gmail - Drafts - Create",
+			"webhookId": "3b8b38e0-2f4b-40bc-8b67-37e7ea95cb60",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "draft",
+				"operation": "getAll",
+				"returnAll": true,
+				"options": {
+					"dataPropertyAttachmentsPrefixName": "attachment_",
+					"downloadAttachments": true,
+					"includeSpamTrash": true
+				}
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [440, 400],
+			"id": "bae81586-7641-4fdc-81a4-0006b289bf9d",
+			"name": "Gmail - Drafts - Get Many",
+			"webhookId": "3b8b38e0-2f4b-40bc-8b67-37e7ea95cb60",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "491590a8-27a6-4d14-b342-493947775d16",
+							"name": "binary",
+							"value": true,
+							"type": "boolean"
+						}
+					]
+				},
+				"options": {}
+			},
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.4,
+			"position": [420, -180],
+			"id": "d630c018-1d7b-4779-a280-9f4a21c6a764",
+			"name": "Edit Fields"
+		},
+		{
+			"parameters": {
+				"operation": "toJson",
+				"options": {}
+			},
+			"type": "n8n-nodes-base.convertToFile",
+			"typeVersion": 1.1,
+			"position": [640, -180],
+			"id": "fc3bdb76-c278-44f6-9aac-153b79c8177b",
+			"name": "Convert to File"
+		}
+	],
+	"pinData": {
+		"Gmail - Drafts - Create": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "ABC12345+EXAMPLE123456789" },
+							{
+								"name": "X-Received",
+								"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+							},
+							{ "name": "Return-Path", "value": "<promo@promotion.example.com>" },
+							{ "name": "Date", "value": "Thu, 5 Dec 2024 08:30:00 -0800" },
+							{ "name": "From", "value": "Holiday Deals <promo@promotion.example.com>" },
+							{ "name": "To", "value": "exampleuser@gmail.com" },
+							{ "name": "Message-ID", "value": "<12345abc67890@promotion.example.com>" },
+							{ "name": "Subject", "value": "Exclusive Holiday Discounts!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000"
+				}
+			}
+		],
+		"Gmail - Drafts - Delete": [{ "json": { "success": true } }],
+		"Gmail - Drafts - Get": [
+			{
+				"json": {
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"sizeEstimate": 67890,
+					"headers": {
+						"mime-version": "MIME-Version: 1.0",
+						"date": "Date: Fri, 13 Dec 2024 11:15:01 +0100",
+						"message-id": "Message-ID: <CAEGAProwudGnKXxqrhMjOuxamTh7yArjwP7OD9UBq-Jpkb0X9w@mail.gmail.com>",
+						"subject": "Subject: Test draft",
+						"from": "From: node qa <node8qa@gmail.com>",
+						"to": "To: test@gmail.com",
+						"content-type": "Content-Type: multipart/alternative; boundary=\"0000000000009d58b60629241a22\""
+					},
+					"html": "<div dir=\"ltr\">draft body<br></div>\n",
+					"text": "draft body\n",
+					"textAsHtml": "<p>draft body</p>",
+					"subject": "Test draft",
+					"date": "2024-12-13T10:15:01.000Z",
+					"to": {
+						"value": [{ "address": "test@gmail.com", "name": "" }],
+						"html": "<span class=\"mp_address_group\"><a href=\"mailto:test@gmail.com\" class=\"mp_address_email\">test@gmail.com</a></span>",
+						"text": "test@gmail.com"
+					},
+					"from": {
+						"value": [{ "address": "node8qa@gmail.com", "name": "node qa" }],
+						"html": "<span class=\"mp_address_group\"><span class=\"mp_address_name\">node qa</span> &lt;<a href=\"mailto:node8qa@gmail.com\" class=\"mp_address_email\">node8qa@gmail.com</a>&gt;</span>",
+						"text": "\"node qa\" <node8qa@gmail.com>"
+					},
+					"messageId": "a1b2c3d4e5f6g7h8"
+				}
+			}
+		],
+		"Gmail - Drafts - Get Many": [
+			{
+				"json": {
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"sizeEstimate": 67890,
+					"headers": {
+						"mime-version": "MIME-Version: 1.0",
+						"date": "Date: Fri, 13 Dec 2024 11:15:01 +0100",
+						"message-id": "Message-ID: <CAEGAProwudGnKXxqrhMjOuxamTh7yArjwP7OD9UBq-Jpkb0X9w@mail.gmail.com>",
+						"subject": "Subject: Test draft",
+						"from": "From: node qa <node8qa@gmail.com>",
+						"to": "To: test@gmail.com",
+						"content-type": "Content-Type: multipart/alternative; boundary=\"0000000000009d58b60629241a22\""
+					},
+					"html": "<div dir=\"ltr\">draft body<br></div>\n",
+					"text": "draft body\n",
+					"textAsHtml": "<p>draft body</p>",
+					"subject": "Test draft",
+					"date": "2024-12-13T10:15:01.000Z",
+					"to": {
+						"value": [{ "address": "test@gmail.com", "name": "" }],
+						"html": "<span class=\"mp_address_group\"><a href=\"mailto:test@gmail.com\" class=\"mp_address_email\">test@gmail.com</a></span>",
+						"text": "test@gmail.com"
+					},
+					"from": {
+						"value": [{ "address": "node8qa@gmail.com", "name": "node qa" }],
+						"html": "<span class=\"mp_address_group\"><span class=\"mp_address_name\">node qa</span> &lt;<a href=\"mailto:node8qa@gmail.com\" class=\"mp_address_email\">node8qa@gmail.com</a>&gt;</span>",
+						"text": "\"node qa\" <node8qa@gmail.com>"
+					},
+					"messageId": "a1b2c3d4e5f6g7h8"
+				}
+			},
+			{
+				"json": {
+					"threadId": "z9y8x7w6v5u4t3s2",
+					"labelIds": ["UNREAD", "CATEGORY_SOCIAL", "INBOX"],
+					"sizeEstimate": 54321,
+					"headers": {
+						"mime-version": "MIME-Version: 1.0",
+						"date": "Date: Fri, 13 Dec 2024 11:15:01 +0100",
+						"message-id": "Message-ID: <CAEGAProwudGnKXxqrhMjOuxamTh7yArjwP7OD9UBq-Jpkb0X9w@mail.gmail.com>",
+						"subject": "Subject: Test draft",
+						"from": "From: node qa <node8qa@gmail.com>",
+						"to": "To: test@gmail.com",
+						"content-type": "Content-Type: multipart/alternative; boundary=\"0000000000009d58b60629241a22\""
+					},
+					"html": "<div dir=\"ltr\">draft body<br></div>\n",
+					"text": "draft body\n",
+					"textAsHtml": "<p>draft body</p>",
+					"subject": "Test draft",
+					"date": "2024-12-13T10:15:01.000Z",
+					"to": {
+						"value": [{ "address": "test@gmail.com", "name": "" }],
+						"html": "<span class=\"mp_address_group\"><a href=\"mailto:test@gmail.com\" class=\"mp_address_email\">test@gmail.com</a></span>",
+						"text": "test@gmail.com"
+					},
+					"from": {
+						"value": [{ "address": "node8qa@gmail.com", "name": "node qa" }],
+						"html": "<span class=\"mp_address_group\"><span class=\"mp_address_name\">node qa</span> &lt;<a href=\"mailto:node8qa@gmail.com\" class=\"mp_address_email\">node8qa@gmail.com</a>&gt;</span>",
+						"text": "\"node qa\" <node8qa@gmail.com>"
+					},
+					"messageId": "z9y8x7w6v5u4t3s2"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Gmail - Drafts - Get Many",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Drafts - Get",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Drafts - Delete",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Edit Fields",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Edit Fields": {
+			"main": [
+				[
+					{
+						"node": "Convert to File",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Convert to File": {
+			"main": [
+				[
+					{
+						"node": "Gmail - Drafts - Create",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "84fb11a4-4166-45bd-bd9f-60fa378d9e68",
+	"meta": {
+		"instanceId": "27cc9b56542ad45b38725555722c50a1c3fee1670bbb67980558314ee08517c4"
+	},
+	"id": "09KDcfGmfDrLInDE",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/test/v2/fixtures/labels.json b/packages/nodes-base/nodes/Google/Gmail/test/v2/fixtures/labels.json
new file mode 100644
index 0000000000000..7d211dc09cced
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/test/v2/fixtures/labels.json
@@ -0,0 +1,14 @@
+[
+	{
+		"id": "CHAT",
+		"name": "CHAT",
+		"messageListVisibility": "hide",
+		"labelListVisibility": "labelHide",
+		"type": "system"
+	},
+	{
+		"id": "SENT",
+		"name": "SENT",
+		"type": "system"
+	}
+]
diff --git a/packages/nodes-base/nodes/Google/Gmail/test/v2/fixtures/messages.json b/packages/nodes-base/nodes/Google/Gmail/test/v2/fixtures/messages.json
new file mode 100644
index 0000000000000..cb669eb88d6df
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/test/v2/fixtures/messages.json
@@ -0,0 +1,240 @@
+[
+	{
+		"id": "a1b2c3d4e5f6g7h8",
+		"threadId": "a1b2c3d4e5f6g7h8",
+		"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+		"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+		"payload": {
+			"partId": "",
+			"mimeType": "multipart/alternative",
+			"filename": "",
+			"headers": [
+				{
+					"name": "Delivered-To",
+					"value": "exampleuser@gmail.com"
+				},
+				{
+					"name": "Received",
+					"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+				},
+				{
+					"name": "X-Google-Smtp-Source",
+					"value": "ABC12345+EXAMPLE123456789"
+				},
+				{
+					"name": "X-Received",
+					"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+				},
+				{
+					"name": "ARC-Seal",
+					"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+				},
+				{
+					"name": "ARC-Message-Signature",
+					"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+				},
+				{
+					"name": "ARC-Authentication-Results",
+					"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+				},
+				{
+					"name": "Return-Path",
+					"value": "<promo@promotion.example.com>"
+				},
+				{
+					"name": "Date",
+					"value": "Thu, 5 Dec 2024 08:30:00 -0800"
+				},
+				{
+					"name": "From",
+					"value": "Holiday Deals <promo@promotion.example.com>"
+				},
+				{
+					"name": "To",
+					"value": "exampleuser@gmail.com"
+				},
+				{
+					"name": "Message-ID",
+					"value": "<12345abc67890@promotion.example.com>"
+				},
+				{
+					"name": "Subject",
+					"value": "Exclusive Holiday Discounts!"
+				},
+				{
+					"name": "MIME-Version",
+					"value": "1.0"
+				},
+				{
+					"name": "Content-Type",
+					"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+				}
+			],
+			"body": {
+				"size": 0
+			},
+			"parts": [
+				{
+					"partId": "0",
+					"mimeType": "text/plain",
+					"filename": "",
+					"headers": [
+						{
+							"name": "Content-Type",
+							"value": "text/plain; charset=utf-8"
+						},
+						{
+							"name": "Content-Transfer-Encoding",
+							"value": "quoted-printable"
+						}
+					],
+					"body": {
+						"size": 1234,
+						"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+					}
+				},
+				{
+					"partId": "1",
+					"mimeType": "text/html",
+					"filename": "",
+					"headers": [
+						{
+							"name": "Content-Type",
+							"value": "text/html; charset=\"utf-8\""
+						},
+						{
+							"name": "Content-Transfer-Encoding",
+							"value": "quoted-printable"
+						}
+					],
+					"body": {
+						"size": 5678,
+						"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+					}
+				}
+			]
+		},
+		"sizeEstimate": 67890,
+		"historyId": "54321",
+		"internalDate": "1733405400000"
+	},
+	{
+		"id": "z9y8x7w6v5u4t3s2",
+		"threadId": "z9y8x7w6v5u4t3s2",
+		"labelIds": ["UNREAD", "CATEGORY_SOCIAL", "INBOX"],
+		"snippet": "Your friend John just shared a new photo with you! Check it out now.",
+		"payload": {
+			"partId": "",
+			"mimeType": "multipart/alternative",
+			"filename": "",
+			"headers": [
+				{
+					"name": "Delivered-To",
+					"value": "exampleuser2@gmail.com"
+				},
+				{
+					"name": "Received",
+					"value": "by 2001:db8::abcd with SMTP id def456ghi789; Fri, 6 Dec 2024 09:45:00 -0800 (PST)"
+				},
+				{
+					"name": "X-Google-Smtp-Source",
+					"value": "XYZ67890+EXAMPLE0987654321"
+				},
+				{
+					"name": "X-Received",
+					"value": "by 198.51.100.2 with SMTP id 67890def12345; Fri, 6 Dec 2024 09:45:00 -0800 (PST)"
+				},
+				{
+					"name": "ARC-Seal",
+					"value": "i=1; a=rsa-sha256; t=1733490900; cv=none; d=example2.com; s=arc-20241206; b=HIJKLMN987654="
+				},
+				{
+					"name": "ARC-Message-Signature",
+					"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example2.com; s=arc-20241206; bh=EXAMPLEHASH67890="
+				},
+				{
+					"name": "ARC-Authentication-Results",
+					"value": "i=1; mx.example2.com; dkim=pass header.i=@social.example2.com; spf=pass smtp.mailfrom=notifications@social.example2.com; dmarc=pass header.from=example2.com"
+				},
+				{
+					"name": "Return-Path",
+					"value": "<notifications@social.example2.com>"
+				},
+				{
+					"name": "Date",
+					"value": "Fri, 6 Dec 2024 09:45:00 -0800"
+				},
+				{
+					"name": "From",
+					"value": "John's Photos <notifications@social.example2.com>"
+				},
+				{
+					"name": "To",
+					"value": "exampleuser2@gmail.com"
+				},
+				{
+					"name": "Message-ID",
+					"value": "<67890def12345@social.example2.com>"
+				},
+				{
+					"name": "Subject",
+					"value": "John shared a new photo with you!"
+				},
+				{
+					"name": "MIME-Version",
+					"value": "1.0"
+				},
+				{
+					"name": "Content-Type",
+					"value": "multipart/alternative; boundary=\"----=_Part_67890_12345.1733490900000\""
+				}
+			],
+			"body": {
+				"size": 0
+			},
+			"parts": [
+				{
+					"partId": "0",
+					"mimeType": "text/plain",
+					"filename": "",
+					"headers": [
+						{
+							"name": "Content-Type",
+							"value": "text/plain; charset=utf-8"
+						},
+						{
+							"name": "Content-Transfer-Encoding",
+							"value": "quoted-printable"
+						}
+					],
+					"body": {
+						"size": 4321,
+						"data": "U2VlIHRoZSBhdHRhY2hlZCBwaG90byBhbmQgcmVwbHkgdG8gSm9obi4gV2UgaG9wZSB5b3UgbGlrZSBpdCE="
+					}
+				},
+				{
+					"partId": "1",
+					"mimeType": "text/html",
+					"filename": "",
+					"headers": [
+						{
+							"name": "Content-Type",
+							"value": "text/html; charset=\"utf-8\""
+						},
+						{
+							"name": "Content-Transfer-Encoding",
+							"value": "quoted-printable"
+						}
+					],
+					"body": {
+						"size": 8765,
+						"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+U2VlIHRoZSBhdHRhY2hlZCBwaG90byBhbmQgcmVwbHkgdG8gPGI+Sm9obi48L2I+IFdlIGhvcGUgeW91IGxpa2UgaXQhPC9kaXY+"
+					}
+				}
+			]
+		},
+		"sizeEstimate": 54321,
+		"historyId": "98765",
+		"internalDate": "1733490900000"
+	}
+]
diff --git a/packages/nodes-base/nodes/Google/Gmail/test/v2/labels.workflow.json b/packages/nodes-base/nodes/Google/Gmail/test/v2/labels.workflow.json
new file mode 100644
index 0000000000000..fecfce191c4c5
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/test/v2/labels.workflow.json
@@ -0,0 +1,163 @@
+{
+	"name": "My workflow 130",
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [-60, 100],
+			"id": "636b40bc-2c98-4b9a-8ce2-9d1322294518",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"resource": "label",
+				"operation": "create",
+				"name": "Test Label Name",
+				"options": {}
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [220, -180],
+			"id": "45758452-3b5b-478d-aece-001e117ce69d",
+			"name": "Gmail - Labels - Create",
+			"webhookId": "3b8b38e0-2f4b-40bc-8b67-37e7ea95cb60",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "label",
+				"operation": "delete",
+				"labelId": "test-label-id"
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [220, 20],
+			"id": "ed979c3a-b2ea-413e-be63-0392cc1714a5",
+			"name": "Gmail - Labels - Delete",
+			"webhookId": "3b8b38e0-2f4b-40bc-8b67-37e7ea95cb60",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "label",
+				"operation": "get",
+				"labelId": "test-label-id"
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [220, 200],
+			"id": "8802fdb5-2741-407b-82a4-ccedc4055076",
+			"name": "Gmail - Labels - Get",
+			"webhookId": "3b8b38e0-2f4b-40bc-8b67-37e7ea95cb60",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "label",
+				"limit": 2
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [220, 400],
+			"id": "bae81586-7641-4fdc-81a4-0006b289bf9d",
+			"name": "Gmail - Labels - Get Many",
+			"webhookId": "3b8b38e0-2f4b-40bc-8b67-37e7ea95cb60",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		}
+	],
+	"pinData": {
+		"Gmail - Labels - Create": [
+			{
+				"json": {
+					"id": "CHAT",
+					"name": "CHAT",
+					"messageListVisibility": "hide",
+					"labelListVisibility": "labelHide",
+					"type": "system"
+				}
+			}
+		],
+		"Gmail - Labels - Delete": [{ "json": { "success": true } }],
+		"Gmail - Labels - Get": [
+			{
+				"json": {
+					"id": "CHAT",
+					"name": "CHAT",
+					"messageListVisibility": "hide",
+					"labelListVisibility": "labelHide",
+					"type": "system"
+				}
+			}
+		],
+		"Gmail - Labels - Get Many": [
+			{
+				"json": {
+					"id": "CHAT",
+					"name": "CHAT",
+					"messageListVisibility": "hide",
+					"labelListVisibility": "labelHide",
+					"type": "system"
+				}
+			},
+			{ "json": { "id": "SENT", "name": "SENT", "type": "system" } }
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Gmail - Labels - Create",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Labels - Delete",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Labels - Get",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Labels - Get Many",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "",
+	"meta": {
+		"instanceId": "27cc9b56542ad45b38725555722c50a1c3fee1670bbb67980558314ee08517c4"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/test/v2/messages.workflow.json b/packages/nodes-base/nodes/Google/Gmail/test/v2/messages.workflow.json
new file mode 100644
index 0000000000000..ba64983183c2a
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/test/v2/messages.workflow.json
@@ -0,0 +1,1151 @@
+{
+	"name": "Gmail test - messages",
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [0, 0],
+			"id": "765640dd-529f-4319-a435-a1b5411cf761",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"operation": "getAll",
+				"limit": 2,
+				"filters": {}
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [780, -600],
+			"id": "51f7694c-0d4c-4f84-9e4f-8a8fe8db18c9",
+			"name": "Gmail - Messages - All (simplified)",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"operation": "getAll",
+				"limit": 2,
+				"simple": false,
+				"filters": {
+					"includeSpamTrash": true,
+					"labelIds": ["CHAT"],
+					"q": "test",
+					"readStatus": "both",
+					"receivedAfter": "2024-12-17T00:00:00",
+					"receivedBefore": "2024-12-26T00:00:00",
+					"sender": "Test Sender"
+				},
+				"options": {
+					"dataPropertyAttachmentsPrefixName": "attachment_",
+					"downloadAttachments": true
+				}
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [780, -400],
+			"id": "2ea8db65-5e60-47dc-bdca-1981bee1b63e",
+			"name": "Gmail - Messages - All",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"sendTo": "test@n8n.io",
+				"subject": "Test Subject",
+				"message": "Test Message",
+				"options": {
+					"appendAttribution": true,
+					"attachmentsUi": {
+						"attachmentsBinary": [{}, {}]
+					},
+					"bccList": "test-bcc@n8n.io",
+					"ccList": "test-cc@n8n.io",
+					"senderName": "Test Sender",
+					"replyTo": "test-reply-to@n8n.io",
+					"replyToSenderOnly": true
+				}
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [1060, 1380],
+			"id": "da96a339-2df5-465f-a253-5302160ef921",
+			"name": "Gmail - Messages - Send",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"operation": "sendAndWait",
+				"sendTo": "test@n8n.io",
+				"subject": "Test Subject",
+				"message": "Test Message"
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [780, 1580],
+			"id": "b12181b3-a98d-44ba-bb71-a22ce4e4c663",
+			"name": "Gmail - Messages - Send and Wait for Approval",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"operation": "addLabels",
+				"messageId": "test",
+				"labelIds": ["CHAT"]
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [780, -220],
+			"id": "2f83b7ac-3e7a-466d-b269-88928da60d3a",
+			"name": "Gmail - Messages - Add Label",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"operation": "delete",
+				"messageId": "test"
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [780, 180],
+			"id": "aba867fa-bf92-4ba9-b96f-c0f74d37c144",
+			"name": "Gmail - Messages - Delete",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"operation": "get",
+				"messageId": "test"
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [780, 380],
+			"id": "029494b2-caf2-4a1e-b496-1ab3ac96987a",
+			"name": "Gmail - Messages - Get (simplified)",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"operation": "get",
+				"messageId": "test",
+				"simple": false,
+				"options": {}
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [780, 580],
+			"id": "86a77799-6d7b-4dd6-9afa-be3cd64e82df",
+			"name": "Gmail - Messages - Get",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"operation": "markAsRead",
+				"messageId": "test"
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [780, 760],
+			"id": "aedc33d9-cc57-4bc1-8811-8aa5fe02a363",
+			"name": "Gmail - Messages - Mark as Read",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"operation": "markAsUnread",
+				"messageId": "test"
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [780, 980],
+			"id": "a463ad5e-3fac-40c9-b9bf-0705d28aa68d",
+			"name": "Gmail - Messages - Mark as Unread",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"operation": "removeLabels",
+				"messageId": "test",
+				"labelIds": ["CHAT"]
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [780, -20],
+			"id": "97996089-0116-4c86-b24c-5848661efc9c",
+			"name": "Gmail - Messages - Remove Label",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"operation": "reply",
+				"messageId": "test",
+				"message": "Test reply",
+				"options": {
+					"appendAttribution": false,
+					"bccList": "test-bcc@n8n.io",
+					"senderName": "Test Sender Name",
+					"replyToSenderOnly": false
+				}
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [780, 1200],
+			"id": "aa43df3d-5de3-4663-9211-401e3040a4de",
+			"name": "Gmail - Messages - Reply",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"operation": "toJson",
+				"options": {}
+			},
+			"type": "n8n-nodes-base.convertToFile",
+			"typeVersion": 1.1,
+			"position": [920, 1380],
+			"id": "6820a547-12dc-4146-8483-a43adf695b40",
+			"name": "Attachment"
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "0a4e38fe-ed38-400e-afb1-9d430f167d54",
+							"name": "attachment",
+							"value": true,
+							"type": "boolean"
+						}
+					]
+				},
+				"options": {}
+			},
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.4,
+			"position": [780, 1380],
+			"id": "72bd5e27-dd43-48ad-be97-634caf883dd5",
+			"name": "Edit Fields"
+		}
+	],
+	"pinData": {
+		"Gmail - Messages - All (simplified)": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000",
+					"labels": [],
+					"Delivered-To": "exampleuser@gmail.com",
+					"Received": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)",
+					"X-Google-Smtp-Source": "ABC12345+EXAMPLE123456789",
+					"X-Received": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)",
+					"ARC-Seal": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456=",
+					"ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345=",
+					"ARC-Authentication-Results": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com",
+					"Return-Path": "<promo@promotion.example.com>",
+					"Date": "Thu, 5 Dec 2024 08:30:00 -0800",
+					"From": "Holiday Deals <promo@promotion.example.com>",
+					"To": "exampleuser@gmail.com",
+					"Message-ID": "<12345abc67890@promotion.example.com>",
+					"Subject": "Exclusive Holiday Discounts!",
+					"MIME-Version": "1.0",
+					"Content-Type": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+				}
+			},
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000",
+					"labels": [],
+					"Delivered-To": "exampleuser@gmail.com",
+					"Received": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)",
+					"X-Google-Smtp-Source": "ABC12345+EXAMPLE123456789",
+					"X-Received": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)",
+					"ARC-Seal": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456=",
+					"ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345=",
+					"ARC-Authentication-Results": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com",
+					"Return-Path": "<promo@promotion.example.com>",
+					"Date": "Thu, 5 Dec 2024 08:30:00 -0800",
+					"From": "Holiday Deals <promo@promotion.example.com>",
+					"To": "exampleuser@gmail.com",
+					"Message-ID": "<12345abc67890@promotion.example.com>",
+					"Subject": "Exclusive Holiday Discounts!",
+					"MIME-Version": "1.0",
+					"Content-Type": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+				}
+			}
+		],
+		"Gmail - Messages - All": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"sizeEstimate": 67890,
+					"headers": {
+						"mime-version": "MIME-Version: 1.0",
+						"date": "Date: Fri, 13 Dec 2024 11:15:01 +0100",
+						"message-id": "Message-ID: <CAEGAProwudGnKXxqrhMjOuxamTh7yArjwP7OD9UBq-Jpkb0X9w@mail.gmail.com>",
+						"subject": "Subject: Test draft",
+						"from": "From: node qa <node8qa@gmail.com>",
+						"to": "To: test@gmail.com",
+						"content-type": "Content-Type: multipart/alternative; boundary=\"0000000000009d58b60629241a22\""
+					},
+					"html": "<div dir=\"ltr\">draft body<br></div>\n",
+					"text": "draft body\n",
+					"textAsHtml": "<p>draft body</p>",
+					"subject": "Test draft",
+					"date": "2024-12-13T10:15:01.000Z",
+					"to": {
+						"value": [{ "address": "test@gmail.com", "name": "" }],
+						"html": "<span class=\"mp_address_group\"><a href=\"mailto:test@gmail.com\" class=\"mp_address_email\">test@gmail.com</a></span>",
+						"text": "test@gmail.com"
+					},
+					"from": {
+						"value": [{ "address": "node8qa@gmail.com", "name": "node qa" }],
+						"html": "<span class=\"mp_address_group\"><span class=\"mp_address_name\">node qa</span> &lt;<a href=\"mailto:node8qa@gmail.com\" class=\"mp_address_email\">node8qa@gmail.com</a>&gt;</span>",
+						"text": "\"node qa\" <node8qa@gmail.com>"
+					},
+					"messageId": "<CAEGAProwudGnKXxqrhMjOuxamTh7yArjwP7OD9UBq-Jpkb0X9w@mail.gmail.com>"
+				}
+			},
+			{
+				"json": {
+					"id": "z9y8x7w6v5u4t3s2",
+					"threadId": "z9y8x7w6v5u4t3s2",
+					"labelIds": ["UNREAD", "CATEGORY_SOCIAL", "INBOX"],
+					"sizeEstimate": 54321,
+					"headers": {
+						"mime-version": "MIME-Version: 1.0",
+						"date": "Date: Fri, 13 Dec 2024 11:15:01 +0100",
+						"message-id": "Message-ID: <CAEGAProwudGnKXxqrhMjOuxamTh7yArjwP7OD9UBq-Jpkb0X9w@mail.gmail.com>",
+						"subject": "Subject: Test draft",
+						"from": "From: node qa <node8qa@gmail.com>",
+						"to": "To: test@gmail.com",
+						"content-type": "Content-Type: multipart/alternative; boundary=\"0000000000009d58b60629241a22\""
+					},
+					"html": "<div dir=\"ltr\">draft body<br></div>\n",
+					"text": "draft body\n",
+					"textAsHtml": "<p>draft body</p>",
+					"subject": "Test draft",
+					"date": "2024-12-13T10:15:01.000Z",
+					"to": {
+						"value": [{ "address": "test@gmail.com", "name": "" }],
+						"html": "<span class=\"mp_address_group\"><a href=\"mailto:test@gmail.com\" class=\"mp_address_email\">test@gmail.com</a></span>",
+						"text": "test@gmail.com"
+					},
+					"from": {
+						"value": [{ "address": "node8qa@gmail.com", "name": "node qa" }],
+						"html": "<span class=\"mp_address_group\"><span class=\"mp_address_name\">node qa</span> &lt;<a href=\"mailto:node8qa@gmail.com\" class=\"mp_address_email\">node8qa@gmail.com</a>&gt;</span>",
+						"text": "\"node qa\" <node8qa@gmail.com>"
+					},
+					"messageId": "<CAEGAProwudGnKXxqrhMjOuxamTh7yArjwP7OD9UBq-Jpkb0X9w@mail.gmail.com>"
+				}
+			}
+		],
+		"Gmail - Messages - Send": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "ABC12345+EXAMPLE123456789" },
+							{
+								"name": "X-Received",
+								"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+							},
+							{ "name": "Return-Path", "value": "<promo@promotion.example.com>" },
+							{ "name": "Date", "value": "Thu, 5 Dec 2024 08:30:00 -0800" },
+							{ "name": "From", "value": "Holiday Deals <promo@promotion.example.com>" },
+							{ "name": "To", "value": "exampleuser@gmail.com" },
+							{ "name": "Message-ID", "value": "<12345abc67890@promotion.example.com>" },
+							{ "name": "Subject", "value": "Exclusive Holiday Discounts!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000"
+				}
+			}
+		],
+		"Gmail - Messages - Send and Wait for Approval": [{ "json": {} }],
+		"Gmail - Messages - Add Label": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "ABC12345+EXAMPLE123456789" },
+							{
+								"name": "X-Received",
+								"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+							},
+							{ "name": "Return-Path", "value": "<promo@promotion.example.com>" },
+							{ "name": "Date", "value": "Thu, 5 Dec 2024 08:30:00 -0800" },
+							{ "name": "From", "value": "Holiday Deals <promo@promotion.example.com>" },
+							{ "name": "To", "value": "exampleuser@gmail.com" },
+							{ "name": "Message-ID", "value": "<12345abc67890@promotion.example.com>" },
+							{ "name": "Subject", "value": "Exclusive Holiday Discounts!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000"
+				}
+			}
+		],
+		"Gmail - Messages - Delete": [{ "json": { "success": true } }],
+		"Gmail - Messages - Get (simplified)": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000",
+					"labels": [],
+					"Delivered-To": "exampleuser@gmail.com",
+					"Received": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)",
+					"X-Google-Smtp-Source": "ABC12345+EXAMPLE123456789",
+					"X-Received": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)",
+					"ARC-Seal": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456=",
+					"ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345=",
+					"ARC-Authentication-Results": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com",
+					"Return-Path": "<promo@promotion.example.com>",
+					"Date": "Thu, 5 Dec 2024 08:30:00 -0800",
+					"From": "Holiday Deals <promo@promotion.example.com>",
+					"To": "exampleuser@gmail.com",
+					"Message-ID": "<12345abc67890@promotion.example.com>",
+					"Subject": "Exclusive Holiday Discounts!",
+					"MIME-Version": "1.0",
+					"Content-Type": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+				}
+			}
+		],
+		"Gmail - Messages - Get": [
+			{ "json": { "headers": { "": "��-zf���'���" }, "html": false } }
+		],
+		"Gmail - Messages - Mark as Read": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "ABC12345+EXAMPLE123456789" },
+							{
+								"name": "X-Received",
+								"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+							},
+							{ "name": "Return-Path", "value": "<promo@promotion.example.com>" },
+							{ "name": "Date", "value": "Thu, 5 Dec 2024 08:30:00 -0800" },
+							{ "name": "From", "value": "Holiday Deals <promo@promotion.example.com>" },
+							{ "name": "To", "value": "exampleuser@gmail.com" },
+							{ "name": "Message-ID", "value": "<12345abc67890@promotion.example.com>" },
+							{ "name": "Subject", "value": "Exclusive Holiday Discounts!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000"
+				}
+			}
+		],
+		"Gmail - Messages - Mark as Unread": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "ABC12345+EXAMPLE123456789" },
+							{
+								"name": "X-Received",
+								"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+							},
+							{ "name": "Return-Path", "value": "<promo@promotion.example.com>" },
+							{ "name": "Date", "value": "Thu, 5 Dec 2024 08:30:00 -0800" },
+							{ "name": "From", "value": "Holiday Deals <promo@promotion.example.com>" },
+							{ "name": "To", "value": "exampleuser@gmail.com" },
+							{ "name": "Message-ID", "value": "<12345abc67890@promotion.example.com>" },
+							{ "name": "Subject", "value": "Exclusive Holiday Discounts!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000"
+				}
+			}
+		],
+		"Gmail - Messages - Remove Label": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "ABC12345+EXAMPLE123456789" },
+							{
+								"name": "X-Received",
+								"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+							},
+							{ "name": "Return-Path", "value": "<promo@promotion.example.com>" },
+							{ "name": "Date", "value": "Thu, 5 Dec 2024 08:30:00 -0800" },
+							{ "name": "From", "value": "Holiday Deals <promo@promotion.example.com>" },
+							{ "name": "To", "value": "exampleuser@gmail.com" },
+							{ "name": "Message-ID", "value": "<12345abc67890@promotion.example.com>" },
+							{ "name": "Subject", "value": "Exclusive Holiday Discounts!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000"
+				}
+			}
+		],
+		"Gmail - Messages - Reply": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "ABC12345+EXAMPLE123456789" },
+							{
+								"name": "X-Received",
+								"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+							},
+							{ "name": "Return-Path", "value": "<promo@promotion.example.com>" },
+							{ "name": "Date", "value": "Thu, 5 Dec 2024 08:30:00 -0800" },
+							{ "name": "From", "value": "Holiday Deals <promo@promotion.example.com>" },
+							{ "name": "To", "value": "exampleuser@gmail.com" },
+							{ "name": "Message-ID", "value": "<12345abc67890@promotion.example.com>" },
+							{ "name": "Subject", "value": "Exclusive Holiday Discounts!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Gmail - Messages - All (simplified)",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Messages - All",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Messages - Send and Wait for Approval",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Messages - Add Label",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Messages - Delete",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Messages - Get (simplified)",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Messages - Get",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Messages - Mark as Read",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Messages - Mark as Unread",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Messages - Remove Label",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Messages - Reply",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Edit Fields",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Attachment": {
+			"main": [
+				[
+					{
+						"node": "Gmail - Messages - Send",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Edit Fields": {
+			"main": [
+				[
+					{
+						"node": "Attachment",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "f497669f-aced-4f80-8e59-381d1c9422c7",
+	"meta": {
+		"instanceId": "27cc9b56542ad45b38725555722c50a1c3fee1670bbb67980558314ee08517c4"
+	},
+	"id": "jOoDfyAYzh3NAli3",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/test/v2/threads.workflow.json b/packages/nodes-base/nodes/Google/Gmail/test/v2/threads.workflow.json
new file mode 100644
index 0000000000000..e92d016877310
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/test/v2/threads.workflow.json
@@ -0,0 +1,1174 @@
+{
+	"name": "My workflow 130",
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [20, 920],
+			"id": "cfa1d2b9-9706-48a2-9dd4-39e4c3c0ccb4",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"resource": "thread",
+				"limit": 2,
+				"filters": {}
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [800, 320],
+			"id": "7b925004-8583-4f43-b1f0-6a37331cabf4",
+			"name": "Gmail - Threads - All (simplified)",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "thread",
+				"limit": 2,
+				"filters": {
+					"includeSpamTrash": true,
+					"labelIds": ["CHAT"],
+					"q": "has:attachment",
+					"readStatus": "unread",
+					"receivedAfter": "2024-12-05T00:00:00",
+					"receivedBefore": "2024-12-27T00:00:00"
+				}
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [800, 520],
+			"id": "22fa66e3-ac89-4289-82c7-e3be3c271d04",
+			"name": "Gmail - Threads - All",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "thread",
+				"operation": "addLabels",
+				"threadId": "test-thread-id",
+				"labelIds": ["CHAT"]
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [800, 700],
+			"id": "b94b2e79-a47d-4e05-a74b-957a9efe46a5",
+			"name": "Gmail - Threads - Add Label",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "thread",
+				"operation": "removeLabels",
+				"threadId": "test-thread-id",
+				"labelIds": ["CHAT"]
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [800, 900],
+			"id": "5322c0f6-e040-4bb4-9014-041662e7a173",
+			"name": "Gmail - Threads - Remove Label",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "thread",
+				"operation": "delete",
+				"threadId": "test-thread-id"
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [800, 1100],
+			"id": "6f7139f1-9236-4d35-b7ba-48f3e00d11ec",
+			"name": "Gmail - Threads - Delete",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "thread",
+				"operation": "get",
+				"threadId": "test-thread-id",
+				"options": {}
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [800, 1300],
+			"id": "4e7bccd2-e663-4824-b870-bb5fe7ad6c57",
+			"name": "Gmail - Threads - Get (simplified)",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "thread",
+				"operation": "get",
+				"threadId": "test-thread-id",
+				"simple": false,
+				"options": {
+					"returnOnlyMessages": true
+				}
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [800, 1500],
+			"id": "4084a6fd-6770-4aa2-ac4e-6108f9b159a2",
+			"name": "Gmail - Threads - Get",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "thread",
+				"operation": "reply",
+				"threadId": "test-thread-id",
+				"messageId": "=test snippet",
+				"message": "Test reply",
+				"options": {
+					"attachmentsUi": {
+						"attachmentsBinary": [
+							{
+								"property": "data"
+							}
+						]
+					},
+					"bccList": "test-bcc@n8n.io",
+					"ccList": "test-cc@n8n.io",
+					"senderName": "Test Sender Name",
+					"replyToSenderOnly": true
+				}
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [1120, 2080],
+			"id": "d5b44033-655a-4e18-99c7-6ee19140967b",
+			"name": "Gmail - Threads - Reply",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "thread",
+				"operation": "trash",
+				"threadId": "test-thread-id"
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [800, 1680],
+			"id": "1503c357-043c-45f5-bbe8-1d7141a84546",
+			"name": "Gmail - Threads - Trash",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "thread",
+				"operation": "untrash",
+				"threadId": "test-thread-id"
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [800, 1880],
+			"id": "38c02fc0-2e8e-4a6b-a045-eb45f2811c0a",
+			"name": "Gmail - Threads - Untrash",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "0a4e38fe-ed38-400e-afb1-9d430f167d54",
+							"name": "attachment",
+							"value": true,
+							"type": "boolean"
+						}
+					]
+				},
+				"options": {}
+			},
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.4,
+			"position": [800, 2080],
+			"id": "d6a20bfa-4bee-4aef-b1b0-198ed73d1b3f",
+			"name": "Edit Fields1"
+		},
+		{
+			"parameters": {
+				"operation": "toJson",
+				"options": {}
+			},
+			"type": "n8n-nodes-base.convertToFile",
+			"typeVersion": 1.1,
+			"position": [960, 2080],
+			"id": "47d4a53b-6019-444b-9746-f957704cd4e0",
+			"name": "Attachment1"
+		}
+	],
+	"pinData": {
+		"Gmail - Threads - All (simplified)": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "ABC12345+EXAMPLE123456789" },
+							{
+								"name": "X-Received",
+								"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+							},
+							{ "name": "Return-Path", "value": "<promo@promotion.example.com>" },
+							{ "name": "Date", "value": "Thu, 5 Dec 2024 08:30:00 -0800" },
+							{ "name": "From", "value": "Holiday Deals <promo@promotion.example.com>" },
+							{ "name": "To", "value": "exampleuser@gmail.com" },
+							{ "name": "Message-ID", "value": "<12345abc67890@promotion.example.com>" },
+							{ "name": "Subject", "value": "Exclusive Holiday Discounts!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000"
+				}
+			},
+			{
+				"json": {
+					"id": "z9y8x7w6v5u4t3s2",
+					"threadId": "z9y8x7w6v5u4t3s2",
+					"labelIds": ["UNREAD", "CATEGORY_SOCIAL", "INBOX"],
+					"snippet": "Your friend John just shared a new photo with you! Check it out now.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser2@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id def456ghi789; Fri, 6 Dec 2024 09:45:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "XYZ67890+EXAMPLE0987654321" },
+							{
+								"name": "X-Received",
+								"value": "by 198.51.100.2 with SMTP id 67890def12345; Fri, 6 Dec 2024 09:45:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733490900; cv=none; d=example2.com; s=arc-20241206; b=HIJKLMN987654="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example2.com; s=arc-20241206; bh=EXAMPLEHASH67890="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example2.com; dkim=pass header.i=@social.example2.com; spf=pass smtp.mailfrom=notifications@social.example2.com; dmarc=pass header.from=example2.com"
+							},
+							{ "name": "Return-Path", "value": "<notifications@social.example2.com>" },
+							{ "name": "Date", "value": "Fri, 6 Dec 2024 09:45:00 -0800" },
+							{ "name": "From", "value": "John's Photos <notifications@social.example2.com>" },
+							{ "name": "To", "value": "exampleuser2@gmail.com" },
+							{ "name": "Message-ID", "value": "<67890def12345@social.example2.com>" },
+							{ "name": "Subject", "value": "John shared a new photo with you!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_67890_12345.1733490900000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 4321,
+									"data": "U2VlIHRoZSBhdHRhY2hlZCBwaG90byBhbmQgcmVwbHkgdG8gSm9obi4gV2UgaG9wZSB5b3UgbGlrZSBpdCE="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 8765,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+U2VlIHRoZSBhdHRhY2hlZCBwaG90byBhbmQgcmVwbHkgdG8gPGI+Sm9obi48L2I+IFdlIGhvcGUgeW91IGxpa2UgaXQhPC9kaXY+"
+								}
+							}
+						]
+					},
+					"sizeEstimate": 54321,
+					"historyId": "98765",
+					"internalDate": "1733490900000"
+				}
+			}
+		],
+		"Gmail - Threads - All": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "ABC12345+EXAMPLE123456789" },
+							{
+								"name": "X-Received",
+								"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+							},
+							{ "name": "Return-Path", "value": "<promo@promotion.example.com>" },
+							{ "name": "Date", "value": "Thu, 5 Dec 2024 08:30:00 -0800" },
+							{ "name": "From", "value": "Holiday Deals <promo@promotion.example.com>" },
+							{ "name": "To", "value": "exampleuser@gmail.com" },
+							{ "name": "Message-ID", "value": "<12345abc67890@promotion.example.com>" },
+							{ "name": "Subject", "value": "Exclusive Holiday Discounts!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000"
+				}
+			},
+			{
+				"json": {
+					"id": "z9y8x7w6v5u4t3s2",
+					"threadId": "z9y8x7w6v5u4t3s2",
+					"labelIds": ["UNREAD", "CATEGORY_SOCIAL", "INBOX"],
+					"snippet": "Your friend John just shared a new photo with you! Check it out now.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser2@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id def456ghi789; Fri, 6 Dec 2024 09:45:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "XYZ67890+EXAMPLE0987654321" },
+							{
+								"name": "X-Received",
+								"value": "by 198.51.100.2 with SMTP id 67890def12345; Fri, 6 Dec 2024 09:45:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733490900; cv=none; d=example2.com; s=arc-20241206; b=HIJKLMN987654="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example2.com; s=arc-20241206; bh=EXAMPLEHASH67890="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example2.com; dkim=pass header.i=@social.example2.com; spf=pass smtp.mailfrom=notifications@social.example2.com; dmarc=pass header.from=example2.com"
+							},
+							{ "name": "Return-Path", "value": "<notifications@social.example2.com>" },
+							{ "name": "Date", "value": "Fri, 6 Dec 2024 09:45:00 -0800" },
+							{ "name": "From", "value": "John's Photos <notifications@social.example2.com>" },
+							{ "name": "To", "value": "exampleuser2@gmail.com" },
+							{ "name": "Message-ID", "value": "<67890def12345@social.example2.com>" },
+							{ "name": "Subject", "value": "John shared a new photo with you!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_67890_12345.1733490900000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 4321,
+									"data": "U2VlIHRoZSBhdHRhY2hlZCBwaG90byBhbmQgcmVwbHkgdG8gSm9obi4gV2UgaG9wZSB5b3UgbGlrZSBpdCE="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 8765,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+U2VlIHRoZSBhdHRhY2hlZCBwaG90byBhbmQgcmVwbHkgdG8gPGI+Sm9obi48L2I+IFdlIGhvcGUgeW91IGxpa2UgaXQhPC9kaXY+"
+								}
+							}
+						]
+					},
+					"sizeEstimate": 54321,
+					"historyId": "98765",
+					"internalDate": "1733490900000"
+				}
+			}
+		],
+		"Gmail - Threads - Add Label": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "ABC12345+EXAMPLE123456789" },
+							{
+								"name": "X-Received",
+								"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+							},
+							{ "name": "Return-Path", "value": "<promo@promotion.example.com>" },
+							{ "name": "Date", "value": "Thu, 5 Dec 2024 08:30:00 -0800" },
+							{ "name": "From", "value": "Holiday Deals <promo@promotion.example.com>" },
+							{ "name": "To", "value": "exampleuser@gmail.com" },
+							{ "name": "Message-ID", "value": "<12345abc67890@promotion.example.com>" },
+							{ "name": "Subject", "value": "Exclusive Holiday Discounts!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000"
+				}
+			}
+		],
+		"Gmail - Threads - Remove Label": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "ABC12345+EXAMPLE123456789" },
+							{
+								"name": "X-Received",
+								"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+							},
+							{ "name": "Return-Path", "value": "<promo@promotion.example.com>" },
+							{ "name": "Date", "value": "Thu, 5 Dec 2024 08:30:00 -0800" },
+							{ "name": "From", "value": "Holiday Deals <promo@promotion.example.com>" },
+							{ "name": "To", "value": "exampleuser@gmail.com" },
+							{ "name": "Message-ID", "value": "<12345abc67890@promotion.example.com>" },
+							{ "name": "Subject", "value": "Exclusive Holiday Discounts!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000"
+				}
+			}
+		],
+		"Gmail - Threads - Delete": [{ "json": { "success": true } }],
+		"Gmail - Threads - Get (simplified)": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "ABC12345+EXAMPLE123456789" },
+							{
+								"name": "X-Received",
+								"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+							},
+							{ "name": "Return-Path", "value": "<promo@promotion.example.com>" },
+							{ "name": "Date", "value": "Thu, 5 Dec 2024 08:30:00 -0800" },
+							{ "name": "From", "value": "Holiday Deals <promo@promotion.example.com>" },
+							{ "name": "To", "value": "exampleuser@gmail.com" },
+							{ "name": "Message-ID", "value": "<12345abc67890@promotion.example.com>" },
+							{ "name": "Subject", "value": "Exclusive Holiday Discounts!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000",
+					"messages": []
+				}
+			}
+		],
+		"Gmail - Threads - Get": [],
+		"Gmail - Threads - Reply": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "ABC12345+EXAMPLE123456789" },
+							{
+								"name": "X-Received",
+								"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+							},
+							{ "name": "Return-Path", "value": "<promo@promotion.example.com>" },
+							{ "name": "Date", "value": "Thu, 5 Dec 2024 08:30:00 -0800" },
+							{ "name": "From", "value": "Holiday Deals <promo@promotion.example.com>" },
+							{ "name": "To", "value": "exampleuser@gmail.com" },
+							{ "name": "Message-ID", "value": "<12345abc67890@promotion.example.com>" },
+							{ "name": "Subject", "value": "Exclusive Holiday Discounts!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000"
+				}
+			}
+		],
+		"Gmail - Threads - Trash": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "ABC12345+EXAMPLE123456789" },
+							{
+								"name": "X-Received",
+								"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+							},
+							{ "name": "Return-Path", "value": "<promo@promotion.example.com>" },
+							{ "name": "Date", "value": "Thu, 5 Dec 2024 08:30:00 -0800" },
+							{ "name": "From", "value": "Holiday Deals <promo@promotion.example.com>" },
+							{ "name": "To", "value": "exampleuser@gmail.com" },
+							{ "name": "Message-ID", "value": "<12345abc67890@promotion.example.com>" },
+							{ "name": "Subject", "value": "Exclusive Holiday Discounts!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000"
+				}
+			}
+		],
+		"Gmail - Threads - Untrash": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "ABC12345+EXAMPLE123456789" },
+							{
+								"name": "X-Received",
+								"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+							},
+							{ "name": "Return-Path", "value": "<promo@promotion.example.com>" },
+							{ "name": "Date", "value": "Thu, 5 Dec 2024 08:30:00 -0800" },
+							{ "name": "From", "value": "Holiday Deals <promo@promotion.example.com>" },
+							{ "name": "To", "value": "exampleuser@gmail.com" },
+							{ "name": "Message-ID", "value": "<12345abc67890@promotion.example.com>" },
+							{ "name": "Subject", "value": "Exclusive Holiday Discounts!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Gmail - Threads - All (simplified)",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Threads - All",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Threads - Add Label",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Threads - Delete",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Threads - Get (simplified)",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Threads - Get",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Threads - Trash",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Threads - Untrash",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Threads - Remove Label",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Edit Fields1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Edit Fields1": {
+			"main": [
+				[
+					{
+						"node": "Attachment1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Attachment1": {
+			"main": [
+				[
+					{
+						"node": "Gmail - Threads - Reply",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "84fb11a4-4166-45bd-bd9f-60fa378d9e68",
+	"meta": {
+		"instanceId": "27cc9b56542ad45b38725555722c50a1c3fee1670bbb67980558314ee08517c4"
+	},
+	"id": "09KDcfGmfDrLInDE",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/test/v2/utils.test.ts b/packages/nodes-base/nodes/Google/Gmail/test/v2/utils.test.ts
index f0d026150219f..3564092e8524e 100644
--- a/packages/nodes-base/nodes/Google/Gmail/test/v2/utils.test.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/test/v2/utils.test.ts
@@ -1,6 +1,7 @@
-import type { IExecuteFunctions, INode } from 'n8n-workflow';
-import { DateTime } from 'luxon';
 import { mock } from 'jest-mock-extended';
+import { DateTime } from 'luxon';
+import type { IExecuteFunctions, INode } from 'n8n-workflow';
+
 import { parseRawEmail, prepareTimestamp } from '../../GenericFunctions';
 
 const node: INode = {
diff --git a/packages/nodes-base/nodes/Google/Gmail/v1/GmailV1.node.ts b/packages/nodes-base/nodes/Google/Gmail/v1/GmailV1.node.ts
index c17c26eda9c5e..402553adbeeee 100644
--- a/packages/nodes-base/nodes/Google/Gmail/v1/GmailV1.node.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/v1/GmailV1.node.ts
@@ -1,3 +1,4 @@
+import isEmpty from 'lodash/isEmpty';
 import {
 	NodeConnectionType,
 	type IBinaryKeyData,
@@ -12,7 +13,12 @@ import {
 	type INodeTypeDescription,
 } from 'n8n-workflow';
 
-import isEmpty from 'lodash/isEmpty';
+import { oldVersionNotice } from '@utils/descriptions';
+
+import { draftFields, draftOperations } from './DraftDescription';
+import { labelFields, labelOperations } from './LabelDescription';
+import { messageFields, messageOperations } from './MessageDescription';
+import { messageLabelFields, messageLabelOperations } from './MessageLabelDescription';
 import type { IEmail } from '../../../../utils/sendAndWait/interfaces';
 import {
 	encodeEmail,
@@ -22,16 +28,6 @@ import {
 	parseRawEmail,
 } from '../GenericFunctions';
 
-import { messageFields, messageOperations } from './MessageDescription';
-
-import { messageLabelFields, messageLabelOperations } from './MessageLabelDescription';
-
-import { labelFields, labelOperations } from './LabelDescription';
-
-import { draftFields, draftOperations } from './DraftDescription';
-
-import { oldVersionNotice } from '@utils/descriptions';
-
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Gmail',
 	name: 'gmail',
diff --git a/packages/nodes-base/nodes/Google/Gmail/v2/GmailV2.node.ts b/packages/nodes-base/nodes/Google/Gmail/v2/GmailV2.node.ts
index debb9a7fbc3c7..ded6db9e086f2 100644
--- a/packages/nodes-base/nodes/Google/Gmail/v2/GmailV2.node.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/v2/GmailV2.node.ts
@@ -1,9 +1,7 @@
 import type {
-	IExecuteFunctions,
 	IDataObject,
-	ILoadOptionsFunctions,
+	IExecuteFunctions,
 	INodeExecutionData,
-	INodePropertyOptions,
 	INodeType,
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
@@ -15,7 +13,17 @@ import {
 	WAIT_INDEFINITELY,
 } from 'n8n-workflow';
 
+import { draftFields, draftOperations } from './DraftDescription';
+import { labelFields, labelOperations } from './LabelDescription';
+import { getGmailAliases, getLabels, getThreadMessages } from './loadOptions';
+import { messageFields, messageOperations } from './MessageDescription';
+import { threadFields, threadOperations } from './ThreadDescription';
 import type { IEmail } from '../../../../utils/sendAndWait/interfaces';
+import {
+	createEmail,
+	getSendAndWaitProperties,
+	sendAndWaitWebhook,
+} from '../../../../utils/sendAndWait/utils';
 import {
 	encodeEmail,
 	googleApiRequest,
@@ -30,20 +38,6 @@ import {
 	unescapeSnippets,
 } from '../GenericFunctions';
 
-import { messageFields, messageOperations } from './MessageDescription';
-
-import { labelFields, labelOperations } from './LabelDescription';
-
-import { draftFields, draftOperations } from './DraftDescription';
-
-import { threadFields, threadOperations } from './ThreadDescription';
-
-import {
-	getSendAndWaitProperties,
-	createEmail,
-	sendAndWaitWebhook,
-} from '../../../../utils/sendAndWait/utils';
-
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Gmail',
 	name: 'gmail',
@@ -88,6 +82,15 @@ const versionDescription: INodeTypeDescription = {
 			restartWebhook: true,
 			isFullPath: true,
 		},
+		{
+			name: 'default',
+			httpMethod: 'POST',
+			responseMode: 'onReceived',
+			responseData: '',
+			path: '={{ $nodeId }}',
+			restartWebhook: true,
+			isFullPath: true,
+		},
 	],
 	properties: [
 		{
@@ -178,78 +181,9 @@ export class GmailV2 implements INodeType {
 
 	methods = {
 		loadOptions: {
-			// Get all the labels to display them to user so that they can
-			// select them easily
-			async getLabels(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-
-				const labels = await googleApiRequestAllItems.call(
-					this,
-					'labels',
-					'GET',
-					'/gmail/v1/users/me/labels',
-				);
-
-				for (const label of labels) {
-					returnData.push({
-						name: label.name,
-						value: label.id,
-					});
-				}
-
-				return returnData.sort((a, b) => {
-					if (a.name < b.name) {
-						return -1;
-					}
-					if (a.name > b.name) {
-						return 1;
-					}
-					return 0;
-				});
-			},
-
-			async getThreadMessages(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-
-				const id = this.getNodeParameter('threadId', 0) as string;
-				const { messages } = await googleApiRequest.call(
-					this,
-					'GET',
-					`/gmail/v1/users/me/threads/${id}`,
-					{},
-					{ format: 'minimal' },
-				);
-
-				for (const message of messages || []) {
-					returnData.push({
-						name: message.snippet,
-						value: message.id,
-					});
-				}
-
-				return returnData;
-			},
-
-			async getGmailAliases(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const { sendAs } = await googleApiRequest.call(
-					this,
-					'GET',
-					'/gmail/v1/users/me/settings/sendAs',
-				);
-
-				for (const alias of sendAs || []) {
-					const displayName = alias.isDefault
-						? `${alias.sendAsEmail} (Default)`
-						: alias.sendAsEmail;
-					returnData.push({
-						name: displayName,
-						value: alias.sendAsEmail,
-					});
-				}
-
-				return returnData;
-			},
+			getLabels,
+			getThreadMessages,
+			getGmailAliases,
 		},
 	};
 
diff --git a/packages/nodes-base/nodes/Google/Gmail/v2/MessageDescription.ts b/packages/nodes-base/nodes/Google/Gmail/v2/MessageDescription.ts
index 83b1e6fcb0245..4273561c9a753 100644
--- a/packages/nodes-base/nodes/Google/Gmail/v2/MessageDescription.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/v2/MessageDescription.ts
@@ -1,4 +1,5 @@
 import { SEND_AND_WAIT_OPERATION, type INodeProperties } from 'n8n-workflow';
+
 import { appendAttributionOption } from '../../../../utils/descriptions';
 
 export const messageOperations: INodeProperties[] = [
@@ -59,9 +60,9 @@ export const messageOperations: INodeProperties[] = [
 				action: 'Send a message',
 			},
 			{
-				name: 'Send and Wait for Approval',
+				name: 'Send and Wait for Response',
 				value: SEND_AND_WAIT_OPERATION,
-				action: 'Send a message and wait for approval',
+				action: 'Send message and wait for response',
 			},
 		],
 		default: 'send',
diff --git a/packages/nodes-base/nodes/Google/Gmail/v2/loadOptions.ts b/packages/nodes-base/nodes/Google/Gmail/v2/loadOptions.ts
new file mode 100644
index 0000000000000..6c5a7df9aa70c
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/v2/loadOptions.ts
@@ -0,0 +1,75 @@
+import type { ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
+
+import { googleApiRequest, googleApiRequestAllItems } from '../GenericFunctions';
+
+/**
+ * Get all the labels to display them to user so that they can select them easily
+ */
+export async function getLabels(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+
+	const labels = await googleApiRequestAllItems.call(
+		this,
+		'labels',
+		'GET',
+		'/gmail/v1/users/me/labels',
+	);
+
+	for (const label of labels) {
+		returnData.push({
+			name: label.name,
+			value: label.id,
+		});
+	}
+
+	return returnData.sort((a, b) => {
+		if (a.name < b.name) {
+			return -1;
+		}
+		if (a.name > b.name) {
+			return 1;
+		}
+		return 0;
+	});
+}
+
+export async function getThreadMessages(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+
+	const id = this.getNodeParameter('threadId', 0) as string;
+	const { messages } = await googleApiRequest.call(
+		this,
+		'GET',
+		`/gmail/v1/users/me/threads/${id}`,
+		{},
+		{ format: 'minimal' },
+	);
+
+	for (const message of messages || []) {
+		returnData.push({
+			name: message.snippet,
+			value: message.id,
+		});
+	}
+
+	return returnData;
+}
+
+export async function getGmailAliases(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+	const { sendAs } = await googleApiRequest.call(this, 'GET', '/gmail/v1/users/me/settings/sendAs');
+
+	for (const alias of sendAs || []) {
+		const displayName = alias.isDefault ? `${alias.sendAsEmail} (Default)` : alias.sendAsEmail;
+		returnData.push({
+			name: displayName,
+			value: alias.sendAsEmail,
+		});
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.ts b/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.ts
index 193747b01bed7..dcec9f093ae9f 100644
--- a/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.ts
+++ b/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.ts
@@ -1,3 +1,4 @@
+import ISO6391 from 'iso-639-1';
 import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
@@ -9,7 +10,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import ISO6391 from 'iso-639-1';
+import { googleApiRequest } from './GenericFunctions';
 import type {
 	AttributesValuesUi,
 	CommentAnalyzeBody,
@@ -17,8 +18,6 @@ import type {
 	RequestedAttributes,
 } from './types';
 
-import { googleApiRequest } from './GenericFunctions';
-
 export class GooglePerspective implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Google Perspective',
diff --git a/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.node.ts b/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.node.ts
index 8993760e574e5..b23183c29b3c3 100644
--- a/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.node.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.node.ts
@@ -7,13 +7,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { GOOGLE_DRIVE_FILE_URL_REGEX, GOOGLE_SHEETS_SHEET_URL_REGEX } from '../constants';
-import { apiRequest } from './v2/transport';
-import { sheetsSearch, spreadSheetsSearch } from './v2/methods/listSearch';
-import { GoogleSheet } from './v2/helpers/GoogleSheet';
-import { getSheetHeaderRowAndSkipEmpty } from './v2/methods/loadOptions';
-import type { ResourceLocator, ValueRenderOption } from './v2/helpers/GoogleSheets.types';
-
 import {
 	arrayOfArraysToJson,
 	BINARY_MIME_TYPE,
@@ -21,6 +14,12 @@ import {
 	getRevisionFile,
 	sheetBinaryToArrayOfArrays,
 } from './GoogleSheetsTrigger.utils';
+import { GoogleSheet } from './v2/helpers/GoogleSheet';
+import type { ResourceLocator, ValueRenderOption } from './v2/helpers/GoogleSheets.types';
+import { sheetsSearch, spreadSheetsSearch } from './v2/methods/listSearch';
+import { getSheetHeaderRowAndSkipEmpty } from './v2/methods/loadOptions';
+import { apiRequest } from './v2/transport';
+import { GOOGLE_DRIVE_FILE_URL_REGEX, GOOGLE_SHEETS_SHEET_URL_REGEX } from '../constants';
 
 export class GoogleSheetsTrigger implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.utils.ts b/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.utils.ts
index 91ab4c69a8741..fb6c1d908bee4 100644
--- a/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.utils.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.utils.ts
@@ -1,8 +1,8 @@
-import type { IDataObject, IPollFunctions } from 'n8n-workflow';
-
-import * as XLSX from 'xlsx';
 import isEqual from 'lodash/isEqual';
 import zip from 'lodash/zip';
+import type { IDataObject, IPollFunctions } from 'n8n-workflow';
+import * as XLSX from 'xlsx';
+
 import type { SheetDataRow, SheetRangeData } from './v2/helpers/GoogleSheets.types';
 import { apiRequest } from './v2/transport';
 
diff --git a/packages/nodes-base/nodes/Google/Sheet/test/v2/methods/loadOptions.test.ts b/packages/nodes-base/nodes/Google/Sheet/test/v2/methods/loadOptions.test.ts
new file mode 100644
index 0000000000000..ce22c9783d724
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Sheet/test/v2/methods/loadOptions.test.ts
@@ -0,0 +1,169 @@
+import type { ILoadOptionsFunctions } from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
+import {
+	getSheetHeaderRow,
+	getSheetHeaderRowAndAddColumn,
+	getSheetHeaderRowAndSkipEmpty,
+	getSheetHeaderRowWithGeneratedColumnNames,
+	getSheets,
+} from '../../../v2/methods/loadOptions';
+
+jest.mock('../../../v2/helpers/GoogleSheets.utils');
+
+const mockGoogleSheetInstance = {
+	spreadsheetGetSheets: jest.fn(),
+	spreadsheetGetSheet: jest.fn(),
+	getData: jest.fn(),
+	testFilter: jest.fn(),
+};
+
+jest.mock('../../../v2/helpers/GoogleSheet', () => ({
+	GoogleSheet: jest.fn().mockImplementation(() => mockGoogleSheetInstance),
+}));
+
+describe('Google Sheets Functions', () => {
+	let mockLoadOptionsFunctions: Partial<ILoadOptionsFunctions>;
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+
+		mockLoadOptionsFunctions = {
+			getNodeParameter: jest.fn((paramName: string) => {
+				if (paramName === 'documentId') {
+					return { mode: 'mode', value: 'value' };
+				}
+				if (paramName === 'sheetName') {
+					return { mode: 'Sheet1', value: 'Sheet1' };
+				}
+			}),
+			getNode: jest.fn(),
+		};
+	});
+
+	describe('getSheets', () => {
+		it('should return an empty array if documentId is null', async () => {
+			mockLoadOptionsFunctions.getNodeParameter = jest.fn().mockReturnValue(null);
+
+			const result = await getSheets.call(mockLoadOptionsFunctions as ILoadOptionsFunctions);
+			expect(result).toEqual([]);
+		});
+
+		it('should throw an error if no data is returned', async () => {
+			mockGoogleSheetInstance.spreadsheetGetSheets.mockResolvedValue(undefined);
+
+			await expect(
+				getSheets.call(mockLoadOptionsFunctions as ILoadOptionsFunctions),
+			).rejects.toThrow(NodeOperationError);
+		});
+
+		it('should return sheets with GRID type', async () => {
+			mockGoogleSheetInstance.spreadsheetGetSheets.mockResolvedValue({
+				sheets: [
+					{ properties: { sheetType: 'GRID', title: 'Sheet1', sheetId: '123' } },
+					{ properties: { sheetType: 'OTHER', title: 'Sheet2', sheetId: '456' } },
+				],
+			});
+
+			const result = await getSheets.call(mockLoadOptionsFunctions as ILoadOptionsFunctions);
+			expect(result).toEqual([{ name: 'Sheet1', value: '123' }]);
+		});
+	});
+
+	describe('getSheetHeaderRow', () => {
+		it('should return an empty array if documentId is null', async () => {
+			mockLoadOptionsFunctions.getNodeParameter = jest.fn().mockReturnValue(null);
+
+			const result = await getSheetHeaderRow.call(
+				mockLoadOptionsFunctions as ILoadOptionsFunctions,
+			);
+			expect(result).toEqual([]);
+		});
+
+		it('should throw an error if no data is returned', async () => {
+			mockGoogleSheetInstance.spreadsheetGetSheet.mockResolvedValue({
+				title: 'Sheet1',
+			});
+			mockGoogleSheetInstance.getData.mockResolvedValue(undefined);
+
+			await expect(
+				getSheetHeaderRow.call(mockLoadOptionsFunctions as ILoadOptionsFunctions),
+			).rejects.toThrow(NodeOperationError);
+		});
+
+		it('should return column headers', async () => {
+			mockGoogleSheetInstance.spreadsheetGetSheet.mockResolvedValue({
+				title: 'Sheet1',
+			});
+			mockGoogleSheetInstance.getData.mockResolvedValue([['Header1', 'Header2', 'Header3']]);
+			mockGoogleSheetInstance.testFilter.mockReturnValue(['Header1', 'Header2', 'Header3']);
+
+			const result = await getSheetHeaderRow.call(
+				mockLoadOptionsFunctions as ILoadOptionsFunctions,
+			);
+			expect(result).toEqual([
+				{ name: 'Header1', value: 'Header1' },
+				{ name: 'Header2', value: 'Header2' },
+				{ name: 'Header3', value: 'Header3' },
+			]);
+		});
+	});
+
+	describe('getSheetHeaderRowAndAddColumn', () => {
+		it('should add a new column and exclude the column to match on', async () => {
+			mockGoogleSheetInstance.spreadsheetGetSheet.mockResolvedValue({
+				title: 'Sheet1',
+			});
+			mockGoogleSheetInstance.getData.mockResolvedValue([['Header1']]);
+			mockGoogleSheetInstance.testFilter.mockReturnValue(['Header1']);
+
+			const result = await getSheetHeaderRowAndAddColumn.call(
+				mockLoadOptionsFunctions as ILoadOptionsFunctions,
+			);
+
+			expect(result).toEqual([
+				{ name: 'Header1', value: 'Header1' },
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+				{ name: 'New column ...', value: 'newColumn' },
+			]);
+		});
+	});
+
+	describe('getSheetHeaderRowWithGeneratedColumnNames', () => {
+		it('should generate column names for empty values', async () => {
+			mockGoogleSheetInstance.spreadsheetGetSheet.mockResolvedValue({
+				title: 'Sheet1',
+			});
+			mockGoogleSheetInstance.getData.mockResolvedValue([['', 'Header1', '']]);
+			mockGoogleSheetInstance.testFilter.mockReturnValue(['', 'Header1', '']);
+
+			const result = await getSheetHeaderRowWithGeneratedColumnNames.call(
+				mockLoadOptionsFunctions as ILoadOptionsFunctions,
+			);
+
+			expect(result).toEqual([
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+				{ name: 'col_1', value: 'col_1' },
+				{ name: 'Header1', value: 'Header1' },
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+				{ name: 'col_3', value: 'col_3' },
+			]);
+		});
+	});
+
+	describe('getSheetHeaderRowAndSkipEmpty', () => {
+		it('should skip columns with empty values', async () => {
+			mockGoogleSheetInstance.spreadsheetGetSheet.mockResolvedValue({
+				title: 'Sheet1',
+			});
+			mockGoogleSheetInstance.getData.mockResolvedValue([['', 'Header1', '']]);
+			mockGoogleSheetInstance.testFilter.mockReturnValue(['', 'Header1', '']);
+
+			const result = await getSheetHeaderRowAndSkipEmpty.call(
+				mockLoadOptionsFunctions as ILoadOptionsFunctions,
+			);
+
+			expect(result).toEqual([{ name: 'Header1', value: 'Header1' }]);
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Google/Sheet/test/v2/utils/utils.test.ts b/packages/nodes-base/nodes/Google/Sheet/test/v2/utils/utils.test.ts
index c725d03bb9e85..4c3f9861be1ba 100644
--- a/packages/nodes-base/nodes/Google/Sheet/test/v2/utils/utils.test.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/test/v2/utils/utils.test.ts
@@ -5,12 +5,20 @@ import {
 	type ResourceMapperField,
 } from 'n8n-workflow';
 
+import { GOOGLE_SHEETS_SHEET_URL_REGEX } from '../../../../constants';
 import { GoogleSheet } from '../../../v2/helpers/GoogleSheet';
 import {
 	addRowNumber,
 	autoMapInputData,
 	checkForSchemaChanges,
+	getColumnName,
+	getColumnNumber,
+	getExistingSheetNames,
+	getRangeString,
+	getSheetId,
 	getSpreadsheetId,
+	hexToRgb,
+	mapFields,
 	prepareSheetData,
 	removeEmptyColumns,
 	removeEmptyRows,
@@ -18,8 +26,6 @@ import {
 	trimToFirstEmptyRow,
 } from '../../../v2/helpers/GoogleSheets.utils';
 
-import { GOOGLE_SHEETS_SHEET_URL_REGEX } from '../../../../constants';
-
 describe('Test Google Sheets, addRowNumber', () => {
 	it('should add row nomber', () => {
 		const data = [
@@ -523,3 +529,184 @@ describe('Test Google Sheets, Google Sheets Sheet URL Regex', () => {
 		}
 	});
 });
+
+describe('Test Google Sheets, getColumnNumber', () => {
+	it('should return the correct number for single-letter columns', () => {
+		expect(getColumnNumber('A')).toBe(1);
+		expect(getColumnNumber('Z')).toBe(26);
+	});
+
+	it('should return the correct number for multi-letter columns', () => {
+		expect(getColumnNumber('AA')).toBe(27);
+		expect(getColumnNumber('AZ')).toBe(52);
+		expect(getColumnNumber('BA')).toBe(53);
+		expect(getColumnNumber('ZZ')).toBe(702);
+		expect(getColumnNumber('AAA')).toBe(703);
+	});
+});
+
+describe('Test Google Sheets, hexToRgb', () => {
+	it('should correctly convert a full hex code to RGB', () => {
+		expect(hexToRgb('#0033FF')).toEqual({ red: 0, green: 51, blue: 255 });
+		expect(hexToRgb('#FF5733')).toEqual({ red: 255, green: 87, blue: 51 });
+	});
+
+	it('should correctly convert a shorthand hex code to RGB', () => {
+		expect(hexToRgb('#03F')).toEqual({ red: 0, green: 51, blue: 255 });
+		expect(hexToRgb('#F00')).toEqual({ red: 255, green: 0, blue: 0 });
+	});
+
+	it('should return null for invalid hex codes', () => {
+		expect(hexToRgb('#XYZ123')).toBeNull(); // Invalid characters
+		expect(hexToRgb('#12345')).toBeNull(); // Incorrect length
+		expect(hexToRgb('')).toBeNull(); // Empty input
+		expect(hexToRgb('#')).toBeNull(); // Just a hash
+	});
+});
+
+describe('Test Google Sheets, getRangeString', () => {
+	it('should return the range in A1 notation when "specifyRangeA1" is set', () => {
+		const result = getRangeString('Sheet1', { rangeDefinition: 'specifyRangeA1', range: 'A1:B2' });
+		expect(result).toBe('Sheet1!A1:B2');
+	});
+
+	it('should return only the sheet name if no range is specified', () => {
+		const result = getRangeString('Sheet1', { rangeDefinition: 'specifyRangeA1', range: '' });
+		expect(result).toBe('Sheet1');
+	});
+
+	it('should return only the sheet name if rangeDefinition is not "specifyRangeA1"', () => {
+		const result = getRangeString('Sheet1', { rangeDefinition: 'detectAutomatically' });
+		expect(result).toBe('Sheet1');
+	});
+});
+
+describe('Test Google Sheets, getExistingSheetNames', () => {
+	const mockGoogleSheetInstance: Partial<GoogleSheet> = {
+		spreadsheetGetSheets: jest.fn(),
+	};
+	it('should return an array of sheet names', async () => {
+		mockGoogleSheetInstance.spreadsheetGetSheets = jest.fn().mockResolvedValue({
+			sheets: [{ properties: { title: 'Sheet1' } }, { properties: { title: 'Sheet2' } }],
+		});
+		const result = await getExistingSheetNames(mockGoogleSheetInstance as GoogleSheet);
+		expect(result).toEqual(['Sheet1', 'Sheet2']);
+	});
+
+	it('should return an empty array if no sheets are present', async () => {
+		mockGoogleSheetInstance.spreadsheetGetSheets = jest.fn().mockResolvedValue({ sheets: [] });
+		const result = await getExistingSheetNames(mockGoogleSheetInstance as GoogleSheet);
+		expect(result).toEqual([]);
+	});
+
+	it('should handle a case where sheets are undefined', async () => {
+		mockGoogleSheetInstance.spreadsheetGetSheets = jest.fn().mockResolvedValue({});
+		const result = await getExistingSheetNames(mockGoogleSheetInstance as GoogleSheet);
+		expect(result).toEqual([]);
+	});
+});
+
+describe('Test Google Sheets, mapFields', () => {
+	const fakeExecuteFunction: Partial<IExecuteFunctions> = {};
+
+	beforeEach(() => {
+		fakeExecuteFunction.getNode = jest.fn();
+		fakeExecuteFunction.getNodeParameter = jest.fn();
+	});
+
+	it('should map fields for node version < 4', () => {
+		fakeExecuteFunction.getNode = jest.fn().mockReturnValue({ typeVersion: 3 });
+		fakeExecuteFunction.getNodeParameter = jest.fn().mockImplementation((_, i) => [
+			{ fieldId: 'field1', fieldValue: `value${i}` },
+			{ fieldId: 'field2', fieldValue: `value${i * 2}` },
+		]);
+
+		const result = mapFields.call(fakeExecuteFunction as IExecuteFunctions, 2);
+		expect(result).toEqual([
+			{ field1: 'value0', field2: 'value0' },
+			{ field1: 'value1', field2: 'value2' },
+		]);
+		expect(fakeExecuteFunction.getNodeParameter).toHaveBeenCalledTimes(2);
+		expect(fakeExecuteFunction.getNodeParameter).toHaveBeenCalledWith(
+			'fieldsUi.fieldValues',
+			0,
+			[],
+		);
+	});
+
+	it('should map columns for node version >= 4', () => {
+		fakeExecuteFunction.getNode = jest.fn().mockReturnValue({ typeVersion: 4 });
+		fakeExecuteFunction.getNodeParameter = jest.fn().mockImplementation((_, i) => ({
+			column1: `value${i}`,
+			column2: `value${i * 2}`,
+		}));
+
+		const result = mapFields.call(fakeExecuteFunction as IExecuteFunctions, 2);
+		expect(result).toEqual([
+			{ column1: 'value0', column2: 'value0' },
+			{ column1: 'value1', column2: 'value2' },
+		]);
+		expect(fakeExecuteFunction.getNodeParameter).toHaveBeenCalledTimes(2);
+		expect(fakeExecuteFunction.getNodeParameter).toHaveBeenCalledWith('columns.value', 0);
+	});
+
+	it('should throw an error if no values are added in version >= 4', () => {
+		fakeExecuteFunction.getNode = jest.fn().mockReturnValue({ typeVersion: 4 });
+		fakeExecuteFunction.getNodeParameter = jest.fn().mockReturnValue({});
+
+		expect(() => mapFields.call(fakeExecuteFunction as IExecuteFunctions, 1)).toThrow(
+			"At least one value has to be added under 'Values to Send'",
+		);
+	});
+
+	it('should return an empty array when inputSize is 0', () => {
+		const result = mapFields.call(fakeExecuteFunction as IExecuteFunctions, 0);
+		expect(result).toEqual([]);
+	});
+});
+
+describe('Test Google Sheets, getSheetId', () => {
+	it('should return 0 when value is "gid=0"', () => {
+		expect(getSheetId('gid=0')).toBe(0);
+	});
+
+	it('should return a parsed integer when value is a numeric string', () => {
+		expect(getSheetId('123')).toBe(123);
+		expect(getSheetId('456')).toBe(456);
+	});
+
+	it('should return NaN for non-numeric strings', () => {
+		expect(getSheetId('abc')).toBeNaN();
+		expect(getSheetId('gid=abc')).toBeNaN();
+	});
+});
+
+describe('Test Google Sheets, getColumnName', () => {
+	it('should return "A" for column number 1', () => {
+		expect(getColumnName(1)).toBe('A');
+	});
+
+	it('should return "Z" for column number 26', () => {
+		expect(getColumnName(26)).toBe('Z');
+	});
+
+	it('should return "AA" for column number 27', () => {
+		expect(getColumnName(27)).toBe('AA');
+	});
+
+	it('should return "AZ" for column number 52', () => {
+		expect(getColumnName(52)).toBe('AZ');
+	});
+
+	it('should return "BA" for column number 53', () => {
+		expect(getColumnName(53)).toBe('BA');
+	});
+
+	it('should return "ZZ" for column number 702', () => {
+		expect(getColumnName(702)).toBe('ZZ');
+	});
+
+	it('should return "AAA" for column number 703', () => {
+		expect(getColumnName(703)).toBe('AAA');
+	});
+});
diff --git a/packages/nodes-base/nodes/Google/Sheet/v1/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Sheet/v1/GenericFunctions.ts
index 540367aabd085..90fa190a9f469 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v1/GenericFunctions.ts
@@ -7,6 +7,7 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
+
 import { getGoogleAccessToken } from '../../GenericFunctions';
 
 export interface IGoogleAuthCredentials {
diff --git a/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheet.ts b/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheet.ts
index 5781c51b8fbae..cccd5e2de57ce 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheet.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheet.ts
@@ -1,9 +1,8 @@
+import get from 'lodash/get';
 import type { IExecuteFunctions, ILoadOptionsFunctions, IDataObject } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-
 import { utils as xlsxUtils } from 'xlsx';
 
-import get from 'lodash/get';
 import { googleApiRequest } from './GenericFunctions';
 
 export interface ISheetOptions {
diff --git a/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheetsV1.node.ts b/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheetsV1.node.ts
index 6b5f4ee802f3e..6b218c1d6a6a0 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheetsV1.node.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheetsV1.node.ts
@@ -13,8 +13,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { getGoogleAccessToken } from '../../GenericFunctions';
-import { generatePairedItemData } from '../../../../utils/utilities';
+import { googleApiRequest, hexToRgb } from './GenericFunctions';
 import type {
 	ILookupValues,
 	ISheetUpdateData,
@@ -23,10 +22,9 @@ import type {
 	ValueRenderOption,
 } from './GoogleSheet';
 import { GoogleSheet } from './GoogleSheet';
-
-import { googleApiRequest, hexToRgb } from './GenericFunctions';
-
 import { versionDescription } from './versionDescription';
+import { generatePairedItemData } from '../../../../utils/utilities';
+import { getGoogleAccessToken } from '../../GenericFunctions';
 
 export class GoogleSheetsV1 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/GoogleSheetsV2.node.ts b/packages/nodes-base/nodes/Google/Sheet/v2/GoogleSheetsV2.node.ts
index 912ca8a7971ff..681705781a6b3 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/GoogleSheetsV2.node.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/GoogleSheetsV2.node.ts
@@ -4,9 +4,10 @@ import type {
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
 } from 'n8n-workflow';
+
+import { router } from './actions/router';
 import { versionDescription } from './actions/versionDescription';
 import { credentialTest, listSearch, loadOptions, resourceMapping } from './methods';
-import { router } from './actions/router';
 
 export class GoogleSheetsV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/router.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/router.ts
index 5159e9b76e565..68b6f683b11e6 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/router.ts
@@ -1,9 +1,10 @@
 import { type IExecuteFunctions, type IDataObject, type INodeExecutionData } from 'n8n-workflow';
+
+import * as sheet from './sheet/Sheet.resource';
+import * as spreadsheet from './spreadsheet/SpreadSheet.resource';
 import { GoogleSheet } from '../helpers/GoogleSheet';
-import { getSpreadsheetId } from '../helpers/GoogleSheets.utils';
 import type { GoogleSheets, ResourceLocator } from '../helpers/GoogleSheets.types';
-import * as spreadsheet from './spreadsheet/SpreadSheet.resource';
-import * as sheet from './sheet/Sheet.resource';
+import { getSpreadsheetId } from '../helpers/GoogleSheets.utils';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	let operationResult: INodeExecutionData[] = [];
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/Sheet.resource.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/Sheet.resource.ts
index d46e72811a076..07810d1304bab 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/Sheet.resource.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/Sheet.resource.ts
@@ -1,5 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { GOOGLE_DRIVE_FILE_URL_REGEX, GOOGLE_SHEETS_SHEET_URL_REGEX } from '../../../../constants';
+
 import * as append from './append.operation';
 import * as appendOrUpdate from './appendOrUpdate.operation';
 import * as clear from './clear.operation';
@@ -8,6 +8,7 @@ import * as del from './delete.operation';
 import * as read from './read.operation';
 import * as remove from './remove.operation';
 import * as update from './update.operation';
+import { GOOGLE_DRIVE_FILE_URL_REGEX, GOOGLE_SHEETS_SHEET_URL_REGEX } from '../../../../constants';
 
 export { append, appendOrUpdate, clear, create, del as delete, read, remove, update };
 
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/append.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/append.operation.ts
index 1a4080c576139..8615beafdef8b 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/append.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/append.operation.ts
@@ -5,8 +5,10 @@ import {
 	NodeOperationError,
 	type ResourceMapperField,
 } from 'n8n-workflow';
-import type { SheetProperties, ValueInputOption } from '../../helpers/GoogleSheets.types';
+
+import { cellFormat, handlingExtraData, useAppendOption } from './commonDescription';
 import type { GoogleSheet } from '../../helpers/GoogleSheet';
+import type { SheetProperties, ValueInputOption } from '../../helpers/GoogleSheets.types';
 import {
 	autoMapInputData,
 	cellFormatDefault,
@@ -14,7 +16,6 @@ import {
 	mapFields,
 	untilSheetSelected,
 } from '../../helpers/GoogleSheets.utils';
-import { cellFormat, handlingExtraData, useAppendOption } from './commonDescription';
 
 export const description: SheetProperties = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/appendOrUpdate.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/appendOrUpdate.operation.ts
index f6f3e5cd3de4c..0dc92f31ac9da 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/appendOrUpdate.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/appendOrUpdate.operation.ts
@@ -5,6 +5,14 @@ import type {
 	ResourceMapperField,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
+import {
+	cellFormat,
+	handlingExtraData,
+	locationDefine,
+	useAppendOption,
+} from './commonDescription';
+import type { GoogleSheet } from '../../helpers/GoogleSheet';
 import {
 	ROW_NUMBER,
 	type ISheetUpdateData,
@@ -12,18 +20,11 @@ import {
 	type ValueInputOption,
 	type ValueRenderOption,
 } from '../../helpers/GoogleSheets.types';
-import type { GoogleSheet } from '../../helpers/GoogleSheet';
 import {
 	cellFormatDefault,
 	checkForSchemaChanges,
 	untilSheetSelected,
 } from '../../helpers/GoogleSheets.utils';
-import {
-	cellFormat,
-	handlingExtraData,
-	locationDefine,
-	useAppendOption,
-} from './commonDescription';
 
 export const description: SheetProperties = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/clear.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/clear.operation.ts
index f65d6a5e3946d..14fcd8ed691eb 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/clear.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/clear.operation.ts
@@ -1,6 +1,7 @@
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
-import type { SheetProperties } from '../../helpers/GoogleSheets.types';
+
 import type { GoogleSheet } from '../../helpers/GoogleSheet';
+import type { SheetProperties } from '../../helpers/GoogleSheets.types';
 import {
 	getColumnName,
 	getColumnNumber,
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/create.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/create.operation.ts
index 4c57bf1dea041..3d6ac81d6a65f 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/create.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/create.operation.ts
@@ -1,9 +1,10 @@
 import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
-import type { SheetProperties } from '../../helpers/GoogleSheets.types';
-import { apiRequest } from '../../transport';
+
+import { wrapData } from '../../../../../../utils/utilities';
 import type { GoogleSheet } from '../../helpers/GoogleSheet';
+import type { SheetProperties } from '../../helpers/GoogleSheets.types';
 import { getExistingSheetNames, hexToRgb } from '../../helpers/GoogleSheets.utils';
-import { wrapData } from '../../../../../../utils/utilities';
+import { apiRequest } from '../../transport';
 
 export const description: SheetProperties = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/delete.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/delete.operation.ts
index 8edd179d0e2e2..4d5479795c932 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/delete.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/delete.operation.ts
@@ -1,8 +1,9 @@
 import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
-import type { SheetProperties } from '../../helpers/GoogleSheets.types';
+
+import { generatePairedItemData, wrapData } from '../../../../../../utils/utilities';
 import type { GoogleSheet } from '../../helpers/GoogleSheet';
+import type { SheetProperties } from '../../helpers/GoogleSheets.types';
 import { getColumnNumber, untilSheetSelected } from '../../helpers/GoogleSheets.utils';
-import { generatePairedItemData, wrapData } from '../../../../../../utils/utilities';
 
 export const description: SheetProperties = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/read.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/read.operation.ts
index 9f65ffb52c0e7..dfde11568dc6e 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/read.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/read.operation.ts
@@ -4,12 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { dataLocationOnSheet, outputFormatting } from './commonDescription';
 import type { GoogleSheet } from '../../helpers/GoogleSheet';
-import {
-	getRangeString,
-	prepareSheetData,
-	untilSheetSelected,
-} from '../../helpers/GoogleSheets.utils';
 import type {
 	ILookupValues,
 	RangeDetectionOptions,
@@ -17,8 +14,11 @@ import type {
 	SheetRangeData,
 	ValueRenderOption,
 } from '../../helpers/GoogleSheets.types';
-
-import { dataLocationOnSheet, outputFormatting } from './commonDescription';
+import {
+	getRangeString,
+	prepareSheetData,
+	untilSheetSelected,
+} from '../../helpers/GoogleSheets.utils';
 
 const combineFiltersOptions: INodeProperties = {
 	displayName: 'Combine Filters',
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/remove.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/remove.operation.ts
index 13e7fa348638b..c068e4ee77712 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/remove.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/remove.operation.ts
@@ -1,7 +1,8 @@
 import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
-import { apiRequest } from '../../transport';
-import type { GoogleSheet } from '../../helpers/GoogleSheet';
+
 import { wrapData } from '../../../../../../utils/utilities';
+import type { GoogleSheet } from '../../helpers/GoogleSheet';
+import { apiRequest } from '../../transport';
 
 export async function execute(
 	this: IExecuteFunctions,
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/update.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/update.operation.ts
index 16478cb11c936..83331ea7e5594 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/update.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/update.operation.ts
@@ -1,5 +1,8 @@
 import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
+import { cellFormat, handlingExtraData, locationDefine } from './commonDescription';
+import type { GoogleSheet } from '../../helpers/GoogleSheet';
 import {
 	ROW_NUMBER,
 	type ISheetUpdateData,
@@ -7,9 +10,7 @@ import {
 	type ValueInputOption,
 	type ValueRenderOption,
 } from '../../helpers/GoogleSheets.types';
-import type { GoogleSheet } from '../../helpers/GoogleSheet';
 import { cellFormatDefault, untilSheetSelected } from '../../helpers/GoogleSheets.utils';
-import { cellFormat, handlingExtraData, locationDefine } from './commonDescription';
 
 export const description: SheetProperties = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/SpreadSheet.resource.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/SpreadSheet.resource.ts
index c0e7f3acfa8c3..0e33a95667515 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/SpreadSheet.resource.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/SpreadSheet.resource.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as create from './create.operation';
 import * as deleteSpreadsheet from './delete.operation';
 
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/create.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/create.operation.ts
index cc0dd57f4887e..ff8cac5f9780b 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/create.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/create.operation.ts
@@ -1,7 +1,8 @@
 import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
+
+import { wrapData } from '../../../../../../utils/utilities';
 import type { SpreadSheetProperties } from '../../helpers/GoogleSheets.types';
 import { apiRequest } from '../../transport';
-import { wrapData } from '../../../../../../utils/utilities';
 
 export const description: SpreadSheetProperties = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/delete.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/delete.operation.ts
index 310efc8de7745..71f8dfd61586c 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/delete.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/delete.operation.ts
@@ -1,8 +1,9 @@
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
+
+import { wrapData } from '../../../../../../utils/utilities';
+import { GOOGLE_DRIVE_FILE_URL_REGEX } from '../../../../constants';
 import type { SpreadSheetProperties } from '../../helpers/GoogleSheets.types';
 import { apiRequest } from '../../transport';
-import { GOOGLE_DRIVE_FILE_URL_REGEX } from '../../../../constants';
-import { wrapData } from '../../../../../../utils/utilities';
 
 export const description: SpreadSheetProperties = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheet.ts b/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheet.ts
index c5f8a8dc79395..b129f9326c473 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheet.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheet.ts
@@ -8,7 +8,7 @@ import type {
 } from 'n8n-workflow';
 import { ApplicationError, NodeOperationError } from 'n8n-workflow';
 import { utils as xlsxUtils } from 'xlsx';
-import { apiRequest } from '../transport';
+
 import type {
 	ILookupValues,
 	ISheetUpdateData,
@@ -21,6 +21,7 @@ import type {
 	ValueRenderOption,
 } from './GoogleSheets.types';
 import { getSheetId, removeEmptyColumns } from './GoogleSheets.utils';
+import { apiRequest } from '../transport';
 
 export class GoogleSheet {
 	id: string;
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheets.utils.ts b/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheets.utils.ts
index f3ad02e273638..c717e5c8b6f92 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheets.utils.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheets.utils.ts
@@ -8,6 +8,7 @@ import type {
 	ResourceMapperField,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
 import type { GoogleSheet } from './GoogleSheet';
 import type {
 	RangeDetectionOptions,
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Google/Sheet/v2/methods/listSearch.ts
index 6c0c8b74cadcd..cb8f5c05cf25c 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/methods/listSearch.ts
@@ -5,6 +5,7 @@ import type {
 	INodeListSearchResult,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
 import type { ResourceLocator } from '../helpers/GoogleSheets.types';
 import { getSpreadsheetId } from '../helpers/GoogleSheets.utils';
 import { apiRequest } from '../transport';
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/Google/Sheet/v2/methods/loadOptions.ts
index 90aa11cf90ab9..6ec3e9d9b7d0c 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/methods/loadOptions.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/methods/loadOptions.ts
@@ -1,8 +1,9 @@
 import type { IDataObject, ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
 import { GoogleSheet } from '../helpers/GoogleSheet';
-import { getSpreadsheetId } from '../helpers/GoogleSheets.utils';
 import type { ResourceLocator } from '../helpers/GoogleSheets.types';
+import { getSpreadsheetId } from '../helpers/GoogleSheets.utils';
 
 export async function getSheets(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 	const documentId = this.getNodeParameter('documentId', 0) as IDataObject | null;
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/methods/resourceMapping.ts b/packages/nodes-base/nodes/Google/Sheet/v2/methods/resourceMapping.ts
index 40ae402a646a4..664a44d094aa3 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/methods/resourceMapping.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/methods/resourceMapping.ts
@@ -4,6 +4,7 @@ import type {
 	ResourceMapperField,
 	ResourceMapperFields,
 } from 'n8n-workflow';
+
 import { GoogleSheet } from '../helpers/GoogleSheet';
 import { ROW_NUMBER, type ResourceLocator } from '../helpers/GoogleSheets.types';
 import { getSpreadsheetId } from '../helpers/GoogleSheets.utils';
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/transport/index.ts b/packages/nodes-base/nodes/Google/Sheet/v2/transport/index.ts
index d3fe3e07620c8..27e080cffd395 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/transport/index.ts
@@ -1,3 +1,4 @@
+import set from 'lodash/set';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -8,7 +9,7 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
-import set from 'lodash/set';
+
 import { getGoogleAccessToken } from '../../../GenericFunctions';
 
 export async function apiRequest(
diff --git a/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts
index c0e69151e4aa0..2229b7608d329 100644
--- a/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts
@@ -35,7 +35,6 @@ export async function googleApiRequest(
 		if (Object.keys(body).length === 0) {
 			delete options.body;
 		}
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'googleTasksOAuth2Api', options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts b/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts
index d7fe05561f2d7..e053b752bd75b 100644
--- a/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts
+++ b/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts
@@ -10,7 +10,6 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { googleApiRequest, googleApiRequestAllItems } from './GenericFunctions';
-
 import { taskFields, taskOperations } from './TaskDescription';
 
 export class GoogleTasks implements INodeType {
diff --git a/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts b/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts
index acd718c1b2b19..50fe1b3d3a669 100644
--- a/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts
@@ -35,7 +35,6 @@ export async function googleApiRequest(
 			delete options.body;
 		}
 
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'youTubeOAuth2Api', options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
index 663ec6189641a..07f1b351b6d01 100644
--- a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
@@ -1,4 +1,3 @@
-import type { Readable } from 'stream';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -9,20 +8,16 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, BINARY_ENCODING, NodeOperationError } from 'n8n-workflow';
+import type { Readable } from 'stream';
 
-import { googleApiRequest, googleApiRequestAllItems } from './GenericFunctions';
+import { isoCountryCodes } from '@utils/ISOCountryCodes';
 
 import { channelFields, channelOperations } from './ChannelDescription';
-
+import { googleApiRequest, googleApiRequestAllItems } from './GenericFunctions';
 import { playlistFields, playlistOperations } from './PlaylistDescription';
-
 import { playlistItemFields, playlistItemOperations } from './PlaylistItemDescription';
-
-import { videoFields, videoOperations } from './VideoDescription';
-
 import { videoCategoryFields, videoCategoryOperations } from './VideoCategoryDescription';
-
-import { isoCountryCodes } from '@utils/ISOCountryCodes';
+import { videoFields, videoOperations } from './VideoDescription';
 import { validateAndSetDate } from '../GenericFunctions';
 
 const UPLOAD_CHUNK_SIZE = 1024 * 1024;
diff --git a/packages/nodes-base/nodes/Gotify/GenericFunctions.ts b/packages/nodes-base/nodes/Gotify/GenericFunctions.ts
index 3b63797197279..192dc8f7c0f39 100644
--- a/packages/nodes-base/nodes/Gotify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Gotify/GenericFunctions.ts
@@ -37,7 +37,6 @@ export async function gotifyApiRequest(
 			delete options.body;
 		}
 
-		//@ts-ignore
 		return await this.helpers.request.call(this, options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/Grafana/Grafana.node.ts b/packages/nodes-base/nodes/Grafana/Grafana.node.ts
index ce3f0b8276454..28bd734229f38 100644
--- a/packages/nodes-base/nodes/Grafana/Grafana.node.ts
+++ b/packages/nodes-base/nodes/Grafana/Grafana.node.ts
@@ -9,8 +9,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeApiError } from 'n8n-workflow';
 
-import { deriveUid, grafanaApiRequest, throwOnEmptyUpdate } from './GenericFunctions';
-
 import {
 	dashboardFields,
 	dashboardOperations,
@@ -21,7 +19,7 @@ import {
 	userFields,
 	userOperations,
 } from './descriptions';
-
+import { deriveUid, grafanaApiRequest, throwOnEmptyUpdate } from './GenericFunctions';
 import type {
 	DashboardUpdateFields,
 	DashboardUpdatePayload,
diff --git a/packages/nodes-base/nodes/Grist/GenericFunctions.ts b/packages/nodes-base/nodes/Grist/GenericFunctions.ts
index 07a4505d35eda..73c4bc875fcf6 100644
--- a/packages/nodes-base/nodes/Grist/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Grist/GenericFunctions.ts
@@ -22,9 +22,8 @@ export async function gristApiRequest(
 	body: IDataObject | number[] = {},
 	qs: IDataObject = {},
 ) {
-	const { apiKey, planType, customSubdomain, selfHostedUrl } = (await this.getCredentials(
-		'gristApi',
-	)) as GristCredentials;
+	const { apiKey, planType, customSubdomain, selfHostedUrl } =
+		await this.getCredentials<GristCredentials>('gristApi');
 
 	const gristapiurl =
 		planType === 'free'
diff --git a/packages/nodes-base/nodes/Grist/Grist.node.ts b/packages/nodes-base/nodes/Grist/Grist.node.ts
index 2ebd3cdd43365..189c880f16742 100644
--- a/packages/nodes-base/nodes/Grist/Grist.node.ts
+++ b/packages/nodes-base/nodes/Grist/Grist.node.ts
@@ -20,9 +20,7 @@ import {
 	parseSortProperties,
 	throwOnZeroDefinedFields,
 } from './GenericFunctions';
-
 import { operationFields } from './OperationDescription';
-
 import type {
 	FieldsToSend,
 	GristColumns,
diff --git a/packages/nodes-base/nodes/HaloPSA/HaloPSA.node.ts b/packages/nodes-base/nodes/HaloPSA/HaloPSA.node.ts
index ebf25294d7483..137eda57c9b41 100644
--- a/packages/nodes-base/nodes/HaloPSA/HaloPSA.node.ts
+++ b/packages/nodes-base/nodes/HaloPSA/HaloPSA.node.ts
@@ -24,7 +24,6 @@ import {
 	userFields,
 	userOperations,
 } from './descriptions';
-
 import {
 	getAccessTokens,
 	haloPSAApiRequest,
diff --git a/packages/nodes-base/nodes/Harvest/Harvest.node.ts b/packages/nodes-base/nodes/Harvest/Harvest.node.ts
index 90fc166080dc4..1b239ff85392f 100644
--- a/packages/nodes-base/nodes/Harvest/Harvest.node.ts
+++ b/packages/nodes-base/nodes/Harvest/Harvest.node.ts
@@ -11,25 +11,15 @@ import type {
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
 import { clientFields, clientOperations } from './ClientDescription';
-
-import { contactFields, contactOperations } from './ContactDescription';
-
 import { companyOperations } from './CompanyDescription';
-
+import { contactFields, contactOperations } from './ContactDescription';
 import { estimateFields, estimateOperations } from './EstimateDescription';
-
 import { expenseFields, expenseOperations } from './ExpenseDescription';
-
 import { getAllResource, harvestApiRequest } from './GenericFunctions';
-
 import { invoiceFields, invoiceOperations } from './InvoiceDescription';
-
 import { projectFields, projectOperations } from './ProjectDescription';
-
 import { taskFields, taskOperations } from './TaskDescription';
-
 import { timeEntryFields, timeEntryOperations } from './TimeEntryDescription';
-
 import { userFields, userOperations } from './UserDescription';
 
 export class Harvest implements INodeType {
diff --git a/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts b/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts
index 6ad5fbdbc71e0..b61b8eda7d6d7 100644
--- a/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -9,8 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
 export async function helpscoutApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions,
 	method: IHttpRequestMethods,
@@ -38,7 +37,6 @@ export async function helpscoutApiRequest(
 		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'helpScoutOAuth2Api', options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts b/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts
index cd94986b7d28b..6fae6b0ba0ae0 100644
--- a/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts
+++ b/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts
@@ -10,22 +10,16 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { conversationFields, conversationOperations } from './ConversationDescription';
+import { isoCountryCodes } from '@utils/ISOCountryCodes';
 
+import { conversationFields, conversationOperations } from './ConversationDescription';
+import type { IConversation } from './ConversationInterface';
 import { customerFields, customerOperations } from './CustomerDescription';
-
 import type { ICustomer } from './CustomerInterface';
-
-import type { IConversation } from './ConversationInterface';
-
 import { helpscoutApiRequest, helpscoutApiRequestAllItems } from './GenericFunctions';
-
 import { mailboxFields, mailboxOperations } from './MailboxDescription';
-
 import { threadFields, threadOperations } from './ThreadDescription';
-
 import type { IAttachment, IThread } from './ThreadInterface';
-import { isoCountryCodes } from '@utils/ISOCountryCodes';
 
 export class HelpScout implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/HighLevel/v1/GenericFunctions.ts b/packages/nodes-base/nodes/HighLevel/v1/GenericFunctions.ts
index bb6f977ad80cb..c5e08c9142d86 100644
--- a/packages/nodes-base/nodes/HighLevel/v1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HighLevel/v1/GenericFunctions.ts
@@ -1,3 +1,5 @@
+import type { ToISOTimeOptions } from 'luxon';
+import { DateTime } from 'luxon';
 import type {
 	DeclarativeRestApiSettings,
 	IDataObject,
@@ -17,9 +19,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import type { ToISOTimeOptions } from 'luxon';
-import { DateTime } from 'luxon';
-
 const VALID_EMAIL_REGEX =
 	/^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
 const VALID_PHONE_REGEX =
diff --git a/packages/nodes-base/nodes/HighLevel/v1/description/ContactDescription.ts b/packages/nodes-base/nodes/HighLevel/v1/description/ContactDescription.ts
index d76ce3f402371..0b29b34f3a0d3 100644
--- a/packages/nodes-base/nodes/HighLevel/v1/description/ContactDescription.ts
+++ b/packages/nodes-base/nodes/HighLevel/v1/description/ContactDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { splitTagsPreSendAction, validEmailAndPhonePreSendAction } from '../GenericFunctions';
 
 export const contactOperations: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/HighLevel/v2/GenericFunctions.ts b/packages/nodes-base/nodes/HighLevel/v2/GenericFunctions.ts
index 04a92c512c6fe..5b4529b9be136 100644
--- a/packages/nodes-base/nodes/HighLevel/v2/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HighLevel/v2/GenericFunctions.ts
@@ -1,3 +1,5 @@
+import type { ToISOTimeOptions } from 'luxon';
+import { DateTime } from 'luxon';
 import type {
 	DeclarativeRestApiSettings,
 	IDataObject,
@@ -16,9 +18,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import type { ToISOTimeOptions } from 'luxon';
-import { DateTime } from 'luxon';
-
 const VALID_EMAIL_REGEX =
 	/^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
 const VALID_PHONE_REGEX =
diff --git a/packages/nodes-base/nodes/HighLevel/v2/description/ContactDescription.ts b/packages/nodes-base/nodes/HighLevel/v2/description/ContactDescription.ts
index f3f7bc8e98e9b..04b87b2d7df65 100644
--- a/packages/nodes-base/nodes/HighLevel/v2/description/ContactDescription.ts
+++ b/packages/nodes-base/nodes/HighLevel/v2/description/ContactDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import {
 	addLocationIdPreSendAction,
 	splitTagsPreSendAction,
diff --git a/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts b/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts
index ef8ad0990d88b..b68a857ce8fae 100644
--- a/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts
+++ b/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts
@@ -12,27 +12,19 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
+import { cameraProxyFields, cameraProxyOperations } from './CameraProxyDescription';
 import { configOperations } from './ConfigDescription';
-
-import { serviceFields, serviceOperations } from './ServiceDescription';
-
-import { stateFields, stateOperations } from './StateDescription';
-
 import { eventFields, eventOperations } from './EventDescription';
-
-import { logFields, logOperations } from './LogDescription';
-
-import { templateFields, templateOperations } from './TemplateDescription';
-
-import { historyFields, historyOperations } from './HistoryDescription';
-
-import { cameraProxyFields, cameraProxyOperations } from './CameraProxyDescription';
-
 import {
 	getHomeAssistantEntities,
 	getHomeAssistantServices,
 	homeAssistantApiRequest,
 } from './GenericFunctions';
+import { historyFields, historyOperations } from './HistoryDescription';
+import { logFields, logOperations } from './LogDescription';
+import { serviceFields, serviceOperations } from './ServiceDescription';
+import { stateFields, stateOperations } from './StateDescription';
+import { templateFields, templateOperations } from './TemplateDescription';
 
 export class HomeAssistant implements INodeType {
 	description: INodeTypeDescription = {
@@ -222,7 +214,6 @@ export class HomeAssistant implements INodeType {
 						if (Object.entries(serviceAttributes).length) {
 							if (serviceAttributes.attributes !== undefined) {
 								serviceAttributes.attributes.map((attribute) => {
-									// @ts-ignore
 									body[attribute.name as string] = attribute.value;
 								});
 							}
diff --git a/packages/nodes-base/nodes/Html/Html.node.ts b/packages/nodes-base/nodes/Html/Html.node.ts
index 3d5814244e9ff..8d80ce7928d0c 100644
--- a/packages/nodes-base/nodes/Html/Html.node.ts
+++ b/packages/nodes-base/nodes/Html/Html.node.ts
@@ -1,4 +1,5 @@
 import cheerio from 'cheerio';
+import get from 'lodash/get';
 import type {
 	INodeExecutionData,
 	IExecuteFunctions,
@@ -8,11 +9,12 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-import get from 'lodash/get';
+
+import { getResolvables, sanitizeDataPathKey } from '@utils/utilities';
+
 import { placeholder } from './placeholder';
-import { getValue } from './utils';
 import type { IValueData } from './types';
-import { getResolvables, sanitizeDataPathKey } from '@utils/utilities';
+import { getValue } from './utils';
 
 export const capitalizeHeader = (header: string, capitalize?: boolean) => {
 	if (!capitalize) return header;
diff --git a/packages/nodes-base/nodes/Html/utils.ts b/packages/nodes-base/nodes/Html/utils.ts
index 923443b2fe57f..a22195b0ae5ef 100644
--- a/packages/nodes-base/nodes/Html/utils.ts
+++ b/packages/nodes-base/nodes/Html/utils.ts
@@ -1,5 +1,6 @@
-import type { IDataObject } from 'n8n-workflow';
 import { convert } from 'html-to-text';
+import type { IDataObject } from 'n8n-workflow';
+
 import type { IValueData, Cheerio } from './types';
 
 // The extraction functions
diff --git a/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts b/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts
index 719c128a28789..b23ab29aefb3e 100644
--- a/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts
+++ b/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts
@@ -1,4 +1,5 @@
 import cheerio from 'cheerio';
+import get from 'lodash/get';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -8,8 +9,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
 type Cheerio = ReturnType<typeof cheerio>;
 
 interface IValueData {
diff --git a/packages/nodes-base/nodes/HttpRequest/GenericFunctions.ts b/packages/nodes-base/nodes/HttpRequest/GenericFunctions.ts
index c7ffe7451c073..76e242adfdb84 100644
--- a/packages/nodes-base/nodes/HttpRequest/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HttpRequest/GenericFunctions.ts
@@ -1,4 +1,7 @@
-import type { SecureContextOptions } from 'tls';
+import FormData from 'form-data';
+import get from 'lodash/get';
+import isPlainObject from 'lodash/isPlainObject';
+import set from 'lodash/set';
 import {
 	deepCopy,
 	type ICredentialDataDecryptedObject,
@@ -8,14 +11,10 @@ import {
 	type IOAuth2Options,
 	type IRequestOptions,
 } from 'n8n-workflow';
+import type { SecureContextOptions } from 'tls';
 
-import set from 'lodash/set';
-import isPlainObject from 'lodash/isPlainObject';
-
-import FormData from 'form-data';
-import get from 'lodash/get';
-import { formatPrivateKey } from '../../utils/utilities';
 import type { HttpSslAuthCredentials } from './interfaces';
+import { formatPrivateKey } from '../../utils/utilities';
 
 export type BodyParameter = {
 	name: string;
diff --git a/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts b/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
index 24c88dbc2677a..c50d1e5ade95a 100644
--- a/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
@@ -1,5 +1,3 @@
-import type { Readable } from 'stream';
-
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -18,6 +16,7 @@ import {
 	removeCircularRefs,
 	NodeConnectionType,
 } from 'n8n-workflow';
+import type { Readable } from 'stream';
 
 import type { IAuthDataSanitizeKeys } from '../GenericFunctions';
 import { replaceNullValues, sanitizeUiMessage } from '../GenericFunctions';
@@ -701,7 +700,6 @@ export class HttpRequestV1 implements INodeType {
 			} satisfies IRequestOptions;
 
 			if (fullResponse) {
-				// @ts-ignore
 				requestOptions.resolveWithFullResponse = true;
 			}
 
@@ -714,7 +712,6 @@ export class HttpRequestV1 implements INodeType {
 			}
 
 			if (options.ignoreResponseCode === true) {
-				// @ts-ignore
 				requestOptions.simple = false;
 			}
 			if (options.proxy !== undefined) {
@@ -976,12 +973,10 @@ export class HttpRequestV1 implements INodeType {
 			}
 		}
 
-		// @ts-ignore
 		const promisesResponses = await Promise.allSettled(requestPromises);
 
 		let response: any;
 		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
-			// @ts-ignore
 			response = promisesResponses.shift();
 
 			if (response!.status !== 'fulfilled') {
diff --git a/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts b/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts
index 0916c648fd623..f954dbfd19058 100644
--- a/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts
@@ -1,5 +1,3 @@
-import type { Readable } from 'stream';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -18,6 +16,7 @@ import {
 	removeCircularRefs,
 	NodeConnectionType,
 } from 'n8n-workflow';
+import type { Readable } from 'stream';
 
 import type { IAuthDataSanitizeKeys } from '../GenericFunctions';
 import {
@@ -741,7 +740,6 @@ export class HttpRequestV2 implements INodeType {
 			};
 
 			if (fullResponse) {
-				// @ts-ignore
 				requestOptions.resolveWithFullResponse = true;
 			}
 
@@ -754,7 +752,6 @@ export class HttpRequestV2 implements INodeType {
 			}
 
 			if (options.ignoreResponseCode === true) {
-				// @ts-ignore
 				requestOptions.simple = false;
 			}
 			if (options.proxy !== undefined) {
@@ -1030,12 +1027,10 @@ export class HttpRequestV2 implements INodeType {
 			}
 		}
 
-		// @ts-ignore
 		const promisesResponses = await Promise.allSettled(requestPromises);
 
 		let response: any;
 		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
-			// @ts-ignore
 			response = promisesResponses.shift();
 			if (response!.status !== 'fulfilled') {
 				if (!this.continueOnFail()) {
diff --git a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
index f24f537c91e97..dd4e0b77fbe23 100644
--- a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
@@ -27,6 +27,7 @@ import type { Readable } from 'stream';
 
 import { keysToLowercase } from '@utils/utilities';
 
+import { mainProperties } from './Description';
 import type { BodyParameter, IAuthDataSanitizeKeys } from '../GenericFunctions';
 import {
 	binaryContentTypes,
@@ -38,7 +39,6 @@ import {
 	sanitizeUiMessage,
 	setAgentOptions,
 } from '../GenericFunctions';
-import { mainProperties } from './Description';
 
 function toText<T>(data: T) {
 	if (typeof data === 'object' && data !== null) {
diff --git a/packages/nodes-base/nodes/HttpRequest/test/binaryData/HttpRequest.test.ts b/packages/nodes-base/nodes/HttpRequest/test/binaryData/HttpRequest.test.ts
index 32734939c29ac..d22169e50d6ec 100644
--- a/packages/nodes-base/nodes/HttpRequest/test/binaryData/HttpRequest.test.ts
+++ b/packages/nodes-base/nodes/HttpRequest/test/binaryData/HttpRequest.test.ts
@@ -1,4 +1,5 @@
 import nock from 'nock';
+
 import {
 	setup,
 	equalityTest,
diff --git a/packages/nodes-base/nodes/HttpRequest/test/encoding/HttpRequest.test.ts b/packages/nodes-base/nodes/HttpRequest/test/encoding/HttpRequest.test.ts
index 6ca5cfa437aaa..d5488c6f2e600 100644
--- a/packages/nodes-base/nodes/HttpRequest/test/encoding/HttpRequest.test.ts
+++ b/packages/nodes-base/nodes/HttpRequest/test/encoding/HttpRequest.test.ts
@@ -1,4 +1,5 @@
 import nock from 'nock';
+
 import {
 	setup,
 	equalityTest,
diff --git a/packages/nodes-base/nodes/HttpRequest/test/encodingQuoted/HttpRequest.test.ts b/packages/nodes-base/nodes/HttpRequest/test/encodingQuoted/HttpRequest.test.ts
index 0b96c4b4d04e5..5d3a67dde9ef0 100644
--- a/packages/nodes-base/nodes/HttpRequest/test/encodingQuoted/HttpRequest.test.ts
+++ b/packages/nodes-base/nodes/HttpRequest/test/encodingQuoted/HttpRequest.test.ts
@@ -1,4 +1,5 @@
 import nock from 'nock';
+
 import {
 	setup,
 	equalityTest,
diff --git a/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequest.test.ts b/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequest.test.ts
index 0899ce5637262..6e49794df3c6b 100644
--- a/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequest.test.ts
+++ b/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequest.test.ts
@@ -1,5 +1,6 @@
-import { parse as parseUrl } from 'url';
 import nock from 'nock';
+import { parse as parseUrl } from 'url';
+
 import {
 	initBinaryDataService,
 	setup,
diff --git a/packages/nodes-base/nodes/Hubspot/Hubspot.node.ts b/packages/nodes-base/nodes/Hubspot/Hubspot.node.ts
index f20a3c7746778..df86cc0b5f3f9 100644
--- a/packages/nodes-base/nodes/Hubspot/Hubspot.node.ts
+++ b/packages/nodes-base/nodes/Hubspot/Hubspot.node.ts
@@ -2,7 +2,6 @@ import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow'
 import { VersionedNodeType } from 'n8n-workflow';
 
 import { HubspotV1 } from './V1/HubspotV1.node';
-
 import { HubspotV2 } from './V2/HubspotV2.node';
 
 export class Hubspot extends VersionedNodeType {
diff --git a/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts b/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts
index 5ce15a9b1c2ae..ab36f08b15fc3 100644
--- a/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts
+++ b/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts
@@ -424,14 +424,12 @@ export class HubspotTrigger implements INodeType {
 		const req = this.getRequestObject();
 		const bodyData = req.body;
 		const headerData = this.getHeaderData();
-		//@ts-ignore
 		if (headerData['x-hubspot-signature'] === undefined) {
 			return {};
 		}
 
 		const hash = `${credentials.clientSecret}${JSON.stringify(bodyData)}`;
 		const signature = createHash('sha256').update(hash).digest('hex');
-		//@ts-ignore
 		if (signature !== headerData['x-hubspot-signature']) {
 			return {};
 		}
diff --git a/packages/nodes-base/nodes/Hubspot/V1/GenericFunctions.ts b/packages/nodes-base/nodes/Hubspot/V1/GenericFunctions.ts
index 9fa600730d182..dbca30617a143 100644
--- a/packages/nodes-base/nodes/Hubspot/V1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Hubspot/V1/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialTestFunctions,
@@ -11,8 +12,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
 export async function hubspotApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	method: IHttpRequestMethods,
diff --git a/packages/nodes-base/nodes/Hubspot/V1/HubspotV1.node.ts b/packages/nodes-base/nodes/Hubspot/V1/HubspotV1.node.ts
index de46d8a484f9e..fa32887a84a9d 100644
--- a/packages/nodes-base/nodes/Hubspot/V1/HubspotV1.node.ts
+++ b/packages/nodes-base/nodes/Hubspot/V1/HubspotV1.node.ts
@@ -1,3 +1,4 @@
+import { snakeCase } from 'change-case';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
@@ -15,7 +16,14 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
+import { companyFields, companyOperations } from './CompanyDescription';
+import { contactFields, contactOperations } from './ContactDescription';
+import { contactListFields, contactListOperations } from './ContactListDescription';
+import { dealFields, dealOperations } from './DealDescription';
+import type { IAssociation, IDeal } from './DealInterface';
+import { engagementFields, engagementOperations } from './EngagementDescription';
+import { formFields, formOperations } from './FormDescription';
+import type { IForm } from './FormInterface';
 import {
 	clean,
 	getAssociations,
@@ -27,25 +35,8 @@ import {
 	hubspotApiRequestAllItems,
 	validateCredentials,
 } from './GenericFunctions';
-
-import { contactFields, contactOperations } from './ContactDescription';
-
-import { contactListFields, contactListOperations } from './ContactListDescription';
-
-import { companyFields, companyOperations } from './CompanyDescription';
-
-import { dealFields, dealOperations } from './DealDescription';
-
-import { engagementFields, engagementOperations } from './EngagementDescription';
-
-import { formFields, formOperations } from './FormDescription';
-
 import { ticketFields, ticketOperations } from './TicketDescription';
 
-import type { IForm } from './FormInterface';
-
-import type { IAssociation, IDeal } from './DealInterface';
-
 export class HubspotV1 implements INodeType {
 	description: INodeTypeDescription;
 
diff --git a/packages/nodes-base/nodes/Hubspot/V2/GenericFunctions.ts b/packages/nodes-base/nodes/Hubspot/V2/GenericFunctions.ts
index c5b255ab6c386..a640180dec780 100644
--- a/packages/nodes-base/nodes/Hubspot/V2/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Hubspot/V2/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialTestFunctions,
@@ -11,8 +12,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
 export async function hubspotApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	method: IHttpRequestMethods,
diff --git a/packages/nodes-base/nodes/Hubspot/V2/HubspotV2.node.ts b/packages/nodes-base/nodes/Hubspot/V2/HubspotV2.node.ts
index f25f7dc0dea67..94d7bc67cf1ca 100644
--- a/packages/nodes-base/nodes/Hubspot/V2/HubspotV2.node.ts
+++ b/packages/nodes-base/nodes/Hubspot/V2/HubspotV2.node.ts
@@ -1,3 +1,6 @@
+import { snakeCase } from 'change-case';
+import set from 'lodash/set';
+import { NodeApiError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
@@ -15,11 +18,14 @@ import type {
 	INodeTypeDescription,
 	JsonObject,
 } from 'n8n-workflow';
-import { NodeApiError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
-import set from 'lodash/set';
-import { generatePairedItemData } from '../../../utils/utilities';
+import { companyFields, companyOperations } from './CompanyDescription';
+import { contactFields, contactOperations } from './ContactDescription';
+import { contactListFields, contactListOperations } from './ContactListDescription';
+import { dealFields, dealOperations } from './DealDescription';
+import type { IAssociation, IDeal } from './DealInterface';
+import { engagementFields, engagementOperations } from './EngagementDescription';
+import type { IForm } from './FormInterface';
 import {
 	clean,
 	getAssociations,
@@ -31,22 +37,8 @@ import {
 	hubspotApiRequestAllItems,
 	validateCredentials,
 } from './GenericFunctions';
-
-import { contactFields, contactOperations } from './ContactDescription';
-
-import { contactListFields, contactListOperations } from './ContactListDescription';
-
-import { companyFields, companyOperations } from './CompanyDescription';
-
-import { dealFields, dealOperations } from './DealDescription';
-
-import { engagementFields, engagementOperations } from './EngagementDescription';
-
 import { ticketFields, ticketOperations } from './TicketDescription';
-
-import type { IForm } from './FormInterface';
-
-import type { IAssociation, IDeal } from './DealInterface';
+import { generatePairedItemData } from '../../../utils/utilities';
 
 export class HubspotV2 implements INodeType {
 	description: INodeTypeDescription;
@@ -1672,7 +1664,6 @@ export class HubspotV2 implements INodeType {
 											delete filter.type;
 											// Hacky way to get the filter value as we concat the values with a | and the type
 											filter.propertyName = filter.propertyName?.toString().split('|')[0];
-											//@ts-ignore
 										}
 										(body.filterGroups as IDataObject[]).push({ filters: filterValues });
 									}
diff --git a/packages/nodes-base/nodes/HumanticAI/HumanticAi.node.ts b/packages/nodes-base/nodes/HumanticAI/HumanticAi.node.ts
index fcbd86ef0979b..78d8fe20ddfda 100644
--- a/packages/nodes-base/nodes/HumanticAI/HumanticAi.node.ts
+++ b/packages/nodes-base/nodes/HumanticAI/HumanticAi.node.ts
@@ -8,7 +8,6 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { humanticAiApiRequest } from './GenericFunctions';
-
 import { profileFields, profileOperations } from './ProfileDescription';
 
 export class HumanticAi implements INodeType {
diff --git a/packages/nodes-base/nodes/Hunter/Hunter.node.ts b/packages/nodes-base/nodes/Hunter/Hunter.node.ts
index c8eed8e9ba09b..c1cda5a715166 100644
--- a/packages/nodes-base/nodes/Hunter/Hunter.node.ts
+++ b/packages/nodes-base/nodes/Hunter/Hunter.node.ts
@@ -6,6 +6,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
+
 import { hunterApiRequest, hunterApiRequestAllItems } from './GenericFunctions';
 
 export class Hunter implements INodeType {
diff --git a/packages/nodes-base/nodes/ICalendar/createEvent.operation.ts b/packages/nodes-base/nodes/ICalendar/createEvent.operation.ts
index 99e2bcf8164f8..3e49879e508d9 100644
--- a/packages/nodes-base/nodes/ICalendar/createEvent.operation.ts
+++ b/packages/nodes-base/nodes/ICalendar/createEvent.operation.ts
@@ -1,4 +1,5 @@
-import { promisify } from 'util';
+import * as ics from 'ics';
+import moment from 'moment-timezone';
 import {
 	type IExecuteFunctions,
 	type IDataObject,
@@ -6,9 +7,7 @@ import {
 	type INodeProperties,
 	NodeOperationError,
 } from 'n8n-workflow';
-
-import moment from 'moment-timezone';
-import * as ics from 'ics';
+import { promisify } from 'util';
 
 const createEvent = promisify(ics.createEvent);
 
diff --git a/packages/nodes-base/nodes/ICalendar/test/node/ICalendar.test.ts b/packages/nodes-base/nodes/ICalendar/test/node/ICalendar.test.ts
index 9757cd5f2a479..65a238c7352d6 100644
--- a/packages/nodes-base/nodes/ICalendar/test/node/ICalendar.test.ts
+++ b/packages/nodes-base/nodes/ICalendar/test/node/ICalendar.test.ts
@@ -1,13 +1,12 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
-import type { WorkflowTestData } from '@test/nodes/types';
-
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import {
 	getResultNodeData,
 	setup,
 	readJsonFileSync,
 	initBinaryDataService,
 } from '@test/nodes/Helpers';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+import type { WorkflowTestData } from '@test/nodes/types';
 
 describe('Execute iCalendar Node', () => {
 	beforeEach(async () => {
diff --git a/packages/nodes-base/nodes/If/V2/IfV2.node.ts b/packages/nodes-base/nodes/If/V2/IfV2.node.ts
index 6ef2dcb626723..3d9ca752a0c37 100644
--- a/packages/nodes-base/nodes/If/V2/IfV2.node.ts
+++ b/packages/nodes-base/nodes/If/V2/IfV2.node.ts
@@ -9,9 +9,10 @@ import {
 	type INodeTypeDescription,
 	NodeConnectionType,
 } from 'n8n-workflow';
+
+import { getTypeValidationParameter, getTypeValidationStrictness } from './utils';
 import { ENABLE_LESS_STRICT_TYPE_VALIDATION } from '../../../utils/constants';
 import { looseTypeValidationProperty } from '../../../utils/descriptions';
-import { getTypeValidationParameter, getTypeValidationStrictness } from './utils';
 
 export class IfV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/If/test/v2/IfV2.node.test.ts b/packages/nodes-base/nodes/If/test/v2/IfV2.node.test.ts
index d0531ff3c2a92..e21f87709141b 100644
--- a/packages/nodes-base/nodes/If/test/v2/IfV2.node.test.ts
+++ b/packages/nodes-base/nodes/If/test/v2/IfV2.node.test.ts
@@ -1,5 +1,86 @@
+import { mock } from 'jest-mock-extended';
+import { get } from 'lodash';
+import {
+	NodeOperationError,
+	type IExecuteFunctions,
+	type INodeTypeDescription,
+	type IDataObject,
+	type IGetNodeParameterOptions,
+} from 'n8n-workflow';
+
 import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
 
-const workflows = getWorkflowFilenames(__dirname);
+import * as IfV2 from '../../V2/IfV2.node';
+
+jest.mock('lodash/set', () => jest.fn());
+
+describe('Test IF v2 Node Tests', () => {
+	afterEach(() => jest.resetAllMocks());
+
+	describe('Test IF v2 Node Workflow Tests', () => testWorkflows(getWorkflowFilenames(__dirname)));
+
+	describe('Test IF V2 Node Unit Tests', () => {
+		const node = new IfV2.IfV2(mock<INodeTypeDescription>());
+
+		const input = [{ json: {} }];
+
+		const createMockExecuteFunction = (
+			nodeParameters: IDataObject,
+			continueOnFail: boolean = false,
+		) => {
+			const fakeExecuteFunction = {
+				getNodeParameter(
+					parameterName: string,
+					itemIndex: number,
+					fallbackValue?: IDataObject | undefined,
+					options?: IGetNodeParameterOptions | undefined,
+				) {
+					const parameter = options?.extractValue ? `${parameterName}.value` : parameterName;
+
+					const parameterValue = get(nodeParameters, parameter, fallbackValue);
+
+					if ((parameterValue as IDataObject)?.nodeOperationError) {
+						throw new NodeOperationError(mock(), 'Get Options Error', { itemIndex });
+					}
+
+					return parameterValue;
+				},
+				getNode() {
+					return node;
+				},
+				continueOnFail: () => continueOnFail,
+				getInputData: () => input,
+			} as unknown as IExecuteFunctions;
+			return fakeExecuteFunction;
+		};
+
+		it('should return items if continue on fail is true', async () => {
+			const fakeExecuteFunction = createMockExecuteFunction(
+				{ options: { nodeOperationError: true } },
+				true,
+			);
+
+			const output = await node.execute.call(fakeExecuteFunction);
+			expect(output).toEqual([[], input]);
+		});
+
+		it('should throw an error if continue on fail is false and if there is an error', async () => {
+			const fakeExecuteFunction = createMockExecuteFunction(
+				{ options: { nodeOperationError: true } },
+				false,
+			);
+
+			await expect(node.execute.call(fakeExecuteFunction)).rejects.toThrow(NodeOperationError);
+		});
+
+		it('should assign a paired item if paired item is undefined', async () => {
+			const fakeExecuteFunction = createMockExecuteFunction(
+				{ options: {}, conditions: true },
+				false,
+			);
 
-describe('Test IF v2 Node', () => testWorkflows(workflows));
+			const output = await node.execute.call(fakeExecuteFunction);
+			expect(output).toEqual([[], [{ json: {}, pairedItem: { item: 0 } }]]);
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Intercom/Intercom.node.ts b/packages/nodes-base/nodes/Intercom/Intercom.node.ts
index dead14c67ba76..26f71620c5ada 100644
--- a/packages/nodes-base/nodes/Intercom/Intercom.node.ts
+++ b/packages/nodes-base/nodes/Intercom/Intercom.node.ts
@@ -9,13 +9,14 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeApiError, NodeOperationError } from 'n8n-workflow';
-import { leadFields, leadOperations } from './LeadDescription';
+
+import { companyFields, companyOperations } from './CompanyDescription';
+import type { ICompany } from './CompanyInteface';
 import { intercomApiRequest, intercomApiRequestAllItems, validateJSON } from './GenericFunctions';
+import { leadFields, leadOperations } from './LeadDescription';
 import type { IAvatar, ILead, ILeadCompany } from './LeadInterface';
 import { userFields, userOperations } from './UserDescription';
 import type { IUser, IUserCompany } from './UserInterface';
-import { companyFields, companyOperations } from './CompanyDescription';
-import type { ICompany } from './CompanyInteface';
 
 export class Intercom implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/InvoiceNinja/BankTransactionDescription.ts b/packages/nodes-base/nodes/InvoiceNinja/BankTransactionDescription.ts
index abf39ab493889..75c3f6dbf6731 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/BankTransactionDescription.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/BankTransactionDescription.ts
@@ -97,6 +97,17 @@ export const bankTransactionFields: INodeProperties[] = [
 				],
 				default: '',
 			},
+			{
+				displayName: 'Currency Name or ID',
+				name: 'currencyId',
+				type: 'options',
+				description:
+					'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>',
+				typeOptions: {
+					loadOptionsMethod: 'getCurrencies',
+				},
+				default: '',
+			},
 			{
 				displayName: 'Date',
 				name: 'date',
diff --git a/packages/nodes-base/nodes/InvoiceNinja/BankTransactionInterface.ts b/packages/nodes-base/nodes/InvoiceNinja/BankTransactionInterface.ts
index 735f339ab8c4e..385009aec6e7d 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/BankTransactionInterface.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/BankTransactionInterface.ts
@@ -2,8 +2,13 @@ export interface IBankTransaction {
 	amount?: number;
 	bank_integration_id?: number;
 	base_type?: string;
+	currency_id?: number;
 	date?: string;
 	description?: string;
 	id?: string;
-	paymentId?: string;
+	payment_id?: string;
+}
+
+export interface IBankTransactions {
+	transactions: IBankTransaction[];
 }
diff --git a/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts b/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts
index 76750e8fd9f2b..ce1c3b012d1be 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -9,8 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
 export const eventID: { [key: string]: string } = {
 	create_client: '1',
 	create_invoice: '2',
diff --git a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts
index ef7494d30693c..2b771c545f18f 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts
@@ -9,36 +9,23 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { invoiceNinjaApiRequest, invoiceNinjaApiRequestAllItems } from './GenericFunctions';
+import { isoCountryCodes } from '@utils/ISOCountryCodes';
 
+import { bankTransactionFields, bankTransactionOperations } from './BankTransactionDescription';
+import type { IBankTransaction, IBankTransactions } from './BankTransactionInterface';
 import { clientFields, clientOperations } from './ClientDescription';
-
-import { invoiceFields, invoiceOperations } from './InvoiceDescription';
-
 import type { IClient, IContact } from './ClientInterface';
-
+import { expenseFields, expenseOperations } from './ExpenseDescription';
+import type { IExpense } from './ExpenseInterface';
+import { invoiceNinjaApiRequest, invoiceNinjaApiRequestAllItems } from './GenericFunctions';
+import { invoiceFields, invoiceOperations } from './InvoiceDescription';
 import type { IInvoice, IItem } from './invoiceInterface';
-
-import { taskFields, taskOperations } from './TaskDescription';
-
-import type { ITask } from './TaskInterface';
-
 import { paymentFields, paymentOperations } from './PaymentDescription';
-
 import type { IPayment } from './PaymentInterface';
-
-import { expenseFields, expenseOperations } from './ExpenseDescription';
-
-import type { IExpense } from './ExpenseInterface';
-
 import { quoteFields, quoteOperations } from './QuoteDescription';
-
 import type { IQuote } from './QuoteInterface';
-import { isoCountryCodes } from '@utils/ISOCountryCodes';
-
-import { bankTransactionFields, bankTransactionOperations } from './BankTransactionDescription';
-
-import type { IBankTransaction } from './BankTransactionInterface';
+import { taskFields, taskOperations } from './TaskDescription';
+import type { ITask } from './TaskInterface';
 
 export class InvoiceNinja implements INodeType {
 	description: INodeTypeDescription = {
@@ -295,7 +282,7 @@ export class InvoiceNinja implements INodeType {
 				}
 				return returnData;
 			},
-			// Get all the available users to display them to user so that they can
+			// Get all the matchable payments to display them to user so that they can
 			// select them easily
 			async getPayments(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
@@ -322,6 +309,29 @@ export class InvoiceNinja implements INodeType {
 				}
 				return returnData;
 			},
+			// Get all the currencies to display them to user so that they can
+			// select them easily
+			async getCurrencies(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+
+				const statics = await invoiceNinjaApiRequestAllItems.call(this, 'data', 'GET', '/statics');
+
+				Object.entries(statics)
+					.filter(([key]) => key === 'currencies')
+					.forEach(([key, value]) => {
+						if (key === 'currencies' && Array.isArray(value)) {
+							for (const currency of value) {
+								const currencyName = [currency.number, currency.code].filter((e) => e).join(' - ');
+								const currencyId = currency.id as string;
+								returnData.push({
+									name: currencyName,
+									value: currencyId,
+								});
+							}
+						}
+					});
+				return returnData;
+			},
 		},
 	};
 
@@ -986,6 +996,9 @@ export class InvoiceNinja implements INodeType {
 						if (additionalFields.client) {
 							body.date = additionalFields.date as string;
 						}
+						if (additionalFields.currencyId) {
+							body.currency_id = additionalFields.currencyId as number;
+						}
 						if (additionalFields.email) {
 							body.description = additionalFields.description as string;
 						}
@@ -1054,18 +1067,20 @@ export class InvoiceNinja implements INodeType {
 					if (operation === 'matchPayment') {
 						const bankTransactionId = this.getNodeParameter('bankTransactionId', i) as string;
 						const paymentId = this.getNodeParameter('paymentId', i) as string;
-						const body: IBankTransaction = {};
+						const body: IBankTransactions = { transactions: [] };
+						const bankTransaction: IBankTransaction = {};
 						if (bankTransactionId) {
-							body.id = bankTransactionId;
+							bankTransaction.id = bankTransactionId;
 						}
 						if (paymentId) {
-							body.paymentId = paymentId;
+							bankTransaction.payment_id = paymentId;
 						}
+						body.transactions.push(bankTransaction);
 						responseData = await invoiceNinjaApiRequest.call(
 							this,
 							'POST',
 							`${resourceEndpoint}/match`,
-							body as IDataObject,
+							body as unknown as IDataObject,
 						);
 					}
 				}
diff --git a/packages/nodes-base/nodes/ItemLists/V1/ItemListsV1.node.ts b/packages/nodes-base/nodes/ItemLists/V1/ItemListsV1.node.ts
index e5319eb6e2d6b..15bfa4aaea23a 100644
--- a/packages/nodes-base/nodes/ItemLists/V1/ItemListsV1.node.ts
+++ b/packages/nodes-base/nodes/ItemLists/V1/ItemListsV1.node.ts
@@ -1,3 +1,11 @@
+import get from 'lodash/get';
+import isEmpty from 'lodash/isEmpty';
+import isEqual from 'lodash/isEqual';
+import lt from 'lodash/lt';
+import pick from 'lodash/pick';
+import set from 'lodash/set';
+import unset from 'lodash/unset';
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -6,19 +14,11 @@ import type {
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-import isEmpty from 'lodash/isEmpty';
-import isEqual from 'lodash/isEqual';
-import lt from 'lodash/lt';
-import pick from 'lodash/pick';
-import set from 'lodash/set';
-import unset from 'lodash/unset';
+import { flattenKeys, shuffleArray, compareItems } from '@utils/utilities';
 
-import { sortByCode } from '../V3/helpers/utils';
 import * as summarize from './summarize.operation';
-import { flattenKeys, shuffleArray, compareItems } from '@utils/utilities';
+import { sortByCode } from '../V3/helpers/utils';
 
 export class ItemListsV1 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/ItemLists/V1/summarize.operation.ts b/packages/nodes-base/nodes/ItemLists/V1/summarize.operation.ts
index 673119063b856..24e7d12406b6b 100644
--- a/packages/nodes-base/nodes/ItemLists/V1/summarize.operation.ts
+++ b/packages/nodes-base/nodes/ItemLists/V1/summarize.operation.ts
@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import type {
 	GenericValue,
 	IDataObject,
@@ -7,8 +8,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
 type AggregationType =
 	| 'append'
 	| 'average'
diff --git a/packages/nodes-base/nodes/ItemLists/V2/ItemListsV2.node.ts b/packages/nodes-base/nodes/ItemLists/V2/ItemListsV2.node.ts
index 5447f9e95d712..bc2b310441853 100644
--- a/packages/nodes-base/nodes/ItemLists/V2/ItemListsV2.node.ts
+++ b/packages/nodes-base/nodes/ItemLists/V2/ItemListsV2.node.ts
@@ -1,3 +1,11 @@
+import get from 'lodash/get';
+import isEmpty from 'lodash/isEmpty';
+import isEqual from 'lodash/isEqual';
+import lt from 'lodash/lt';
+import pick from 'lodash/pick';
+import set from 'lodash/set';
+import unset from 'lodash/unset';
+import { NodeConnectionType, NodeOperationError, deepCopy } from 'n8n-workflow';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -7,19 +15,11 @@ import type {
 	INodeTypeDescription,
 	IPairedItemData,
 } from 'n8n-workflow';
-import { NodeConnectionType, NodeOperationError, deepCopy } from 'n8n-workflow';
 
-import get from 'lodash/get';
-import isEmpty from 'lodash/isEmpty';
-import isEqual from 'lodash/isEqual';
-import lt from 'lodash/lt';
-import pick from 'lodash/pick';
-import set from 'lodash/set';
-import unset from 'lodash/unset';
+import { flattenKeys, shuffleArray, compareItems } from '@utils/utilities';
 
-import { sortByCode } from '../V3/helpers/utils';
 import * as summarize from './summarize.operation';
-import { flattenKeys, shuffleArray, compareItems } from '@utils/utilities';
+import { sortByCode } from '../V3/helpers/utils';
 
 export class ItemListsV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/ItemLists/V2/summarize.operation.ts b/packages/nodes-base/nodes/ItemLists/V2/summarize.operation.ts
index f6fc2ddd7220d..1086be2f1c422 100644
--- a/packages/nodes-base/nodes/ItemLists/V2/summarize.operation.ts
+++ b/packages/nodes-base/nodes/ItemLists/V2/summarize.operation.ts
@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import type {
 	GenericValue,
 	IDataObject,
@@ -7,8 +8,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
 type AggregationType =
 	| 'append'
 	| 'average'
diff --git a/packages/nodes-base/nodes/ItemLists/V3/ItemListsV3.node.ts b/packages/nodes-base/nodes/ItemLists/V3/ItemListsV3.node.ts
index d2408eb277d66..8cc09765bd4cf 100644
--- a/packages/nodes-base/nodes/ItemLists/V3/ItemListsV3.node.ts
+++ b/packages/nodes-base/nodes/ItemLists/V3/ItemListsV3.node.ts
@@ -5,8 +5,8 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import { versionDescription } from './actions/versionDescription';
 import { router } from './actions/router';
+import { versionDescription } from './actions/versionDescription';
 
 export class ItemListsV3 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/concatenateItems.operation.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/concatenateItems.operation.ts
index 138fd2d2767b7..83b64309c15b5 100644
--- a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/concatenateItems.operation.ts
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/concatenateItems.operation.ts
@@ -1,3 +1,6 @@
+import get from 'lodash/get';
+import isEmpty from 'lodash/isEmpty';
+import set from 'lodash/set';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -7,13 +10,10 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-import isEmpty from 'lodash/isEmpty';
-import set from 'lodash/set';
+import { updateDisplayOptions } from '@utils/utilities';
 
 import { addBinariesToItem, prepareFieldsArray } from '../../helpers/utils';
 import { disableDotNotationBoolean } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/limit.operation.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/limit.operation.ts
index 5671cf246fa03..1a6a6a334b214 100644
--- a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/limit.operation.ts
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/limit.operation.ts
@@ -1,4 +1,5 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/removeDuplicates.operation.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/removeDuplicates.operation.ts
index 09f580b393c86..cd9bb20c27dc1 100644
--- a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/removeDuplicates.operation.ts
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/removeDuplicates.operation.ts
@@ -1,14 +1,14 @@
-import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
-
 import get from 'lodash/get';
 import isEqual from 'lodash/isEqual';
 import lt from 'lodash/lt';
 import pick from 'lodash/pick';
+import { NodeOperationError } from 'n8n-workflow';
+import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+
+import { compareItems, flattenKeys, updateDisplayOptions } from '@utils/utilities';
 
 import { prepareFieldsArray, typeToNumber } from '../../helpers/utils';
 import { disableDotNotationBoolean } from '../common.descriptions';
-import { compareItems, flattenKeys, updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/sort.operation.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/sort.operation.ts
index 0bd3ec9ec9141..7e09010422398 100644
--- a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/sort.operation.ts
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/sort.operation.ts
@@ -1,3 +1,6 @@
+import get from 'lodash/get';
+import isEqual from 'lodash/isEqual';
+import lt from 'lodash/lt';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -6,14 +9,10 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
-import isEqual from 'lodash/isEqual';
-import lt from 'lodash/lt';
+import { shuffleArray, updateDisplayOptions } from '@utils/utilities';
 
 import { sortByCode } from '../../helpers/utils';
 import { disableDotNotationBoolean } from '../common.descriptions';
-import { shuffleArray, updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/splitOutItems.operation.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/splitOutItems.operation.ts
index 544192fd99eb5..2c437a6a7470c 100644
--- a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/splitOutItems.operation.ts
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/splitOutItems.operation.ts
@@ -1,3 +1,5 @@
+import get from 'lodash/get';
+import unset from 'lodash/unset';
 import type {
 	IBinaryData,
 	IDataObject,
@@ -7,12 +9,11 @@ import type {
 } from 'n8n-workflow';
 import { deepCopy, NodeOperationError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-import unset from 'lodash/unset';
-import { disableDotNotationBoolean } from '../common.descriptions';
-import { prepareFieldsArray } from '../../helpers/utils';
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { prepareFieldsArray } from '../../helpers/utils';
+import { disableDotNotationBoolean } from '../common.descriptions';
+
 const properties: INodeProperties[] = [
 	{
 		displayName: 'Fields To Split Out',
diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/summarize.operation.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/summarize.operation.ts
index d026beb2d7c36..7d96e5800093a 100644
--- a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/summarize.operation.ts
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/summarize.operation.ts
@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import type {
 	GenericValue,
 	IDataObject,
@@ -7,10 +8,10 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-import { disableDotNotationBoolean } from '../common.descriptions';
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { disableDotNotationBoolean } from '../common.descriptions';
+
 type AggregationType =
 	| 'append'
 	| 'average'
diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/router.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/router.ts
index 006d4f9b87e79..6580464c4ae83 100644
--- a/packages/nodes-base/nodes/ItemLists/V3/actions/router.ts
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/router.ts
@@ -1,8 +1,8 @@
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import type { ItemListsType } from './node.type';
 
 import * as itemList from './itemList';
+import type { ItemListsType } from './node.type';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	let returnData: INodeExecutionData[] = [];
diff --git a/packages/nodes-base/nodes/Iterable/Iterable.node.ts b/packages/nodes-base/nodes/Iterable/Iterable.node.ts
index 2159705475761..7e5d7e20d2641 100644
--- a/packages/nodes-base/nodes/Iterable/Iterable.node.ts
+++ b/packages/nodes-base/nodes/Iterable/Iterable.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -10,13 +11,9 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-import { iterableApiRequest } from './GenericFunctions';
-
 import { eventFields, eventOperations } from './EventDescription';
-
+import { iterableApiRequest } from './GenericFunctions';
 import { userFields, userOperations } from './UserDescription';
-
 import { userListFields, userListOperations } from './UserListDescription';
 
 export class Iterable implements INodeType {
diff --git a/packages/nodes-base/nodes/Jira/Jira.node.ts b/packages/nodes-base/nodes/Jira/Jira.node.ts
index 2c21328f78818..26770e2eae9b0 100644
--- a/packages/nodes-base/nodes/Jira/Jira.node.ts
+++ b/packages/nodes-base/nodes/Jira/Jira.node.ts
@@ -1,6 +1,4 @@
-import type { Readable } from 'stream';
 import mergeWith from 'lodash/mergeWith';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -13,6 +11,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { BINARY_ENCODING, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import type { Readable } from 'stream';
 
 import {
 	filterSortSearchListItems,
@@ -22,13 +21,9 @@ import {
 	simplifyIssueOutput,
 	validateJSON,
 } from './GenericFunctions';
-
 import { issueAttachmentFields, issueAttachmentOperations } from './IssueAttachmentDescription';
-
 import { issueCommentFields, issueCommentOperations } from './IssueCommentDescription';
-
 import { issueFields, issueOperations } from './IssueDescription';
-
 import type {
 	IFields,
 	IIssue,
@@ -36,7 +31,6 @@ import type {
 	INotify,
 	NotificationRecipientsRestrictions,
 } from './IssueInterface';
-
 import { userFields, userOperations } from './UserDescription';
 
 export class Jira implements INodeType {
diff --git a/packages/nodes-base/nodes/Jwt/Jwt.node.ts b/packages/nodes-base/nodes/Jwt/Jwt.node.ts
index 3a0815c906fed..1018f97bf8125 100644
--- a/packages/nodes-base/nodes/Jwt/Jwt.node.ts
+++ b/packages/nodes-base/nodes/Jwt/Jwt.node.ts
@@ -1,3 +1,4 @@
+import jwt from 'jsonwebtoken';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -7,8 +8,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import jwt from 'jsonwebtoken';
-
 import { formatPrivateKey } from '../../utils/utilities';
 import { parseJsonParameter } from '../Set/v2/helpers/utils';
 
diff --git a/packages/nodes-base/nodes/Kafka/Kafka.node.ts b/packages/nodes-base/nodes/Kafka/Kafka.node.ts
index 87e9f95b0d7e7..0306fae7723a3 100644
--- a/packages/nodes-base/nodes/Kafka/Kafka.node.ts
+++ b/packages/nodes-base/nodes/Kafka/Kafka.node.ts
@@ -1,8 +1,6 @@
+import { SchemaRegistry } from '@kafkajs/confluent-schema-registry';
 import type { KafkaConfig, SASLOptions, TopicMessages } from 'kafkajs';
 import { CompressionTypes, Kafka as apacheKafka } from 'kafkajs';
-
-import { SchemaRegistry } from '@kafkajs/confluent-schema-registry';
-
 import type {
 	IExecuteFunctions,
 	ICredentialDataDecryptedObject,
@@ -15,6 +13,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { ApplicationError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+
 import { generatePairedItemData } from '../../utils/utilities';
 
 export class Kafka implements INodeType {
diff --git a/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.ts b/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.ts
index 631566ffbd071..628d1d1d4d753 100644
--- a/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.ts
+++ b/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.ts
@@ -1,8 +1,6 @@
+import { SchemaRegistry } from '@kafkajs/confluent-schema-registry';
 import type { KafkaConfig, SASLOptions } from 'kafkajs';
 import { Kafka as apacheKafka, logLevel } from 'kafkajs';
-
-import { SchemaRegistry } from '@kafkajs/confluent-schema-registry';
-
 import type {
 	ITriggerFunctions,
 	IDataObject,
diff --git a/packages/nodes-base/nodes/Keap/GenericFunctions.ts b/packages/nodes-base/nodes/Keap/GenericFunctions.ts
index 896c4449a9c45..b44fad91e1038 100644
--- a/packages/nodes-base/nodes/Keap/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Keap/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import { snakeCase } from 'change-case';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -10,8 +11,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
-
 export async function keapApiRequest(
 	this: IWebhookFunctions | IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	method: IHttpRequestMethods,
@@ -41,7 +40,6 @@ export async function keapApiRequest(
 		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'keapOAuth2Api', options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/Keap/Keap.node.ts b/packages/nodes-base/nodes/Keap/Keap.node.ts
index 43a766ab3ad1e..065dbec746646 100644
--- a/packages/nodes-base/nodes/Keap/Keap.node.ts
+++ b/packages/nodes-base/nodes/Keap/Keap.node.ts
@@ -1,3 +1,6 @@
+import { capitalCase, pascalCase } from 'change-case';
+import moment from 'moment-timezone';
+import { NodeConnectionType } from 'n8n-workflow';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -7,28 +10,9 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeConnectionType } from 'n8n-workflow';
-
-import { capitalCase, pascalCase } from 'change-case';
-import moment from 'moment-timezone';
-import { keapApiRequest, keapApiRequestAllItems, keysToSnakeCase } from './GenericFunctions';
-
-import { contactFields, contactOperations } from './ContactDescription';
-
-import { contactNoteFields, contactNoteOperations } from './ContactNoteDescription';
-
-import { contactTagFields, contactTagOperations } from './ContactTagDescription';
-
-import { ecommerceOrderFields, ecommerceOrderOperations } from './EcommerceOrderDescripion';
-
-import { ecommerceProductFields, ecommerceProductOperations } from './EcommerceProductDescription';
-
-import { emailFields, emailOperations } from './EmailDescription';
-
-import { fileFields, fileOperations } from './FileDescription';
 
 import { companyFields, companyOperations } from './CompanyDescription';
-
+import type { ICompany } from './CompanyInterface';
 import type {
 	IAddress,
 	IContact,
@@ -37,18 +21,19 @@ import type {
 	IPhone,
 	ISocialAccount,
 } from './ConctactInterface';
-
-import type { IAttachment, IEmail } from './EmaiIInterface';
-
+import { contactFields, contactOperations } from './ContactDescription';
+import { contactNoteFields, contactNoteOperations } from './ContactNoteDescription';
 import type { INote } from './ContactNoteInterface';
-
+import { contactTagFields, contactTagOperations } from './ContactTagDescription';
+import { ecommerceOrderFields, ecommerceOrderOperations } from './EcommerceOrderDescripion';
 import type { IEcommerceOrder, IItem, IShippingAddress } from './EcommerceOrderInterface';
-
+import { ecommerceProductFields, ecommerceProductOperations } from './EcommerceProductDescription';
 import type { IEcommerceProduct } from './EcommerceProductInterface';
-
+import type { IAttachment, IEmail } from './EmaiIInterface';
+import { emailFields, emailOperations } from './EmailDescription';
+import { fileFields, fileOperations } from './FileDescription';
 import type { IFile } from './FileInterface';
-
-import type { ICompany } from './CompanyInterface';
+import { keapApiRequest, keapApiRequestAllItems, keysToSnakeCase } from './GenericFunctions';
 
 export class Keap implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts b/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts
index 066bceb0ff5f9..74446697123ab 100644
--- a/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts
+++ b/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts
@@ -1,3 +1,4 @@
+import { capitalCase } from 'change-case';
 import type {
 	IHookFunctions,
 	IWebhookFunctions,
@@ -10,7 +11,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { capitalCase } from 'change-case';
 import { keapApiRequest } from './GenericFunctions';
 
 export class KeapTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts b/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts
index 946db3742a3aa..87f6931dbf111 100644
--- a/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts
+++ b/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts
@@ -17,10 +17,9 @@ import {
 	workItemFields,
 	workItemOperations,
 } from './descriptions';
-
 import type { LoadOptions } from './GenericFunctions';
 import { createLoadOptions, kitemakerRequest, kitemakerRequestAllItems } from './GenericFunctions';
-
+import { createWorkItem, editWorkItem } from './mutations';
 import {
 	getAllSpaces,
 	getAllUsers,
@@ -34,8 +33,6 @@ import {
 	getWorkItems,
 } from './queries';
 
-import { createWorkItem, editWorkItem } from './mutations';
-
 export class Kitemaker implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Kitemaker',
diff --git a/packages/nodes-base/nodes/KoBoToolbox/GenericFunctions.ts b/packages/nodes-base/nodes/KoBoToolbox/GenericFunctions.ts
index cb9b6b6a2c7d6..77279a338a530 100644
--- a/packages/nodes-base/nodes/KoBoToolbox/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/KoBoToolbox/GenericFunctions.ts
@@ -1,3 +1,18 @@
+import clone from 'lodash/clone';
+import compact from 'lodash/compact';
+import concat from 'lodash/concat';
+import escapeRegExp from 'lodash/escapeRegExp';
+import every from 'lodash/every';
+import first from 'lodash/first';
+import isArray from 'lodash/isArray';
+import isString from 'lodash/isString';
+import last from 'lodash/last';
+import set from 'lodash/set';
+import some from 'lodash/some';
+import split from 'lodash/split';
+import toNumber from 'lodash/toNumber';
+import toString from 'lodash/toString';
+import trim from 'lodash/trim';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -9,22 +24,6 @@ import type {
 	IWebhookFunctions,
 } from 'n8n-workflow';
 
-import set from 'lodash/set';
-import concat from 'lodash/concat';
-import split from 'lodash/split';
-import every from 'lodash/every';
-import toString from 'lodash/toString';
-import toNumber from 'lodash/toNumber';
-import isString from 'lodash/isString';
-import compact from 'lodash/compact';
-import first from 'lodash/first';
-import last from 'lodash/last';
-import clone from 'lodash/clone';
-import some from 'lodash/some';
-import isArray from 'lodash/isArray';
-import trim from 'lodash/trim';
-import escapeRegExp from 'lodash/escapeRegExp';
-
 export async function koBoToolboxApiRequest(
 	this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions,
 	option: IDataObject = {},
diff --git a/packages/nodes-base/nodes/KoBoToolbox/KoBoToolbox.node.ts b/packages/nodes-base/nodes/KoBoToolbox/KoBoToolbox.node.ts
index 2bb60b2b75f95..d4cdb886c2502 100644
--- a/packages/nodes-base/nodes/KoBoToolbox/KoBoToolbox.node.ts
+++ b/packages/nodes-base/nodes/KoBoToolbox/KoBoToolbox.node.ts
@@ -8,6 +8,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
+import { fileFields, fileOperations } from './FileDescription';
+import { formFields, formOperations } from './FormDescription';
 import {
 	downloadAttachments,
 	formatSubmission,
@@ -16,14 +18,8 @@ import {
 	loadForms,
 	parseStringList,
 } from './GenericFunctions';
-
-import { formFields, formOperations } from './FormDescription';
-
-import { submissionFields, submissionOperations } from './SubmissionDescription';
-
 import { hookFields, hookOperations } from './HookDescription';
-
-import { fileFields, fileOperations } from './FileDescription';
+import { submissionFields, submissionOperations } from './SubmissionDescription';
 
 export class KoBoToolbox implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/KoBoToolbox/KoBoToolboxTrigger.node.ts b/packages/nodes-base/nodes/KoBoToolbox/KoBoToolboxTrigger.node.ts
index 503c100741511..343f9d9c5b0e5 100644
--- a/packages/nodes-base/nodes/KoBoToolbox/KoBoToolboxTrigger.node.ts
+++ b/packages/nodes-base/nodes/KoBoToolbox/KoBoToolboxTrigger.node.ts
@@ -15,7 +15,6 @@ import {
 	loadForms,
 	parseStringList,
 } from './GenericFunctions';
-
 import { options } from './Options';
 
 export class KoBoToolboxTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Ldap/Ldap.node.ts b/packages/nodes-base/nodes/Ldap/Ldap.node.ts
index aa8f8413fc55a..2d13e10314d0b 100644
--- a/packages/nodes-base/nodes/Ldap/Ldap.node.ts
+++ b/packages/nodes-base/nodes/Ldap/Ldap.node.ts
@@ -1,3 +1,4 @@
+import { Attribute, Change } from 'ldapts';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
@@ -12,9 +13,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { Attribute, Change } from 'ldapts';
-import { ldapFields } from './LdapDescription';
 import { BINARY_AD_ATTRIBUTES, createLdapClient, resolveBinaryAttributes } from './Helpers';
+import { ldapFields } from './LdapDescription';
 
 export class Ldap implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts b/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts
index cc8875549c11a..a3d2d05dba338 100644
--- a/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import { capitalCase } from 'change-case';
 import type {
 	IExecuteFunctions,
 	IHookFunctions,
@@ -7,8 +8,6 @@ import type {
 	IRequestOptions,
 } from 'n8n-workflow';
 
-import { capitalCase } from 'change-case';
-
 /**
  * Make an authenticated API request to Lemlist.
  */
diff --git a/packages/nodes-base/nodes/Lemlist/test/GenericFunctions.test.ts b/packages/nodes-base/nodes/Lemlist/test/GenericFunctions.test.ts
index a0538678bd6a9..c64a845a551b7 100644
--- a/packages/nodes-base/nodes/Lemlist/test/GenericFunctions.test.ts
+++ b/packages/nodes-base/nodes/Lemlist/test/GenericFunctions.test.ts
@@ -5,6 +5,7 @@ import type {
 	IDataObject,
 	IHttpRequestMethods,
 } from 'n8n-workflow';
+
 import { lemlistApiRequest, lemlistApiRequestAllItems, getEvents } from '../GenericFunctions';
 
 describe('GenericFunctions', () => {
diff --git a/packages/nodes-base/nodes/Lemlist/v1/LemlistV1.node.ts b/packages/nodes-base/nodes/Lemlist/v1/LemlistV1.node.ts
index 9c313fc60f36e..9c95991940aa5 100644
--- a/packages/nodes-base/nodes/Lemlist/v1/LemlistV1.node.ts
+++ b/packages/nodes-base/nodes/Lemlist/v1/LemlistV1.node.ts
@@ -1,3 +1,5 @@
+import isEmpty from 'lodash/isEmpty';
+import omit from 'lodash/omit';
 import {
 	type IExecuteFunctions,
 	type IDataObject,
@@ -9,9 +11,6 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import isEmpty from 'lodash/isEmpty';
-import omit from 'lodash/omit';
-import { lemlistApiRequest, lemlistApiRequestAllItems } from '../GenericFunctions';
 import {
 	activityFields,
 	activityOperations,
@@ -24,6 +23,7 @@ import {
 	unsubscribeFields,
 	unsubscribeOperations,
 } from './descriptions';
+import { lemlistApiRequest, lemlistApiRequestAllItems } from '../GenericFunctions';
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Lemlist',
 	name: 'lemlist',
diff --git a/packages/nodes-base/nodes/Lemlist/v2/LemlistV2.node.ts b/packages/nodes-base/nodes/Lemlist/v2/LemlistV2.node.ts
index d49128ea9f2fb..7ccab5c90a4bb 100644
--- a/packages/nodes-base/nodes/Lemlist/v2/LemlistV2.node.ts
+++ b/packages/nodes-base/nodes/Lemlist/v2/LemlistV2.node.ts
@@ -1,3 +1,5 @@
+import isEmpty from 'lodash/isEmpty';
+import omit from 'lodash/omit';
 import {
 	type IExecuteFunctions,
 	type IDataObject,
@@ -9,9 +11,6 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import isEmpty from 'lodash/isEmpty';
-import omit from 'lodash/omit';
-import { lemlistApiRequest, lemlistApiRequestAllItems } from '../GenericFunctions';
 import {
 	activityFields,
 	activityOperations,
@@ -26,6 +25,7 @@ import {
 	unsubscribeFields,
 	unsubscribeOperations,
 } from './descriptions';
+import { lemlistApiRequest, lemlistApiRequestAllItems } from '../GenericFunctions';
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Lemlist',
 	name: 'lemlist',
diff --git a/packages/nodes-base/nodes/Line/Line.node.ts b/packages/nodes-base/nodes/Line/Line.node.ts
index f8cd832aa5928..15f4f4f36faa0 100644
--- a/packages/nodes-base/nodes/Line/Line.node.ts
+++ b/packages/nodes-base/nodes/Line/Line.node.ts
@@ -8,7 +8,6 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { lineApiRequest } from './GenericFunctions';
-
 import { notificationFields, notificationOperations } from './NotificationDescription';
 
 export class Line implements INodeType {
diff --git a/packages/nodes-base/nodes/Linear/GenericFunctions.ts b/packages/nodes-base/nodes/Linear/GenericFunctions.ts
index 4d008f2ac5d87..805fc697a6c75 100644
--- a/packages/nodes-base/nodes/Linear/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Linear/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialTestFunctions,
@@ -6,13 +7,10 @@ import type {
 	ILoadOptionsFunctions,
 	IHookFunctions,
 	IWebhookFunctions,
-	JsonObject,
-	IRequestOptions,
+	IHttpRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
 import { query } from './Queries';
 
 export async function linearApiRequest(
@@ -24,24 +22,43 @@ export async function linearApiRequest(
 	const endpoint = 'https://api.linear.app/graphql';
 	const authenticationMethod = this.getNodeParameter('authentication', 0, 'apiToken') as string;
 
-	let options: IRequestOptions = {
+	let options: IHttpRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
 		method: 'POST',
 		body,
-		uri: endpoint,
+		url: endpoint,
 		json: true,
 	};
 	options = Object.assign({}, options, option);
 	try {
-		return await this.helpers.requestWithAuthentication.call(
+		const response = await this.helpers.httpRequestWithAuthentication.call(
 			this,
 			authenticationMethod === 'apiToken' ? 'linearApi' : 'linearOAuth2Api',
 			options,
 		);
+
+		if (response.errors) {
+			throw new NodeApiError(this.getNode(), response.errors, {
+				message: response.errors[0].message,
+			});
+		}
+
+		return response;
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error as JsonObject);
+		throw new NodeApiError(
+			this.getNode(),
+			{},
+			{
+				message: error.errorResponse
+					? error.errorResponse[0].message
+					: error.context.data.errors[0].message,
+				description: error.errorResponse
+					? error.errorResponse[0].extensions.userPresentableMessage
+					: error.context.data.errors[0].extensions.userPresentableMessage,
+			},
+		);
 	}
 }
 
@@ -85,7 +102,7 @@ export async function validateCredentials(
 ): Promise<any> {
 	const credentials = decryptedCredentials;
 
-	const options: IRequestOptions = {
+	const options: IHttpRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 			Authorization: credentials.apiKey,
@@ -97,7 +114,7 @@ export async function validateCredentials(
 				first: 1,
 			},
 		},
-		uri: 'https://api.linear.app/graphql',
+		url: 'https://api.linear.app/graphql',
 		json: true,
 	};
 
diff --git a/packages/nodes-base/nodes/Linear/Linear.node.ts b/packages/nodes-base/nodes/Linear/Linear.node.ts
index 7ea6f2aca5e4a..23a8b9bd42f30 100644
--- a/packages/nodes-base/nodes/Linear/Linear.node.ts
+++ b/packages/nodes-base/nodes/Linear/Linear.node.ts
@@ -20,9 +20,7 @@ import {
 	sort,
 	validateCredentials,
 } from './GenericFunctions';
-
 import { issueFields, issueOperations } from './IssueDescription';
-
 import { query } from './Queries';
 interface IGraphqlBody {
 	query: string;
diff --git a/packages/nodes-base/nodes/Linear/LinearTrigger.node.ts b/packages/nodes-base/nodes/Linear/LinearTrigger.node.ts
index ea95e4879e405..dcbbed2ce2947 100644
--- a/packages/nodes-base/nodes/Linear/LinearTrigger.node.ts
+++ b/packages/nodes-base/nodes/Linear/LinearTrigger.node.ts
@@ -71,6 +71,12 @@ export class LinearTrigger implements INodeType {
 				],
 				default: 'apiToken',
 			},
+			{
+				displayName: 'Make sure your credential has the "Admin" scope to create webhooks.',
+				name: 'notice',
+				type: 'notice',
+				default: '',
+			},
 			{
 				displayName: 'Team Name or ID',
 				name: 'teamId',
diff --git a/packages/nodes-base/nodes/Linear/test/GenericFunctions.test.ts b/packages/nodes-base/nodes/Linear/test/GenericFunctions.test.ts
new file mode 100644
index 0000000000000..b49b59133a3d9
--- /dev/null
+++ b/packages/nodes-base/nodes/Linear/test/GenericFunctions.test.ts
@@ -0,0 +1,135 @@
+import type {
+	IExecuteFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+	IWebhookFunctions,
+} from 'n8n-workflow';
+import { NodeApiError } from 'n8n-workflow';
+
+import { capitalizeFirstLetter, linearApiRequest, sort } from '../GenericFunctions';
+
+describe('Linear -> GenericFunctions', () => {
+	const mockHttpRequestWithAuthentication = jest.fn();
+
+	describe('linearApiRequest', () => {
+		let mockExecuteFunctions:
+			| IExecuteFunctions
+			| IWebhookFunctions
+			| IHookFunctions
+			| ILoadOptionsFunctions;
+
+		const setupMockFunctions = (authentication: string) => {
+			mockExecuteFunctions = {
+				getNodeParameter: jest.fn().mockReturnValue(authentication),
+				helpers: {
+					httpRequestWithAuthentication: mockHttpRequestWithAuthentication,
+				},
+				getNode: jest.fn().mockReturnValue({}),
+			} as unknown as
+				| IExecuteFunctions
+				| IWebhookFunctions
+				| IHookFunctions
+				| ILoadOptionsFunctions;
+			jest.clearAllMocks();
+		};
+
+		beforeEach(() => {
+			setupMockFunctions('apiToken');
+		});
+
+		it('should make a successful API request', async () => {
+			const response = { data: { success: true } };
+
+			mockHttpRequestWithAuthentication.mockResolvedValue(response);
+
+			const result = await linearApiRequest.call(mockExecuteFunctions, {
+				query: '{ viewer { id } }',
+			});
+
+			expect(result).toEqual(response);
+			expect(mockExecuteFunctions.helpers.httpRequestWithAuthentication).toHaveBeenCalledWith(
+				'linearApi',
+				expect.objectContaining({
+					method: 'POST',
+					url: 'https://api.linear.app/graphql',
+					json: true,
+					body: { query: '{ viewer { id } }' },
+				}),
+			);
+		});
+
+		it('should handle API request errors', async () => {
+			const errorResponse = {
+				errors: [
+					{
+						message: 'Access denied',
+						extensions: {
+							userPresentableMessage: 'You need to have the "Admin" scope to create webhooks.',
+						},
+					},
+				],
+			};
+
+			mockHttpRequestWithAuthentication.mockResolvedValue(errorResponse);
+
+			await expect(
+				linearApiRequest.call(mockExecuteFunctions, { query: '{ viewer { id } }' }),
+			).rejects.toThrow(NodeApiError);
+
+			expect(mockExecuteFunctions.helpers.httpRequestWithAuthentication).toHaveBeenCalledWith(
+				'linearApi',
+				expect.objectContaining({
+					method: 'POST',
+					url: 'https://api.linear.app/graphql',
+					json: true,
+					body: { query: '{ viewer { id } }' },
+				}),
+			);
+		});
+	});
+
+	describe('capitalizeFirstLetter', () => {
+		it('should capitalize the first letter of a string', () => {
+			expect(capitalizeFirstLetter('hello')).toBe('Hello');
+			expect(capitalizeFirstLetter('world')).toBe('World');
+			expect(capitalizeFirstLetter('capitalize')).toBe('Capitalize');
+		});
+
+		it('should return an empty string if input is empty', () => {
+			expect(capitalizeFirstLetter('')).toBe('');
+		});
+
+		it('should handle single character strings', () => {
+			expect(capitalizeFirstLetter('a')).toBe('A');
+			expect(capitalizeFirstLetter('b')).toBe('B');
+		});
+
+		it('should not change the case of the rest of the string', () => {
+			expect(capitalizeFirstLetter('hELLO')).toBe('HELLO');
+			expect(capitalizeFirstLetter('wORLD')).toBe('WORLD');
+		});
+	});
+
+	describe('sort', () => {
+		it('should sort objects by name in ascending order', () => {
+			const array = [{ name: 'banana' }, { name: 'apple' }, { name: 'cherry' }];
+
+			const sortedArray = array.sort(sort);
+
+			expect(sortedArray).toEqual([{ name: 'apple' }, { name: 'banana' }, { name: 'cherry' }]);
+		});
+
+		it('should handle case insensitivity', () => {
+			const array = [{ name: 'Banana' }, { name: 'apple' }, { name: 'cherry' }];
+
+			const sortedArray = array.sort(sort);
+
+			expect(sortedArray).toEqual([{ name: 'apple' }, { name: 'Banana' }, { name: 'cherry' }]);
+		});
+
+		it('should return 0 for objects with the same name', () => {
+			const result = sort({ name: 'apple' }, { name: 'apple' });
+			expect(result).toBe(0);
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
index 9732176da9ced..44e8bb05856df 100644
--- a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
+++ b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
@@ -8,6 +8,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
+
 import { linkedInApiRequest } from './GenericFunctions';
 import { postFields, postOperations } from './PostDescription';
 
diff --git a/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.ts b/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.ts
index d01bc1ba1a97f..251b2402b0b10 100644
--- a/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.ts
+++ b/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.ts
@@ -1,3 +1,4 @@
+import { watch } from 'chokidar';
 import {
 	type ITriggerFunctions,
 	type IDataObject,
@@ -7,8 +8,6 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { watch } from 'chokidar';
-
 export class LocalFileTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Local File Trigger',
diff --git a/packages/nodes-base/nodes/LoneScale/GenericFunctions.ts b/packages/nodes-base/nodes/LoneScale/GenericFunctions.ts
index b237024c81f67..91f749e743405 100644
--- a/packages/nodes-base/nodes/LoneScale/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/LoneScale/GenericFunctions.ts
@@ -8,6 +8,7 @@ import {
 	type IWebhookFunctions,
 	type IRequestOptions,
 } from 'n8n-workflow';
+
 import { BASE_URL } from './constants';
 
 export async function lonescaleApiRequest(
diff --git a/packages/nodes-base/nodes/MQTT/test/Mqtt.node.test.ts b/packages/nodes-base/nodes/MQTT/test/Mqtt.node.test.ts
index 67b6202520f9d..9e86651ff2ad3 100644
--- a/packages/nodes-base/nodes/MQTT/test/Mqtt.node.test.ts
+++ b/packages/nodes-base/nodes/MQTT/test/Mqtt.node.test.ts
@@ -1,9 +1,9 @@
-import type { MqttClient } from 'mqtt';
 import { mock } from 'jest-mock-extended';
+import type { MqttClient } from 'mqtt';
 import type { ICredentialDataDecryptedObject, IExecuteFunctions } from 'n8n-workflow';
 
-import { Mqtt } from '../Mqtt.node';
 import { createClient } from '../GenericFunctions';
+import { Mqtt } from '../Mqtt.node';
 
 jest.mock('../GenericFunctions', () => {
 	const mockMqttClient = mock<MqttClient>();
diff --git a/packages/nodes-base/nodes/MQTT/test/MqttTrigger.node.test.ts b/packages/nodes-base/nodes/MQTT/test/MqttTrigger.node.test.ts
index 05694b43c6ad3..3862c91b5f98f 100644
--- a/packages/nodes-base/nodes/MQTT/test/MqttTrigger.node.test.ts
+++ b/packages/nodes-base/nodes/MQTT/test/MqttTrigger.node.test.ts
@@ -1,10 +1,10 @@
+import { captor, mock } from 'jest-mock-extended';
 import type { MqttClient, OnMessageCallback } from 'mqtt';
 import { returnJsonArray } from 'n8n-core';
-import { captor, mock } from 'jest-mock-extended';
 import type { ICredentialDataDecryptedObject, ITriggerFunctions } from 'n8n-workflow';
 
-import { MqttTrigger } from '../MqttTrigger.node';
 import { createClient } from '../GenericFunctions';
+import { MqttTrigger } from '../MqttTrigger.node';
 
 jest.mock('../GenericFunctions', () => {
 	const mockMqttClient = mock<MqttClient>();
diff --git a/packages/nodes-base/nodes/Magento/GenericFunctions.ts b/packages/nodes-base/nodes/Magento/GenericFunctions.ts
index 2b83721b28111..2817d51ccb461 100644
--- a/packages/nodes-base/nodes/Magento/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Magento/GenericFunctions.ts
@@ -11,6 +11,7 @@ import type {
 	IRequestOptions,
 } from 'n8n-workflow';
 import { ApplicationError, NodeApiError } from 'n8n-workflow';
+
 import type { Filter, Address, Search, FilterGroup, ProductAttribute } from './types';
 
 export async function magentoApiRequest(
@@ -39,7 +40,6 @@ export async function magentoApiRequest(
 		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
-		//@ts-ignore
 		return await this.helpers.requestWithAuthentication.call(this, 'magento2Api', options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/Magento/Magento2.node.ts b/packages/nodes-base/nodes/Magento/Magento2.node.ts
index 0d7196eb75e8e..ce473b16a80d4 100644
--- a/packages/nodes-base/nodes/Magento/Magento2.node.ts
+++ b/packages/nodes-base/nodes/Magento/Magento2.node.ts
@@ -1,3 +1,4 @@
+import { capitalCase } from 'change-case';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,7 +10,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeApiError } from 'n8n-workflow';
 
-import { capitalCase } from 'change-case';
+import { customerFields, customerOperations } from './CustomerDescription';
 import {
 	adjustAddresses,
 	getFilterQuery,
@@ -20,15 +21,9 @@ import {
 	sort,
 	validateJSON,
 } from './GenericFunctions';
-
-import { customerFields, customerOperations } from './CustomerDescription';
-
+import { invoiceFields, invoiceOperations } from './InvoiceDescription';
 import { orderFields, orderOperations } from './OrderDescription';
-
 import { productFields, productOperations } from './ProductDescription';
-
-import { invoiceFields, invoiceOperations } from './InvoiceDescription';
-
 import type {
 	CustomAttribute,
 	CustomerAttributeMetadata,
diff --git a/packages/nodes-base/nodes/Mailcheck/GenericFunctions.ts b/packages/nodes-base/nodes/Mailcheck/GenericFunctions.ts
index ae014ceed5f1c..23fa53e184c4b 100644
--- a/packages/nodes-base/nodes/Mailcheck/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mailcheck/GenericFunctions.ts
@@ -1,5 +1,4 @@
 import { ApplicationError } from 'n8n-workflow';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
diff --git a/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts b/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts
index 3c30d6c0d90f4..890ca723600fd 100644
--- a/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts
+++ b/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,7 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import {
 	campaignFieldsMetadata,
 	mailchimpApiRequest,
diff --git a/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts b/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts
index 928296c32d11a..b97c9dd37f755 100644
--- a/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts
+++ b/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts
@@ -10,6 +10,7 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeConnectionType } from 'n8n-workflow';
+
 import { mailchimpApiRequest } from './GenericFunctions';
 
 export class MailchimpTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/MailerLite/GenericFunctions.ts b/packages/nodes-base/nodes/MailerLite/GenericFunctions.ts
index 2459f349d1279..309d81188b2f5 100644
--- a/packages/nodes-base/nodes/MailerLite/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MailerLite/GenericFunctions.ts
@@ -3,39 +3,39 @@ import type {
 	IExecuteFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
+	INodePropertyOptions,
 	JsonObject,
-	IRequestOptions,
+	IHttpRequestOptions,
 	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
+import type { CustomField } from './v2/MailerLite.Interface';
+
 export async function mailerliteApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions,
 	method: IHttpRequestMethods,
 	path: string,
-
 	body: any = {},
 	qs: IDataObject = {},
 	_option = {},
 ): Promise<any> {
-	const credentials = await this.getCredentials('mailerLiteApi');
-
-	const options: IRequestOptions = {
-		headers: {
-			'X-MailerLite-ApiKey': credentials.apiKey,
-		},
+	const options: IHttpRequestOptions = {
 		method,
 		body,
 		qs,
-		uri: `https://api.mailerlite.com/api/v2${path}`,
+		url:
+			this.getNode().typeVersion === 1
+				? `https://api.mailerlite.com/api/v2${path}`
+				: `https://connect.mailerlite.com/api${path}`,
 		json: true,
 	};
 	try {
 		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
-		//@ts-ignore
-		return await this.helpers.request.call(this, options);
+
+		return await this.helpers.httpRequestWithAuthentication.call(this, 'mailerLiteApi', options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
@@ -45,21 +45,56 @@ export async function mailerliteApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions,
 	method: IHttpRequestMethods,
 	endpoint: string,
-
 	body: any = {},
 	query: IDataObject = {},
 ): Promise<any> {
 	const returnData: IDataObject[] = [];
-
 	let responseData;
 
 	query.limit = 1000;
 	query.offset = 0;
 
-	do {
-		responseData = await mailerliteApiRequest.call(this, method, endpoint, body, query);
-		returnData.push.apply(returnData, responseData as IDataObject[]);
-		query.offset = query.offset + query.limit;
-	} while (responseData.length !== 0);
+	if (this.getNode().typeVersion === 1) {
+		do {
+			responseData = await mailerliteApiRequest.call(this, method, endpoint, body, query);
+			returnData.push(...(responseData as IDataObject[]));
+			query.offset += query.limit;
+		} while (responseData.length !== 0);
+	} else {
+		do {
+			responseData = await mailerliteApiRequest.call(this, method, endpoint, body, query);
+			returnData.push(...(responseData.data as IDataObject[]));
+			query.cursor = responseData.meta.next_cursor;
+		} while (responseData.links.next !== null);
+	}
+
+	return returnData;
+}
+
+export async function getCustomFields(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+	const endpoint = '/fields';
+	const fieldsResponse = await mailerliteApiRequest.call(this, 'GET', endpoint);
+
+	if (this.getNode().typeVersion === 1) {
+		const fields = fieldsResponse as CustomField[];
+		fields.forEach((field) => {
+			returnData.push({
+				name: field.key,
+				value: field.key,
+			});
+		});
+	} else {
+		const fields = (fieldsResponse as IDataObject).data as CustomField[];
+		fields.forEach((field) => {
+			returnData.push({
+				name: field.name,
+				value: field.key,
+			});
+		});
+	}
+
 	return returnData;
 }
diff --git a/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts b/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts
index 6fe7c621b1e8e..fbd9c3a12511d 100644
--- a/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts
+++ b/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts
@@ -1,206 +1,26 @@
-import type {
-	IExecuteFunctions,
-	IDataObject,
-	ILoadOptionsFunctions,
-	INodeExecutionData,
-	INodePropertyOptions,
-	INodeType,
-	INodeTypeDescription,
-} from 'n8n-workflow';
-import { NodeConnectionType } from 'n8n-workflow';
-
-import { mailerliteApiRequest, mailerliteApiRequestAllItems } from './GenericFunctions';
-
-import { subscriberFields, subscriberOperations } from './SubscriberDescription';
-
-export class MailerLite implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'MailerLite',
-		name: 'mailerLite',
-		// eslint-disable-next-line n8n-nodes-base/node-class-description-icon-not-svg
-		icon: 'file:mailerLite.png',
-		group: ['input'],
-		version: 1,
-		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Mailer Lite API',
-		defaults: {
-			name: 'MailerLite',
-		},
-		inputs: [NodeConnectionType.Main],
-		outputs: [NodeConnectionType.Main],
-		credentials: [
-			{
-				name: 'mailerLiteApi',
-				required: true,
-			},
-		],
-		properties: [
-			{
-				displayName: 'Resource',
-				name: 'resource',
-				type: 'options',
-				noDataExpression: true,
-				options: [
-					{
-						name: 'Subscriber',
-						value: 'subscriber',
-					},
-				],
-				default: 'subscriber',
-			},
-			...subscriberOperations,
-			...subscriberFields,
-		],
-	};
-
-	methods = {
-		loadOptions: {
-			// Get all the available custom fields to display them to user so that they can
-			// select them easily
-			async getCustomFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const fields = await mailerliteApiRequest.call(this, 'GET', '/fields');
-				for (const field of fields) {
-					returnData.push({
-						name: field.key,
-						value: field.key,
-					});
-				}
-				return returnData;
-			},
-		},
-	};
-
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const items = this.getInputData();
-		const returnData: INodeExecutionData[] = [];
-		const length = items.length;
-		const qs: IDataObject = {};
-		let responseData;
-		const resource = this.getNodeParameter('resource', 0);
-		const operation = this.getNodeParameter('operation', 0);
-		for (let i = 0; i < length; i++) {
-			try {
-				if (resource === 'subscriber') {
-					//https://developers.mailerlite.com/reference#create-a-subscriber
-					if (operation === 'create') {
-						const email = this.getNodeParameter('email', i) as string;
-
-						const additionalFields = this.getNodeParameter('additionalFields', i);
-
-						const body: IDataObject = {
-							email,
-							fields: [],
-						};
-
-						Object.assign(body, additionalFields);
-
-						if (additionalFields.customFieldsUi) {
-							const customFieldsValues = (additionalFields.customFieldsUi as IDataObject)
-								.customFieldsValues as IDataObject[];
-
-							if (customFieldsValues) {
-								const fields = {};
-
-								for (const customFieldValue of customFieldsValues) {
-									//@ts-ignore
-									fields[customFieldValue.fieldId] = customFieldValue.value;
-								}
-
-								body.fields = fields;
-								delete body.customFieldsUi;
-							}
-						}
-
-						responseData = await mailerliteApiRequest.call(this, 'POST', '/subscribers', body);
-					}
-					//https://developers.mailerlite.com/reference#single-subscriber
-					if (operation === 'get') {
-						const subscriberId = this.getNodeParameter('subscriberId', i) as string;
-
-						responseData = await mailerliteApiRequest.call(
-							this,
-							'GET',
-							`/subscribers/${subscriberId}`,
-						);
-					}
-					//https://developers.mailerlite.com/reference#subscribers
-					if (operation === 'getAll') {
-						const returnAll = this.getNodeParameter('returnAll', i);
-
-						const filters = this.getNodeParameter('filters', i);
-
-						Object.assign(qs, filters);
-
-						if (returnAll) {
-							responseData = await mailerliteApiRequestAllItems.call(
-								this,
-								'GET',
-								'/subscribers',
-								{},
-								qs,
-							);
-						} else {
-							qs.limit = this.getNodeParameter('limit', i);
-
-							responseData = await mailerliteApiRequest.call(this, 'GET', '/subscribers', {}, qs);
-						}
-					}
-					//https://developers.mailerlite.com/reference#update-subscriber
-					if (operation === 'update') {
-						const subscriberId = this.getNodeParameter('subscriberId', i) as string;
-
-						const updateFields = this.getNodeParameter('updateFields', i);
-
-						const body: IDataObject = {};
-
-						Object.assign(body, updateFields);
-
-						if (updateFields.customFieldsUi) {
-							const customFieldsValues = (updateFields.customFieldsUi as IDataObject)
-								.customFieldsValues as IDataObject[];
-
-							if (customFieldsValues) {
-								const fields = {};
-
-								for (const customFieldValue of customFieldsValues) {
-									//@ts-ignore
-									fields[customFieldValue.fieldId] = customFieldValue.value;
-								}
-
-								body.fields = fields;
-								delete body.customFieldsUi;
-							}
-						}
-
-						responseData = await mailerliteApiRequest.call(
-							this,
-							'PUT',
-							`/subscribers/${subscriberId}`,
-							body,
-						);
-					}
-				}
-			} catch (error) {
-				if (this.continueOnFail()) {
-					const executionErrorData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray({ error: error.message }),
-						{ itemData: { item: i } },
-					);
-					returnData.push(...executionErrorData);
-					continue;
-				}
-				throw error;
-			}
-
-			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData as IDataObject[]),
-				{ itemData: { item: i } },
-			);
-
-			returnData.push(...executionData);
-		}
-
-		return [returnData];
+import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
+import { VersionedNodeType } from 'n8n-workflow';
+
+import { MailerLiteV1 } from './v1/MailerLiteV1.node';
+import { MailerLiteV2 } from './v2/MailerLiteV2.node';
+
+export class MailerLite extends VersionedNodeType {
+	constructor() {
+		const baseDescription: INodeTypeBaseDescription = {
+			displayName: 'MailerLite',
+			name: 'mailerLite',
+			icon: 'file:MailerLite.svg',
+			group: ['input'],
+			subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+			description: 'Consume MailerLite API',
+			defaultVersion: 2,
+		};
+
+		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
+			1: new MailerLiteV1(baseDescription),
+			2: new MailerLiteV2(baseDescription),
+		};
+
+		super(nodeVersions, baseDescription);
 	}
 }
diff --git a/packages/nodes-base/nodes/MailerLite/MailerLite.svg b/packages/nodes-base/nodes/MailerLite/MailerLite.svg
new file mode 100644
index 0000000000000..c19029d033b35
--- /dev/null
+++ b/packages/nodes-base/nodes/MailerLite/MailerLite.svg
@@ -0,0 +1,33 @@
+<svg version="1.1" id="Layer_1" xmlns:x="ns_extend;" xmlns:i="ns_ai;" xmlns:graph="ns_graphs;" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 62.8 50.2" style="enable-background:new 0 0 62.8 50.2;" xml:space="preserve">
+ <style type="text/css">
+  .st0{fill:#09C269;}
+	.st1{fill:#FFFFFF;}
+ </style>
+ <metadata>
+  <sfw xmlns="ns_sfw;">
+   <slices>
+   </slices>
+   <sliceSourceBounds bottomLeftOrigin="true" height="50.2" width="62.8" x="236.9" y="-225.3">
+   </sliceSourceBounds>
+  </sfw>
+ </metadata>
+ <g id="mailerlite-light">
+  <g>
+   <g id="lite" transform="translate(137.000000, 0.000000)">
+    <path id="Shape-path" class="st0" d="M-81.2,0h-48.9c-3.8,0-6.9,3.1-6.9,6.8v22.8v4.5v16.2l9.5-9.3h46.4c3.8,0,6.9-3.1,6.9-6.8
+				V6.8C-74.3,3.1-77.4,0-81.2,0z">
+    </path>
+    <path id="Shape-path-3" class="st1" d="M-90.2,15.8c5.2,0,7.6,4.1,7.6,8c0,1-0.8,1.8-1.8,1.8H-94c0.5,2.3,2.1,3.6,4.7,3.6
+				c1.9,0,2.9-0.4,3.9-0.9c0.2-0.1,0.5-0.2,0.7-0.2c0.9,0,1.7,0.7,1.7,1.6c0,0.6-0.4,1.1-1,1.5c-1.3,0.7-2.7,1.4-5.5,1.4
+				c-5.2,0-8.3-3.1-8.3-8.4C-97.9,18.1-93.7,15.8-90.2,15.8z M-105.5,13.2c0.6,0,1,0.5,1,1v1.9h2.9c0.9,0,1.7,0.7,1.7,1.6
+				c0,0.9-0.7,1.6-1.7,1.6h-2.9V28c0,1.2,0.6,1.3,1.5,1.3c0.5,0,0.8-0.1,1.1-0.1c0.2,0,0.5-0.1,0.7-0.1c0.7,0,1.6,0.6,1.6,1.5
+				c0,0.6-0.4,1.1-1,1.4c-0.9,0.4-1.7,0.6-2.7,0.6c-3.2,0-4.9-1.5-4.9-4.4v-8.8h-1.7c-0.6,0-1-0.5-1-1c0-0.3,0.1-0.6,0.4-0.9l4-4
+				C-106.3,13.5-106,13.2-105.5,13.2z M-124.2,9.4c1,0,1.8,0.8,1.8,1.8v19.4c0,1-0.8,1.8-1.8,1.8s-1.8-0.8-1.8-1.8V11.2
+				C-126,10.2-125.2,9.4-124.2,9.4z M-115.6,16c1,0,1.8,0.8,1.8,1.8v12.8c0,1-0.8,1.8-1.8,1.8c-1,0-1.8-0.8-1.8-1.8V17.8
+				C-117.4,16.8-116.6,16-115.6,16z M-90.1,19.1c-1.7,0-3.6,1-3.9,3.5h7.9C-86.6,20.1-88.4,19.1-90.1,19.1z M-115.5,9.9
+				c1.1,0,2,0.9,2,2V12c0,1.1-0.9,2-2,2h-0.2c-1.1,0-2-0.9-2-2v-0.1c0-1.1,0.9-2,2-2H-115.5z">
+    </path>
+   </g>
+  </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.ts b/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.ts
index 697720aa72059..3fcb1d34ac995 100644
--- a/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.ts
+++ b/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.ts
@@ -1,180 +1,25 @@
-import type {
-	IHookFunctions,
-	IWebhookFunctions,
-	IDataObject,
-	INodeType,
-	INodeTypeDescription,
-	IWebhookResponseData,
-} from 'n8n-workflow';
-import { NodeConnectionType } from 'n8n-workflow';
-
-import { mailerliteApiRequest } from './GenericFunctions';
-
-export class MailerLiteTrigger implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'MailerLite Trigger',
-		name: 'mailerLiteTrigger',
-		// eslint-disable-next-line n8n-nodes-base/node-class-description-icon-not-svg
-		icon: 'file:mailerLite.png',
-		group: ['trigger'],
-		version: 1,
-		description: 'Starts the workflow when MailerLite events occur',
-		defaults: {
-			name: 'MailerLite Trigger',
-		},
-		inputs: [],
-		outputs: [NodeConnectionType.Main],
-		credentials: [
-			{
-				name: 'mailerLiteApi',
-				required: true,
-			},
-		],
-		webhooks: [
-			{
-				name: 'default',
-				httpMethod: 'POST',
-				responseMode: 'onReceived',
-				path: 'webhook',
-			},
-		],
-		properties: [
-			{
-				displayName: 'Event',
-				name: 'event',
-				type: 'options',
-				options: [
-					{
-						name: 'Campaign Sent',
-						value: 'campaign.sent',
-						description: 'Fired when campaign is sent',
-					},
-					{
-						name: 'Subscriber Added Throught Webform',
-						value: 'subscriber.added_through_webform',
-						description: 'Fired when a subscriber is added though a form',
-					},
-					{
-						name: 'Subscriber Added to Group',
-						value: 'subscriber.add_to_group',
-						description: 'Fired when a subscriber is added to a group',
-					},
-					{
-						name: 'Subscriber Autonomation Completed',
-						value: 'subscriber.automation_complete',
-						description: 'Fired when subscriber finishes automation',
-					},
-					{
-						name: 'Subscriber Autonomation Triggered',
-						value: 'subscriber.automation_triggered',
-						description: 'Fired when subscriber starts automation',
-					},
-					{
-						name: 'Subscriber Bounced',
-						value: 'subscriber.bounced',
-						description: 'Fired when an email address bounces',
-					},
-					{
-						name: 'Subscriber Complained',
-						value: 'subscriber.complaint',
-						description: 'Fired when subscriber marks a campaign as a spam',
-					},
-					{
-						name: 'Subscriber Created',
-						value: 'subscriber.create',
-						description: 'Fired when a new subscriber is added to an account',
-					},
-					{
-						name: 'Subscriber Removed From Group',
-						value: 'subscriber.remove_from_group',
-						description: 'Fired when a subscriber is removed from a group',
-					},
-					{
-						name: 'Subscriber Unsubscribe',
-						value: 'subscriber.unsubscribe',
-						description: 'Fired when a subscriber becomes unsubscribed',
-					},
-					{
-						name: 'Subscriber Updated',
-						value: 'subscriber.update',
-						description: "Fired when any of the subscriber's custom fields are updated",
-					},
-				],
-				required: true,
-				default: [],
-				description: 'The events to listen to',
-			},
-		],
-	};
-
-	webhookMethods = {
-		default: {
-			async checkExists(this: IHookFunctions): Promise<boolean> {
-				const webhookUrl = this.getNodeWebhookUrl('default');
-				const webhookData = this.getWorkflowStaticData('node');
-				const event = this.getNodeParameter('event') as string;
-				// Check all the webhooks which exist already if it is identical to the
-				// one that is supposed to get created.
-				const endpoint = '/webhooks';
-				const { webhooks } = await mailerliteApiRequest.call(this, 'GET', endpoint, {});
-				for (const webhook of webhooks) {
-					if (webhook.url === webhookUrl && webhook.event === event) {
-						// Set webhook-id to be sure that it can be deleted
-						webhookData.webhookId = webhook.id as string;
-						return true;
-					}
-				}
-				return false;
-			},
-			async create(this: IHookFunctions): Promise<boolean> {
-				const webhookData = this.getWorkflowStaticData('node');
-				const webhookUrl = this.getNodeWebhookUrl('default');
-				const event = this.getNodeParameter('event') as string;
-
-				const endpoint = '/webhooks';
-
-				const body = {
-					url: webhookUrl,
-					event,
-				};
-
-				const responseData = await mailerliteApiRequest.call(this, 'POST', endpoint, body);
-
-				if (responseData.id === undefined) {
-					// Required data is missing so was not successful
-					return false;
-				}
-
-				webhookData.webhookId = responseData.id as string;
-				return true;
-			},
-			async delete(this: IHookFunctions): Promise<boolean> {
-				const webhookData = this.getWorkflowStaticData('node');
-				if (webhookData.webhookId !== undefined) {
-					const endpoint = `/webhooks/${webhookData.webhookId}`;
-
-					try {
-						await mailerliteApiRequest.call(this, 'DELETE', endpoint);
-					} catch (error) {
-						return false;
-					}
-
-					// Remove from the static workflow data so that it is clear
-					// that no webhooks are registered anymore
-					delete webhookData.webhookId;
-				}
-				return true;
-			},
-		},
-	};
-
-	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
-		const body = this.getBodyData();
-
-		const events = body.events as IDataObject[];
+import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
+import { VersionedNodeType } from 'n8n-workflow';
+
+import { MailerLiteTriggerV1 } from './v1/MailerLiteTriggerV1.node';
+import { MailerLiteTriggerV2 } from './v2/MailerLiteTriggerV2.node';
+
+export class MailerLiteTrigger extends VersionedNodeType {
+	constructor() {
+		const baseDescription: INodeTypeBaseDescription = {
+			displayName: 'MailerLite Trigger',
+			name: 'mailerLiteTrigger',
+			icon: 'file:MailerLite.svg',
+			group: ['trigger'],
+			description: 'Starts the workflow when MailerLite events occur',
+			defaultVersion: 2,
+		};
 
-		return {
-			workflowData: [this.helpers.returnJsonArray(events)],
+		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
+			1: new MailerLiteTriggerV1(baseDescription),
+			2: new MailerLiteTriggerV2(baseDescription),
 		};
+
+		super(nodeVersions, baseDescription);
 	}
 }
diff --git a/packages/nodes-base/nodes/MailerLite/mailerLite.png b/packages/nodes-base/nodes/MailerLite/mailerLite.png
deleted file mode 100644
index fde7f6d6b6018..0000000000000
Binary files a/packages/nodes-base/nodes/MailerLite/mailerLite.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/MailerLite/tests/GenericFunctions.test.ts b/packages/nodes-base/nodes/MailerLite/tests/GenericFunctions.test.ts
new file mode 100644
index 0000000000000..f23963b0841db
--- /dev/null
+++ b/packages/nodes-base/nodes/MailerLite/tests/GenericFunctions.test.ts
@@ -0,0 +1,253 @@
+/* eslint-disable n8n-nodes-base/node-param-display-name-miscased */
+import {
+	type IExecuteFunctions,
+	type ILoadOptionsFunctions,
+	type IHookFunctions,
+	NodeApiError,
+} from 'n8n-workflow';
+
+import {
+	getCustomFields,
+	mailerliteApiRequest,
+	mailerliteApiRequestAllItems,
+} from '../GenericFunctions';
+
+describe('MailerLite -> mailerliteApiRequest', () => {
+	let mockExecuteFunctions: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions;
+
+	const setupMockFunctions = (typeVersion: number) => {
+		mockExecuteFunctions = {
+			getNode: jest.fn().mockReturnValue({ typeVersion }),
+			helpers: {
+				httpRequestWithAuthentication: jest.fn(),
+			},
+		} as unknown as IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions;
+		jest.clearAllMocks();
+	};
+
+	beforeEach(() => {
+		setupMockFunctions(1);
+	});
+
+	it('should make a successful API request for type version 1', async () => {
+		const method = 'GET';
+		const path = '/test';
+		const body = {};
+		const qs = {};
+
+		const responseData = { success: true };
+
+		(mockExecuteFunctions.helpers.httpRequestWithAuthentication as jest.Mock).mockResolvedValue(
+			responseData,
+		);
+
+		const result = await mailerliteApiRequest.call(mockExecuteFunctions, method, path, body, qs);
+
+		expect(result).toEqual(responseData);
+		expect(mockExecuteFunctions.helpers.httpRequestWithAuthentication).toHaveBeenCalledWith(
+			'mailerLiteApi',
+			{
+				method,
+				qs,
+				url: 'https://api.mailerlite.com/api/v2/test',
+				json: true,
+			},
+		);
+	});
+
+	it('should make a successful API request for type version 2', async () => {
+		setupMockFunctions(2);
+
+		const method = 'GET';
+		const path = '/test';
+		const body = {};
+		const qs = {};
+
+		const responseData = { success: true };
+
+		(mockExecuteFunctions.helpers.httpRequestWithAuthentication as jest.Mock).mockResolvedValue(
+			responseData,
+		);
+
+		const result = await mailerliteApiRequest.call(mockExecuteFunctions, method, path, body, qs);
+
+		expect(result).toEqual(responseData);
+		expect(mockExecuteFunctions.helpers.httpRequestWithAuthentication).toHaveBeenCalledWith(
+			'mailerLiteApi',
+			{
+				method,
+				qs,
+				url: 'https://connect.mailerlite.com/api/test',
+				json: true,
+			},
+		);
+	});
+
+	it('should make an API request with an empty body', async () => {
+		const method = 'GET';
+		const path = '/test';
+		const body = {};
+		const qs = {};
+
+		const responseData = { success: true };
+
+		(mockExecuteFunctions.helpers.httpRequestWithAuthentication as jest.Mock).mockResolvedValue(
+			responseData,
+		);
+
+		const result = await mailerliteApiRequest.call(mockExecuteFunctions, method, path, body, qs);
+
+		expect(result).toEqual(responseData);
+		expect(mockExecuteFunctions.helpers.httpRequestWithAuthentication).toHaveBeenCalledWith(
+			'mailerLiteApi',
+			{
+				method,
+				qs,
+				url: 'https://api.mailerlite.com/api/v2/test',
+				json: true,
+			},
+		);
+	});
+
+	it('should throw an error if the API request fails', async () => {
+		const method = 'GET';
+		const path = '/test';
+		const body = {};
+		const qs = {};
+
+		const errorResponse = { message: 'Error' };
+
+		(mockExecuteFunctions.helpers.httpRequestWithAuthentication as jest.Mock).mockRejectedValue(
+			errorResponse,
+		);
+
+		await expect(
+			mailerliteApiRequest.call(mockExecuteFunctions, method, path, body, qs),
+		).rejects.toThrow(NodeApiError);
+	});
+});
+
+describe('MailerLite -> mailerliteApiRequestAllItems', () => {
+	let mockExecuteFunctions: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions;
+
+	const setupMockFunctions = (typeVersion: number) => {
+		mockExecuteFunctions = {
+			getNode: jest.fn().mockReturnValue({ typeVersion }),
+			helpers: {
+				httpRequestWithAuthentication: jest.fn(),
+			},
+		} as unknown as IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions;
+		jest.clearAllMocks();
+	};
+
+	beforeEach(() => {
+		setupMockFunctions(1);
+	});
+
+	it('should handle pagination for type version 1', async () => {
+		const method = 'GET';
+		const endpoint = '/test';
+		const body = {};
+		const query = {};
+
+		const responseDataPage1 = [{ id: 1 }, { id: 2 }];
+		const responseDataPage2 = [{ id: 3 }, { id: 4 }];
+
+		(mockExecuteFunctions.helpers.httpRequestWithAuthentication as jest.Mock)
+			.mockResolvedValueOnce(responseDataPage1)
+			.mockResolvedValueOnce(responseDataPage2)
+			.mockResolvedValueOnce([]);
+
+		const result = await mailerliteApiRequestAllItems.call(
+			mockExecuteFunctions,
+			method,
+			endpoint,
+			body,
+			query,
+		);
+
+		expect(result).toEqual([...responseDataPage1, ...responseDataPage2]);
+	});
+
+	it('should handle pagination for type version 2', async () => {
+		setupMockFunctions(2);
+
+		const method = 'GET';
+		const endpoint = '/test';
+		const body = {};
+		const query = {};
+
+		const responseDataPage1 = {
+			data: [{ id: 1 }, { id: 2 }],
+			meta: { next_cursor: 'cursor1' },
+			links: { next: 'nextLink1' },
+		};
+		const responseDataPage2 = {
+			data: [{ id: 3 }, { id: 4 }],
+			meta: { next_cursor: null },
+			links: { next: null },
+		};
+
+		(mockExecuteFunctions.helpers.httpRequestWithAuthentication as jest.Mock)
+			.mockResolvedValueOnce(responseDataPage1)
+			.mockResolvedValueOnce(responseDataPage2);
+
+		const result = await mailerliteApiRequestAllItems.call(
+			mockExecuteFunctions,
+			method,
+			endpoint,
+			body,
+			query,
+		);
+
+		expect(result).toEqual([...responseDataPage1.data, ...responseDataPage2.data]);
+	});
+});
+
+describe('MailerLite -> getCustomFields', () => {
+	let mockExecuteFunctions: ILoadOptionsFunctions;
+
+	const v1FieldResponse = [
+		{ name: 'Field1', key: 'field1' },
+		{ name: 'Field2', key: 'field2' },
+	];
+
+	const v2FieldResponse = {
+		data: v1FieldResponse,
+	};
+
+	const setupMockFunctions = (typeVersion: number) => {
+		mockExecuteFunctions = {
+			getNode: jest.fn().mockReturnValue({ typeVersion }),
+			helpers: {
+				httpRequestWithAuthentication: jest
+					.fn()
+					.mockResolvedValue(typeVersion === 1 ? v1FieldResponse : v2FieldResponse),
+			},
+		} as unknown as ILoadOptionsFunctions;
+		jest.clearAllMocks();
+	};
+
+	beforeEach(() => {
+		setupMockFunctions(1);
+	});
+
+	it('should return custom fields for type version 1', async () => {
+		const result = await getCustomFields.call(mockExecuteFunctions);
+
+		expect(result).toEqual([
+			{ name: 'field1', value: 'field1' },
+			{ name: 'field2', value: 'field2' },
+		]);
+	});
+
+	it('should return custom fields for type version 2', async () => {
+		setupMockFunctions(2);
+		const result = await getCustomFields.call(mockExecuteFunctions);
+
+		expect(result).toEqual([
+			{ name: 'Field1', value: 'field1' },
+			{ name: 'Field2', value: 'field2' },
+		]);
+	});
+});
diff --git a/packages/nodes-base/nodes/MailerLite/tests/apiResponses.ts b/packages/nodes-base/nodes/MailerLite/tests/apiResponses.ts
new file mode 100644
index 0000000000000..e1216e1ef562c
--- /dev/null
+++ b/packages/nodes-base/nodes/MailerLite/tests/apiResponses.ts
@@ -0,0 +1,411 @@
+export const getUpdateSubscriberResponseClassic = {
+	id: 1343965485,
+	email: 'demo@mailerlite.com',
+	sent: 0,
+	opened: 0,
+	clicked: 0,
+	type: 'unsubscribed',
+	fields: [
+		{
+			key: 'email',
+			value: 'demo@mailerlite.com',
+			type: 'TEXT',
+		},
+		{
+			key: 'name',
+			value: 'Demo',
+			type: 'TEXT',
+		},
+		{
+			key: 'last_name',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'company',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'country',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'city',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'phone',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'state',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'zip',
+			value: '',
+			type: 'TEXT',
+		},
+	],
+	date_subscribe: null,
+	date_unsubscribe: '2016-04-04 12:07:26',
+	date_created: '2016-04-04',
+	date_updated: null,
+};
+export const getSubscriberResponseClassic = {
+	id: 1343965485,
+	name: 'John',
+	email: 'demo@mailerlite.com',
+	sent: 0,
+	opened: 0,
+	clicked: 0,
+	type: 'active',
+	signup_ip: '127.0.0.1',
+	signup_timestamp: '2018-01-01 01:01:01',
+	confirmation_ip: '127.0.0.2',
+	confirmation_timestamp: '2018-01-01 01:01:02',
+	fields: [
+		{
+			key: 'email',
+			value: 'demo@mailerlite.com',
+			type: 'TEXT',
+		},
+		{
+			key: 'name',
+			value: 'John',
+			type: 'TEXT',
+		},
+		{
+			key: 'last_name',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'company',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'country',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'city',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'phone',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'state',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'zip',
+			value: '',
+			type: 'TEXT',
+		},
+	],
+	date_subscribe: null,
+	date_unsubscribe: null,
+	date_created: '2016-04-04',
+	date_updated: null,
+};
+export const getCreateResponseClassic = {
+	id: 1343965485,
+	name: 'John',
+	email: 'demo@mailerlite.com',
+	sent: 0,
+	opened: 0,
+	clicked: 0,
+	type: 'active',
+	fields: [
+		{
+			key: 'email',
+			value: 'demo@mailerlite.com',
+			type: 'TEXT',
+		},
+		{
+			key: 'name',
+			value: 'John',
+			type: 'TEXT',
+		},
+		{
+			key: 'last_name',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'company',
+			value: 'MailerLite',
+			type: 'TEXT',
+		},
+		{
+			key: 'country',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'city',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'phone',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'state',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'zip',
+			value: '',
+			type: 'TEXT',
+		},
+	],
+	date_subscribe: null,
+	date_unsubscribe: null,
+	date_created: '2016-04-04 12:00:00',
+	date_updated: '2016-04-04 12:00:00',
+};
+export const getAllSubscribersResponseClassic = [
+	{
+		id: 1343965485,
+		name: 'John',
+		email: 'demo@mailerlite.com',
+		sent: 0,
+		opened: 0,
+		clicked: 0,
+		type: 'active',
+		fields: [
+			{
+				key: 'email',
+				value: 'demo@mailerlite.com',
+				type: 'TEXT',
+			},
+			{
+				key: 'name',
+				value: 'John',
+				type: 'TEXT',
+			},
+			{
+				key: 'last_name',
+				value: '',
+				type: 'TEXT',
+			},
+			{
+				key: 'company',
+				value: '',
+				type: 'TEXT',
+			},
+			{
+				key: 'country',
+				value: '',
+				type: 'TEXT',
+			},
+			{
+				key: 'city',
+				value: '',
+				type: 'TEXT',
+			},
+			{
+				key: 'phone',
+				value: '',
+				type: 'TEXT',
+			},
+			{
+				key: 'state',
+				value: '',
+				type: 'TEXT',
+			},
+			{
+				key: 'zip',
+				value: '',
+				type: 'TEXT',
+			},
+		],
+		date_subscribe: null,
+		date_unsubscribe: null,
+		date_created: '2016-04-04',
+		date_updated: null,
+	},
+];
+
+export const getUpdateSubscriberResponseV2 = {
+	data: {
+		id: '139872142007207563',
+		email: 'user@n8n.io',
+		status: 'junk',
+		source: 'api',
+		sent: 0,
+		opens_count: 0,
+		clicks_count: 0,
+		open_rate: 0,
+		click_rate: 0,
+		ip_address: null,
+		subscribed_at: '2024-12-05 09:54:29',
+		unsubscribed_at: null,
+		created_at: '2024-12-05 09:54:29',
+		updated_at: '2024-12-05 10:20:32',
+		fields: {
+			name: null,
+			last_name: null,
+			company: null,
+			country: null,
+			city: null,
+			phone: null,
+			state: null,
+			z_i_p: null,
+		},
+		groups: [],
+		opted_in_at: null,
+		optin_ip: '8.8.8.8',
+	},
+};
+export const getCreateResponseV2 = {
+	data: {
+		id: '139872142007207563',
+		email: 'user@n8n.io',
+		status: 'junk',
+		source: 'api',
+		sent: 0,
+		opens_count: 0,
+		clicks_count: 0,
+		open_rate: 0,
+		click_rate: 0,
+		ip_address: null,
+		subscribed_at: '2024-12-05 09:54:29',
+		unsubscribed_at: null,
+		created_at: '2024-12-05 09:54:29',
+		updated_at: '2024-12-05 10:20:32',
+		fields: {
+			name: null,
+			last_name: null,
+			company: null,
+			country: null,
+			city: null,
+			phone: null,
+			state: null,
+			z_i_p: null,
+		},
+		groups: [],
+		opted_in_at: null,
+		optin_ip: '8.8.8.8',
+	},
+};
+export const getSubscriberResponseV2 = {
+	data: {
+		id: '139872142007207563',
+		email: 'user@n8n.io',
+		status: 'junk',
+		source: 'api',
+		sent: 0,
+		opens_count: 0,
+		clicks_count: 0,
+		open_rate: 0,
+		click_rate: 0,
+		ip_address: null,
+		subscribed_at: '2024-12-05 09:54:29',
+		unsubscribed_at: null,
+		created_at: '2024-12-05 09:54:29',
+		updated_at: '2024-12-05 10:20:32',
+		fields: {
+			name: null,
+			last_name: null,
+			company: null,
+			country: null,
+			city: null,
+			phone: null,
+			state: null,
+			z_i_p: null,
+		},
+		groups: [],
+		opted_in_at: null,
+		optin_ip: '8.8.8.8',
+	},
+};
+export const getAllSubscribersResponseV2 = {
+	data: [
+		{
+			id: '139872142007207563',
+			email: 'user@n8n.io',
+			status: 'junk',
+			source: 'api',
+			sent: 0,
+			opens_count: 0,
+			clicks_count: 0,
+			open_rate: 0,
+			click_rate: 0,
+			ip_address: null,
+			subscribed_at: '2024-12-05 09:54:29',
+			unsubscribed_at: null,
+			created_at: '2024-12-05 09:54:29',
+			updated_at: '2024-12-05 10:20:32',
+			fields: {
+				name: null,
+				last_name: null,
+				company: null,
+				country: null,
+				city: null,
+				phone: null,
+				state: null,
+				z_i_p: null,
+			},
+			opted_in_at: null,
+			optin_ip: '8.8.8.8',
+		},
+		{
+			id: '139059851540038710',
+			email: 'nathan@n8n.io',
+			status: 'junk',
+			source: 'api',
+			sent: 0,
+			opens_count: 0,
+			clicks_count: 0,
+			open_rate: 0,
+			click_rate: 0,
+			ip_address: null,
+			subscribed_at: null,
+			unsubscribed_at: null,
+			created_at: '2024-11-26 10:43:28',
+			updated_at: '2024-11-27 10:09:34',
+			fields: {
+				name: 'Nathan',
+				last_name: 'Workflow',
+				company: null,
+				country: null,
+				city: null,
+				phone: null,
+				state: null,
+				z_i_p: null,
+			},
+			opted_in_at: null,
+			optin_ip: null,
+		},
+	],
+	links: {
+		first: null,
+		last: null,
+		prev: null,
+		next: null,
+	},
+	meta: {
+		path: 'https://connect.mailerlite.com/api/subscribers',
+		per_page: 2,
+		next_cursor: null,
+		prev_cursor: null,
+	},
+};
diff --git a/packages/nodes-base/nodes/MailerLite/tests/v1/MailerLite.v1.workflow.json b/packages/nodes-base/nodes/MailerLite/tests/v1/MailerLite.v1.workflow.json
new file mode 100644
index 0000000000000..46f270f00655c
--- /dev/null
+++ b/packages/nodes-base/nodes/MailerLite/tests/v1/MailerLite.v1.workflow.json
@@ -0,0 +1,460 @@
+{
+	"name": "[TEST] MailerLite v1 Node",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "be5a39ea-04bf-49a3-969f-47d4a9496f08",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [-340, 280]
+		},
+		{
+			"parameters": {
+				"email": "demo@mailerlite.com",
+				"additionalFields": {}
+			},
+			"id": "98d30bbe-cbdd-4313-933e-804cdf322860",
+			"name": "Create Subscriber",
+			"type": "n8n-nodes-base.mailerLite",
+			"typeVersion": 1,
+			"position": [-140, 40],
+			"credentials": {
+				"mailerLiteApi": {
+					"id": "bm7VHS2C7lRgVOhb",
+					"name": "Mailer Lite account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [80, 40],
+			"id": "93aa764f-5101-4961-9b51-9fa92f746337",
+			"name": "No Operation, do nothing"
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [80, 220],
+			"id": "4dccb059-c4f6-4eae-b68a-5c5c36d0b8d4",
+			"name": "No Operation, do nothing1"
+		},
+		{
+			"parameters": {
+				"operation": "get",
+				"subscriberId": "demo@mailerlite.com"
+			},
+			"type": "n8n-nodes-base.mailerLite",
+			"typeVersion": 1,
+			"position": [-140, 220],
+			"id": "82115adf-edf4-4ce4-9109-3ade129294d1",
+			"name": "Get Subscriber",
+			"credentials": {
+				"mailerLiteApi": {
+					"id": "bm7VHS2C7lRgVOhb",
+					"name": "Mailer Lite account"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"operation": "update",
+				"subscriberId": "demo@mailerlite.com",
+				"updateFields": {
+					"type": "active"
+				}
+			},
+			"type": "n8n-nodes-base.mailerLite",
+			"typeVersion": 1,
+			"position": [-140, 420],
+			"id": "fae9c6bd-1bd1-4ee8-865d-283b7edb6004",
+			"name": "Update Subscriber",
+			"credentials": {
+				"mailerLiteApi": {
+					"id": "bm7VHS2C7lRgVOhb",
+					"name": "Mailer Lite account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [80, 420],
+			"id": "45937d69-3956-434d-b955-a67d77d43d57",
+			"name": "No Operation, do nothing2"
+		},
+		{
+			"parameters": {
+				"operation": "getAll",
+				"limit": 1,
+				"filters": {}
+			},
+			"type": "n8n-nodes-base.mailerLite",
+			"typeVersion": 1,
+			"position": [-180, 680],
+			"id": "6491d933-0929-44bd-89cf-977823dde650",
+			"name": "Get Many Subscrbers",
+			"credentials": {
+				"mailerLiteApi": {
+					"id": "bm7VHS2C7lRgVOhb",
+					"name": "Mailer Lite account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [40, 680],
+			"id": "6e35d6e1-1ce3-4410-8558-a5d573676d8a",
+			"name": "No Operation, do nothing3"
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": 1343965485,
+					"name": "John",
+					"email": "demo@mailerlite.com",
+					"sent": 0,
+					"opened": 0,
+					"clicked": 0,
+					"type": "active",
+					"fields": [
+						{
+							"key": "email",
+							"value": "demo@mailerlite.com",
+							"type": "TEXT"
+						},
+						{
+							"key": "name",
+							"value": "John",
+							"type": "TEXT"
+						},
+						{
+							"key": "last_name",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "company",
+							"value": "MailerLite",
+							"type": "TEXT"
+						},
+						{
+							"key": "country",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "city",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "phone",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "state",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "zip",
+							"value": "",
+							"type": "TEXT"
+						}
+					],
+					"date_subscribe": null,
+					"date_unsubscribe": null,
+					"date_created": "2016-04-04 12:00:00",
+					"date_updated": "2016-04-04 12:00:00"
+				}
+			}
+		],
+		"No Operation, do nothing1": [
+			{
+				"json": {
+					"id": 1343965485,
+					"name": "John",
+					"email": "demo@mailerlite.com",
+					"sent": 0,
+					"opened": 0,
+					"clicked": 0,
+					"type": "active",
+					"signup_ip": "127.0.0.1",
+					"signup_timestamp": "2018-01-01 01:01:01",
+					"confirmation_ip": "127.0.0.2",
+					"confirmation_timestamp": "2018-01-01 01:01:02",
+					"fields": [
+						{
+							"key": "email",
+							"value": "demo@mailerlite.com",
+							"type": "TEXT"
+						},
+						{
+							"key": "name",
+							"value": "John",
+							"type": "TEXT"
+						},
+						{
+							"key": "last_name",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "company",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "country",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "city",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "phone",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "state",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "zip",
+							"value": "",
+							"type": "TEXT"
+						}
+					],
+					"date_subscribe": null,
+					"date_unsubscribe": null,
+					"date_created": "2016-04-04",
+					"date_updated": null
+				}
+			}
+		],
+		"No Operation, do nothing2": [
+			{
+				"json": {
+					"id": 1343965485,
+					"email": "demo@mailerlite.com",
+					"sent": 0,
+					"opened": 0,
+					"clicked": 0,
+					"type": "unsubscribed",
+					"fields": [
+						{
+							"key": "email",
+							"value": "demo@mailerlite.com",
+							"type": "TEXT"
+						},
+						{
+							"key": "name",
+							"value": "Demo",
+							"type": "TEXT"
+						},
+						{
+							"key": "last_name",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "company",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "country",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "city",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "phone",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "state",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "zip",
+							"value": "",
+							"type": "TEXT"
+						}
+					],
+					"date_subscribe": null,
+					"date_unsubscribe": "2016-04-04 12:07:26",
+					"date_created": "2016-04-04",
+					"date_updated": null
+				}
+			}
+		],
+		"No Operation, do nothing3": [
+			{
+				"json": {
+					"id": 1343965485,
+					"name": "John",
+					"email": "demo@mailerlite.com",
+					"sent": 0,
+					"opened": 0,
+					"clicked": 0,
+					"type": "active",
+					"fields": [
+						{
+							"key": "email",
+							"value": "demo@mailerlite.com",
+							"type": "TEXT"
+						},
+						{
+							"key": "name",
+							"value": "John",
+							"type": "TEXT"
+						},
+						{
+							"key": "last_name",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "company",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "country",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "city",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "phone",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "state",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "zip",
+							"value": "",
+							"type": "TEXT"
+						}
+					],
+					"date_subscribe": null,
+					"date_unsubscribe": null,
+					"date_created": "2016-04-04",
+					"date_updated": null
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Create Subscriber",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Get Subscriber",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Update Subscriber",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Get Many Subscrbers",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Create Subscriber": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Get Subscriber": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Update Subscriber": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Get Many Subscrbers": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing3",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "826c1711-fcea-4564-809b-0258dbdd72f4",
+	"meta": {
+		"instanceId": "8c8c5237b8e37b006a7adce87f4369350c58e41f3ca9de16196d3197f69eabcd"
+	},
+	"id": "I0absgO5t7xV2f2V",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/MailerLite/tests/v1/MailerLite.v1.workflow.test.ts b/packages/nodes-base/nodes/MailerLite/tests/v1/MailerLite.v1.workflow.test.ts
new file mode 100644
index 0000000000000..1430ea8ec7e38
--- /dev/null
+++ b/packages/nodes-base/nodes/MailerLite/tests/v1/MailerLite.v1.workflow.test.ts
@@ -0,0 +1,31 @@
+import nock from 'nock';
+
+import { getWorkflowFilenames, testWorkflows } from '../../../../test/nodes/Helpers';
+import {
+	getCreateResponseClassic,
+	getSubscriberResponseClassic,
+	getAllSubscribersResponseClassic,
+	getUpdateSubscriberResponseClassic,
+} from '../apiResponses';
+
+describe('MailerLite', () => {
+	describe('Run v1 workflow', () => {
+		beforeAll(() => {
+			nock.disableNetConnect();
+
+			const mock = nock('https://api.mailerlite.com/api/v2');
+
+			mock.post('/subscribers').reply(200, getCreateResponseClassic);
+			mock.get('/subscribers/demo@mailerlite.com').reply(200, getSubscriberResponseClassic);
+			mock.get('/subscribers').query({ limit: 1 }).reply(200, getAllSubscribersResponseClassic);
+			mock.put('/subscribers/demo@mailerlite.com').reply(200, getUpdateSubscriberResponseClassic);
+		});
+
+		afterAll(() => {
+			nock.restore();
+		});
+
+		const workflows = getWorkflowFilenames(__dirname);
+		testWorkflows(workflows);
+	});
+});
diff --git a/packages/nodes-base/nodes/MailerLite/tests/v2/MailerLite.v2.workflow.json b/packages/nodes-base/nodes/MailerLite/tests/v2/MailerLite.v2.workflow.json
new file mode 100644
index 0000000000000..29630950fad16
--- /dev/null
+++ b/packages/nodes-base/nodes/MailerLite/tests/v2/MailerLite.v2.workflow.json
@@ -0,0 +1,370 @@
+{
+	"name": "[TEST] MailerLite v2 Node",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "3c72284b-2b88-4d5f-81bc-b1970b14f2af",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [800, 240]
+		},
+		{
+			"parameters": {
+				"email": "user@n8n.io",
+				"additionalFields": {
+					"status": "active"
+				}
+			},
+			"id": "702c6598-cbe8-403e-962e-56621ec727a4",
+			"name": "Create Subscriber",
+			"type": "n8n-nodes-base.mailerLite",
+			"typeVersion": 2,
+			"position": [1000, 0],
+			"credentials": {
+				"mailerLiteApi": {
+					"id": "bm7VHS2C7lRgVOhb",
+					"name": "Mailer Lite account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1220, 0],
+			"id": "540b98b5-b3bf-49a1-a406-acc6872f4b50",
+			"name": "No Operation, do nothing"
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1220, 180],
+			"id": "17c0b8e7-a9d7-4a4f-882f-c3fb3f6bc289",
+			"name": "No Operation, do nothing1"
+		},
+		{
+			"parameters": {
+				"operation": "get",
+				"subscriberId": "user@n8n.io"
+			},
+			"type": "n8n-nodes-base.mailerLite",
+			"typeVersion": 2,
+			"position": [1000, 180],
+			"id": "5598f2b9-4d67-4ad7-a8e4-7b7bf723cd5a",
+			"name": "Get Subscriber",
+			"credentials": {
+				"mailerLiteApi": {
+					"id": "bm7VHS2C7lRgVOhb",
+					"name": "Mailer Lite account"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"operation": "update",
+				"subscriberId": "user@n8n.io",
+				"additionalFields": {
+					"status": "junk",
+					"optin_ip": "8.8.8.8"
+				}
+			},
+			"type": "n8n-nodes-base.mailerLite",
+			"typeVersion": 2,
+			"position": [1000, 380],
+			"id": "223e4507-c88e-4066-a122-ccaf9cea7b49",
+			"name": "Update Subscriber",
+			"credentials": {
+				"mailerLiteApi": {
+					"id": "bm7VHS2C7lRgVOhb",
+					"name": "Mailer Lite account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1220, 380],
+			"id": "94d04b52-8809-4670-a8ca-135921139fc9",
+			"name": "No Operation, do nothing2"
+		},
+		{
+			"parameters": {
+				"operation": "getAll",
+				"limit": 2,
+				"filters": {
+					"status": "junk"
+				}
+			},
+			"type": "n8n-nodes-base.mailerLite",
+			"typeVersion": 2,
+			"position": [960, 640],
+			"id": "30c6e797-ceda-4c84-8f34-b61200ffd9e9",
+			"name": "Get Many Subscrbers",
+			"credentials": {
+				"mailerLiteApi": {
+					"id": "bm7VHS2C7lRgVOhb",
+					"name": "Mailer Lite account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1180, 640],
+			"id": "c8529a30-889b-4ac9-a509-73f5dd8eef4a",
+			"name": "No Operation, do nothing3"
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": "139872142007207563",
+					"email": "user@n8n.io",
+					"status": "junk",
+					"source": "api",
+					"sent": 0,
+					"opens_count": 0,
+					"clicks_count": 0,
+					"open_rate": 0,
+					"click_rate": 0,
+					"ip_address": null,
+					"subscribed_at": "2024-12-05 09:54:29",
+					"unsubscribed_at": null,
+					"created_at": "2024-12-05 09:54:29",
+					"updated_at": "2024-12-05 10:20:32",
+					"fields": {
+						"name": null,
+						"last_name": null,
+						"company": null,
+						"country": null,
+						"city": null,
+						"phone": null,
+						"state": null,
+						"z_i_p": null
+					},
+					"groups": [],
+					"opted_in_at": null,
+					"optin_ip": "8.8.8.8"
+				}
+			}
+		],
+		"No Operation, do nothing1": [
+			{
+				"json": {
+					"id": "139872142007207563",
+					"email": "user@n8n.io",
+					"status": "junk",
+					"source": "api",
+					"sent": 0,
+					"opens_count": 0,
+					"clicks_count": 0,
+					"open_rate": 0,
+					"click_rate": 0,
+					"ip_address": null,
+					"subscribed_at": "2024-12-05 09:54:29",
+					"unsubscribed_at": null,
+					"created_at": "2024-12-05 09:54:29",
+					"updated_at": "2024-12-05 10:20:32",
+					"fields": {
+						"name": null,
+						"last_name": null,
+						"company": null,
+						"country": null,
+						"city": null,
+						"phone": null,
+						"state": null,
+						"z_i_p": null
+					},
+					"groups": [],
+					"opted_in_at": null,
+					"optin_ip": "8.8.8.8"
+				}
+			}
+		],
+		"No Operation, do nothing2": [
+			{
+				"json": {
+					"data": {
+						"id": "139872142007207563",
+						"email": "user@n8n.io",
+						"status": "junk",
+						"source": "api",
+						"sent": 0,
+						"opens_count": 0,
+						"clicks_count": 0,
+						"open_rate": 0,
+						"click_rate": 0,
+						"ip_address": null,
+						"subscribed_at": "2024-12-05 09:54:29",
+						"unsubscribed_at": null,
+						"created_at": "2024-12-05 09:54:29",
+						"updated_at": "2024-12-05 10:20:32",
+						"fields": {
+							"name": null,
+							"last_name": null,
+							"company": null,
+							"country": null,
+							"city": null,
+							"phone": null,
+							"state": null,
+							"z_i_p": null
+						},
+						"groups": [],
+						"opted_in_at": null,
+						"optin_ip": "8.8.8.8"
+					}
+				}
+			}
+		],
+		"No Operation, do nothing3": [
+			{
+				"json": {
+					"id": "139872142007207563",
+					"email": "user@n8n.io",
+					"status": "junk",
+					"source": "api",
+					"sent": 0,
+					"opens_count": 0,
+					"clicks_count": 0,
+					"open_rate": 0,
+					"click_rate": 0,
+					"ip_address": null,
+					"subscribed_at": "2024-12-05 09:54:29",
+					"unsubscribed_at": null,
+					"created_at": "2024-12-05 09:54:29",
+					"updated_at": "2024-12-05 10:20:32",
+					"fields": {
+						"name": null,
+						"last_name": null,
+						"company": null,
+						"country": null,
+						"city": null,
+						"phone": null,
+						"state": null,
+						"z_i_p": null
+					},
+					"opted_in_at": null,
+					"optin_ip": "8.8.8.8"
+				}
+			},
+			{
+				"json": {
+					"id": "139059851540038710",
+					"email": "nathan@n8n.io",
+					"status": "junk",
+					"source": "api",
+					"sent": 0,
+					"opens_count": 0,
+					"clicks_count": 0,
+					"open_rate": 0,
+					"click_rate": 0,
+					"ip_address": null,
+					"subscribed_at": null,
+					"unsubscribed_at": null,
+					"created_at": "2024-11-26 10:43:28",
+					"updated_at": "2024-11-27 10:09:34",
+					"fields": {
+						"name": "Nathan",
+						"last_name": "Workflow",
+						"company": null,
+						"country": null,
+						"city": null,
+						"phone": null,
+						"state": null,
+						"z_i_p": null
+					},
+					"opted_in_at": null,
+					"optin_ip": null
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Create Subscriber",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Get Subscriber",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Update Subscriber",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Get Many Subscrbers",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Create Subscriber": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Get Subscriber": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Update Subscriber": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Get Many Subscrbers": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing3",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "338331ef-1b38-47dc-9e2b-45340ea3fe3b",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "8c8c5237b8e37b006a7adce87f4369350c58e41f3ca9de16196d3197f69eabcd"
+	},
+	"id": "0Ov6Vd62DUXrWWQH",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/MailerLite/tests/v2/MailerLite.v2.workflow.test.ts b/packages/nodes-base/nodes/MailerLite/tests/v2/MailerLite.v2.workflow.test.ts
new file mode 100644
index 0000000000000..d723e86908cdd
--- /dev/null
+++ b/packages/nodes-base/nodes/MailerLite/tests/v2/MailerLite.v2.workflow.test.ts
@@ -0,0 +1,34 @@
+import nock from 'nock';
+
+import { getWorkflowFilenames, testWorkflows } from '../../../../test/nodes/Helpers';
+import {
+	getCreateResponseV2,
+	getSubscriberResponseV2,
+	getAllSubscribersResponseV2,
+	getUpdateSubscriberResponseV2,
+} from '../apiResponses';
+
+describe('MailerLite', () => {
+	describe('Run v2 workflow', () => {
+		beforeAll(() => {
+			nock.disableNetConnect();
+
+			const mock = nock('https://connect.mailerlite.com/api');
+
+			mock.post('/subscribers').reply(200, getCreateResponseV2);
+			mock.get('/subscribers/user@n8n.io').reply(200, getSubscriberResponseV2);
+			mock
+				.get('/subscribers')
+				.query({ 'filter[status]': 'junk', limit: 2 })
+				.reply(200, getAllSubscribersResponseV2);
+			mock.put('/subscribers/user@n8n.io').reply(200, getUpdateSubscriberResponseV2);
+		});
+
+		afterAll(() => {
+			nock.restore();
+		});
+
+		const workflows = getWorkflowFilenames(__dirname);
+		testWorkflows(workflows);
+	});
+});
diff --git a/packages/nodes-base/nodes/MailerLite/v1/MailerLiteTriggerV1.node.ts b/packages/nodes-base/nodes/MailerLite/v1/MailerLiteTriggerV1.node.ts
new file mode 100644
index 0000000000000..faaa6db8c76fc
--- /dev/null
+++ b/packages/nodes-base/nodes/MailerLite/v1/MailerLiteTriggerV1.node.ts
@@ -0,0 +1,184 @@
+import {
+	type IHookFunctions,
+	type IWebhookFunctions,
+	type IDataObject,
+	type INodeType,
+	type INodeTypeDescription,
+	type IWebhookResponseData,
+	type INodeTypeBaseDescription,
+	NodeConnectionType,
+} from 'n8n-workflow';
+
+import { mailerliteApiRequest } from '../GenericFunctions';
+
+export class MailerLiteTriggerV1 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			displayName: 'MailerLite Trigger',
+			name: 'mailerLiteTrigger',
+			group: ['trigger'],
+			version: 1,
+			description: 'Starts the workflow when MailerLite events occur',
+			defaults: {
+				name: 'MailerLite Trigger',
+			},
+			inputs: [],
+			outputs: [NodeConnectionType.Main],
+			credentials: [
+				{
+					name: 'mailerLiteApi',
+					required: true,
+				},
+			],
+			webhooks: [
+				{
+					name: 'default',
+					httpMethod: 'POST',
+					responseMode: 'onReceived',
+					path: 'webhook',
+				},
+			],
+			properties: [
+				{
+					displayName: 'Event',
+					name: 'event',
+					type: 'options',
+					options: [
+						{
+							name: 'Campaign Sent',
+							value: 'campaign.sent',
+							description: 'Fired when campaign is sent',
+						},
+						{
+							name: 'Subscriber Added Through Webform',
+							value: 'subscriber.added_through_webform',
+							description: 'Fired when a subscriber is added though a form',
+						},
+						{
+							name: 'Subscriber Added to Group',
+							value: 'subscriber.add_to_group',
+							description: 'Fired when a subscriber is added to a group',
+						},
+						{
+							name: 'Subscriber Automation Completed',
+							value: 'subscriber.automation_complete',
+							description: 'Fired when subscriber finishes automation',
+						},
+						{
+							name: 'Subscriber Automation Triggered',
+							value: 'subscriber.automation_triggered',
+							description: 'Fired when subscriber starts automation',
+						},
+						{
+							name: 'Subscriber Bounced',
+							value: 'subscriber.bounced',
+							description: 'Fired when an email address bounces',
+						},
+						{
+							name: 'Subscriber Complained',
+							value: 'subscriber.complaint',
+							description: 'Fired when subscriber marks a campaign as a spam',
+						},
+						{
+							name: 'Subscriber Created',
+							value: 'subscriber.create',
+							description: 'Fired when a new subscriber is added to an account',
+						},
+						{
+							name: 'Subscriber Removed From Group',
+							value: 'subscriber.remove_from_group',
+							description: 'Fired when a subscriber is removed from a group',
+						},
+						{
+							name: 'Subscriber Unsubscribe',
+							value: 'subscriber.unsubscribe',
+							description: 'Fired when a subscriber becomes unsubscribed',
+						},
+						{
+							name: 'Subscriber Updated',
+							value: 'subscriber.update',
+							description: "Fired when any of the subscriber's custom fields are updated",
+						},
+					],
+					required: true,
+					default: [],
+					description: 'The events to listen to',
+				},
+			],
+		};
+	}
+
+	webhookMethods = {
+		default: {
+			async checkExists(this: IHookFunctions): Promise<boolean> {
+				const webhookUrl = this.getNodeWebhookUrl('default');
+				const webhookData = this.getWorkflowStaticData('node');
+				const event = this.getNodeParameter('event') as string;
+				// Check all the webhooks which exist already if it is identical to the
+				// one that is supposed to get created.
+				const endpoint = '/webhooks';
+				const { webhooks } = await mailerliteApiRequest.call(this, 'GET', endpoint, {});
+				for (const webhook of webhooks) {
+					if (webhook.url === webhookUrl && webhook.event === event) {
+						// Set webhook-id to be sure that it can be deleted
+						webhookData.webhookId = webhook.id as string;
+						return true;
+					}
+				}
+				return false;
+			},
+			async create(this: IHookFunctions): Promise<boolean> {
+				const webhookData = this.getWorkflowStaticData('node');
+				const webhookUrl = this.getNodeWebhookUrl('default');
+				const event = this.getNodeParameter('event') as string;
+
+				const endpoint = '/webhooks';
+
+				const body = {
+					url: webhookUrl,
+					event,
+				};
+
+				const responseData = await mailerliteApiRequest.call(this, 'POST', endpoint, body);
+
+				if (responseData.id === undefined) {
+					// Required data is missing so was not successful
+					return false;
+				}
+
+				webhookData.webhookId = responseData.id as string;
+				return true;
+			},
+			async delete(this: IHookFunctions): Promise<boolean> {
+				const webhookData = this.getWorkflowStaticData('node');
+				if (webhookData.webhookId !== undefined) {
+					const endpoint = `/webhooks/${webhookData.webhookId}`;
+
+					try {
+						await mailerliteApiRequest.call(this, 'DELETE', endpoint);
+					} catch (error) {
+						return false;
+					}
+
+					// Remove from the static workflow data so that it is clear
+					// that no webhooks are registered anymore
+					delete webhookData.webhookId;
+				}
+				return true;
+			},
+		},
+	};
+
+	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
+		const body = this.getBodyData();
+
+		const events = body.events as IDataObject[];
+
+		return {
+			workflowData: [this.helpers.returnJsonArray(events)],
+		};
+	}
+}
diff --git a/packages/nodes-base/nodes/MailerLite/v1/MailerLiteV1.node.ts b/packages/nodes-base/nodes/MailerLite/v1/MailerLiteV1.node.ts
new file mode 100644
index 0000000000000..357f8f799fea8
--- /dev/null
+++ b/packages/nodes-base/nodes/MailerLite/v1/MailerLiteV1.node.ts
@@ -0,0 +1,199 @@
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+	INodeTypeBaseDescription,
+} from 'n8n-workflow';
+import { NodeConnectionType } from 'n8n-workflow';
+
+import { subscriberFields, subscriberOperations } from './SubscriberDescription';
+import {
+	getCustomFields,
+	mailerliteApiRequest,
+	mailerliteApiRequestAllItems,
+} from '../GenericFunctions';
+
+export class MailerLiteV1 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			displayName: 'MailerLite',
+			name: 'mailerLite',
+			group: ['input'],
+			version: 1,
+			subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+			description: 'Consume Mailer Lite API',
+			defaults: {
+				name: 'MailerLite',
+			},
+			inputs: [NodeConnectionType.Main],
+			outputs: [NodeConnectionType.Main],
+			credentials: [
+				{
+					name: 'mailerLiteApi',
+					required: true,
+				},
+			],
+			properties: [
+				{
+					displayName: 'Resource',
+					name: 'resource',
+					type: 'options',
+					noDataExpression: true,
+					options: [
+						{
+							name: 'Subscriber',
+							value: 'subscriber',
+						},
+					],
+					default: 'subscriber',
+				},
+				...subscriberOperations,
+				...subscriberFields,
+			],
+		};
+	}
+
+	methods = {
+		loadOptions: {
+			getCustomFields,
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: INodeExecutionData[] = [];
+		const length = items.length;
+		const qs: IDataObject = {};
+		let responseData;
+		const resource = this.getNodeParameter('resource', 0);
+		const operation = this.getNodeParameter('operation', 0);
+		for (let i = 0; i < length; i++) {
+			try {
+				if (resource === 'subscriber') {
+					//https://developers.mailerlite.com/reference#create-a-subscriber
+					if (operation === 'create') {
+						const email = this.getNodeParameter('email', i) as string;
+
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+
+						const body: IDataObject = {
+							email,
+							fields: [],
+						};
+
+						Object.assign(body, additionalFields);
+
+						if (additionalFields.customFieldsUi) {
+							const customFieldsValues = (additionalFields.customFieldsUi as IDataObject)
+								.customFieldsValues as IDataObject[];
+
+							if (customFieldsValues) {
+								const fields = {};
+
+								for (const customFieldValue of customFieldsValues) {
+									//@ts-ignore
+									fields[customFieldValue.fieldId] = customFieldValue.value;
+								}
+
+								body.fields = fields;
+								delete body.customFieldsUi;
+							}
+						}
+
+						responseData = await mailerliteApiRequest.call(this, 'POST', '/subscribers', body);
+					}
+					//https://developers.mailerlite.com/reference#single-subscriber
+					if (operation === 'get') {
+						const subscriberId = this.getNodeParameter('subscriberId', i) as string;
+
+						responseData = await mailerliteApiRequest.call(
+							this,
+							'GET',
+							`/subscribers/${subscriberId}`,
+						);
+					}
+					//https://developers.mailerlite.com/reference#subscribers
+					if (operation === 'getAll') {
+						const returnAll = this.getNodeParameter('returnAll', i);
+
+						const filters = this.getNodeParameter('filters', i);
+
+						Object.assign(qs, filters);
+
+						if (returnAll) {
+							responseData = await mailerliteApiRequestAllItems.call(
+								this,
+								'GET',
+								'/subscribers',
+								{},
+								qs,
+							);
+						} else {
+							qs.limit = this.getNodeParameter('limit', i);
+
+							responseData = await mailerliteApiRequest.call(this, 'GET', '/subscribers', {}, qs);
+						}
+					}
+					//https://developers.mailerlite.com/reference#update-subscriber
+					if (operation === 'update') {
+						const subscriberId = this.getNodeParameter('subscriberId', i) as string;
+
+						const updateFields = this.getNodeParameter('updateFields', i);
+
+						const body: IDataObject = {};
+
+						Object.assign(body, updateFields);
+
+						if (updateFields.customFieldsUi) {
+							const customFieldsValues = (updateFields.customFieldsUi as IDataObject)
+								.customFieldsValues as IDataObject[];
+
+							if (customFieldsValues) {
+								const fields = {};
+
+								for (const customFieldValue of customFieldsValues) {
+									//@ts-ignore
+									fields[customFieldValue.fieldId] = customFieldValue.value;
+								}
+
+								body.fields = fields;
+								delete body.customFieldsUi;
+							}
+						}
+
+						responseData = await mailerliteApiRequest.call(
+							this,
+							'PUT',
+							`/subscribers/${subscriberId}`,
+							body,
+						);
+					}
+				}
+			} catch (error) {
+				if (this.continueOnFail()) {
+					const executionErrorData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray({ error: error.message }),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionErrorData);
+					continue;
+				}
+				throw error;
+			}
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray(responseData as IDataObject[]),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		}
+
+		return [returnData];
+	}
+}
diff --git a/packages/nodes-base/nodes/MailerLite/SubscriberDescription.ts b/packages/nodes-base/nodes/MailerLite/v1/SubscriberDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/MailerLite/SubscriberDescription.ts
rename to packages/nodes-base/nodes/MailerLite/v1/SubscriberDescription.ts
diff --git a/packages/nodes-base/nodes/MailerLite/v2/MailerLite.Interface.ts b/packages/nodes-base/nodes/MailerLite/v2/MailerLite.Interface.ts
new file mode 100644
index 0000000000000..f408e75ebb245
--- /dev/null
+++ b/packages/nodes-base/nodes/MailerLite/v2/MailerLite.Interface.ts
@@ -0,0 +1,35 @@
+export interface CustomField {
+	name: string;
+	key: string;
+}
+
+export interface SubscriberFields {
+	city: string | null;
+	company: string | null;
+	country: string | null;
+	last_name: string | null;
+	name: string | null;
+	phone: string | null;
+	state: string | null;
+	z_i_p: string | null;
+}
+
+export interface Subscriber {
+	id: string;
+	email: string;
+	status: string;
+	source: string;
+	sent: number;
+	opens_count: number;
+	clicks_count: number;
+	open_rate: number;
+	click_rate: number;
+	ip_address: string | null;
+	subscribed_at: string;
+	unsubscribed_at: string | null;
+	created_at: string;
+	updated_at: string;
+	fields: SubscriberFields;
+	opted_in_at: string | null;
+	optin_ip: string | null;
+}
diff --git a/packages/nodes-base/nodes/MailerLite/v2/MailerLiteTriggerV2.node.ts b/packages/nodes-base/nodes/MailerLite/v2/MailerLiteTriggerV2.node.ts
new file mode 100644
index 0000000000000..f7b17316dc4cc
--- /dev/null
+++ b/packages/nodes-base/nodes/MailerLite/v2/MailerLiteTriggerV2.node.ts
@@ -0,0 +1,179 @@
+import {
+	type IHookFunctions,
+	type IWebhookFunctions,
+	type IDataObject,
+	type INodeType,
+	type INodeTypeDescription,
+	type IWebhookResponseData,
+	type INodeTypeBaseDescription,
+	NodeConnectionType,
+} from 'n8n-workflow';
+
+import { mailerliteApiRequest } from '../GenericFunctions';
+
+export class MailerLiteTriggerV2 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			displayName: 'MailerLite Trigger',
+			name: 'mailerLiteTrigger',
+			group: ['trigger'],
+			version: [2],
+			description: 'Starts the workflow when MailerLite events occur',
+			defaults: {
+				name: 'MailerLite Trigger',
+			},
+			inputs: [],
+			outputs: [NodeConnectionType.Main],
+			credentials: [
+				{
+					name: 'mailerLiteApi',
+					required: true,
+				},
+			],
+			webhooks: [
+				{
+					name: 'default',
+					httpMethod: 'POST',
+					responseMode: 'onReceived',
+					path: 'webhook',
+				},
+			],
+			properties: [
+				{
+					displayName: 'Events',
+					name: 'events',
+					type: 'multiOptions',
+					options: [
+						{
+							name: 'Campaign Sent',
+							value: 'campaign.sent',
+							description: 'Fired when campaign is sent',
+						},
+						{
+							name: 'Subscriber Added to Group',
+							value: 'subscriber.added_to_group',
+							description: 'Fired when a subscriber is added to a group',
+						},
+						{
+							name: 'Subscriber Automation Completed',
+							value: 'subscriber.automation_completed',
+							description: 'Fired when subscriber finishes automation',
+						},
+						{
+							name: 'Subscriber Automation Triggered',
+							value: 'subscriber.automation_triggered',
+							description: 'Fired when subscriber starts automation',
+						},
+						{
+							name: 'Subscriber Bounced',
+							value: 'subscriber.bounced',
+							description: 'Fired when an email address bounces',
+						},
+						{
+							name: 'Subscriber Created',
+							value: 'subscriber.created',
+							description: 'Fired when a new subscriber is added to an account',
+						},
+						{
+							name: 'Subscriber Removed From Group',
+							value: 'subscriber.removed_from_group',
+							description: 'Fired when a subscriber is removed from a group',
+						},
+						{
+							name: 'Subscriber Spam Reported',
+							value: 'subscriber.spam_reported',
+							description: 'Fired when subscriber marks a campaign as a spam',
+						},
+						{
+							name: 'Subscriber Unsubscribe',
+							value: 'subscriber.unsubscribed',
+							description: 'Fired when a subscriber becomes unsubscribed',
+						},
+						{
+							name: 'Subscriber Updated',
+							value: 'subscriber.updated',
+							description: "Fired when any of the subscriber's custom fields are updated",
+						},
+					],
+					required: true,
+					default: [],
+					description: 'The events to listen to',
+				},
+			],
+		};
+	}
+
+	webhookMethods = {
+		default: {
+			async checkExists(this: IHookFunctions): Promise<boolean> {
+				const webhookUrl = this.getNodeWebhookUrl('default');
+				const webhookData = this.getWorkflowStaticData('node');
+				const events = this.getNodeParameter('events') as string[];
+				// Check all the webhooks which exist already if it is identical to the
+				// one that is supposed to get created.
+				const endpoint = '/webhooks';
+				const { data } = await mailerliteApiRequest.call(this, 'GET', endpoint, {});
+				for (const webhook of data) {
+					if (webhook.url === webhookUrl && webhook.events === events) {
+						// Set webhook-id to be sure that it can be deleted
+						webhookData.webhookId = webhook.id as string;
+						return true;
+					}
+				}
+				return false;
+			},
+			async create(this: IHookFunctions): Promise<boolean> {
+				const webhookData = this.getWorkflowStaticData('node');
+				const webhookUrl = this.getNodeWebhookUrl('default');
+				const events = this.getNodeParameter('events') as string[];
+
+				const endpoint = '/webhooks';
+
+				const body = {
+					url: webhookUrl,
+					events,
+				};
+
+				const { data } = await mailerliteApiRequest.call(this, 'POST', endpoint, body);
+
+				if (data.id === undefined) {
+					// Required data is missing so was not successful
+					return false;
+				}
+
+				webhookData.webhookId = data.id as string;
+				return true;
+			},
+			async delete(this: IHookFunctions): Promise<boolean> {
+				const webhookData = this.getWorkflowStaticData('node');
+				if (webhookData.webhookId !== undefined) {
+					const endpoint = `/webhooks/${webhookData.webhookId}`;
+
+					try {
+						await mailerliteApiRequest.call(this, 'DELETE', endpoint);
+					} catch (error) {
+						return false;
+					}
+
+					// Remove from the static workflow data so that it is clear
+					// that no webhooks are registered anymore
+					delete webhookData.webhookId;
+				}
+				return true;
+			},
+		},
+	};
+
+	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
+		const body = this.getBodyData();
+
+		const data = body.fields as IDataObject[];
+
+		return {
+			workflowData: [this.helpers.returnJsonArray(data)],
+		};
+	}
+}
diff --git a/packages/nodes-base/nodes/MailerLite/v2/MailerLiteV2.node.ts b/packages/nodes-base/nodes/MailerLite/v2/MailerLiteV2.node.ts
new file mode 100644
index 0000000000000..953dc7232eed7
--- /dev/null
+++ b/packages/nodes-base/nodes/MailerLite/v2/MailerLiteV2.node.ts
@@ -0,0 +1,206 @@
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+	INodeTypeBaseDescription,
+} from 'n8n-workflow';
+import { NodeConnectionType } from 'n8n-workflow';
+
+import type { Subscriber } from './MailerLite.Interface';
+import { subscriberFields, subscriberOperations } from './SubscriberDescription';
+import {
+	getCustomFields,
+	mailerliteApiRequest,
+	mailerliteApiRequestAllItems,
+} from '../GenericFunctions';
+
+export class MailerLiteV2 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			displayName: 'MailerLite',
+			name: 'mailerLite',
+			group: ['input'],
+			version: [2],
+			subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+			description: 'Consume Mailer Lite API',
+			defaults: {
+				name: 'MailerLite',
+			},
+			inputs: [NodeConnectionType.Main],
+			outputs: [NodeConnectionType.Main],
+			credentials: [
+				{
+					name: 'mailerLiteApi',
+					required: true,
+				},
+			],
+			properties: [
+				{
+					displayName: 'Resource',
+					name: 'resource',
+					type: 'options',
+					noDataExpression: true,
+					options: [
+						{
+							name: 'Subscriber',
+							value: 'subscriber',
+						},
+					],
+					default: 'subscriber',
+				},
+				...subscriberOperations,
+				...subscriberFields,
+			],
+		};
+	}
+
+	methods = {
+		loadOptions: {
+			getCustomFields,
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: INodeExecutionData[] = [];
+		const length = items.length;
+		const qs: IDataObject = {};
+		let responseData;
+		const resource = this.getNodeParameter('resource', 0);
+		const operation = this.getNodeParameter('operation', 0);
+		for (let i = 0; i < length; i++) {
+			try {
+				if (resource === 'subscriber') {
+					//https://developers.mailerlite.com/reference#create-a-subscriber
+					if (operation === 'create') {
+						const email = this.getNodeParameter('email', i) as string;
+
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+
+						const body: IDataObject = {
+							email,
+							fields: [],
+						};
+
+						Object.assign(body, additionalFields);
+
+						if (additionalFields.customFieldsUi) {
+							const customFieldsValues = (additionalFields.customFieldsUi as IDataObject)
+								.customFieldsValues as IDataObject[];
+
+							if (customFieldsValues) {
+								const fields = {};
+
+								for (const customFieldValue of customFieldsValues) {
+									//@ts-ignore
+									fields[customFieldValue.fieldId] = customFieldValue.value;
+								}
+
+								body.fields = fields;
+								delete body.customFieldsUi;
+							}
+						}
+
+						responseData = await mailerliteApiRequest.call(this, 'POST', '/subscribers', body);
+						responseData = responseData.data;
+					}
+					//https://developers.mailerlite.com/reference#single-subscriber
+					if (operation === 'get') {
+						const subscriberId = this.getNodeParameter('subscriberId', i) as string;
+
+						responseData = await mailerliteApiRequest.call(
+							this,
+							'GET',
+							`/subscribers/${subscriberId}`,
+						);
+
+						responseData = responseData.data as Subscriber[];
+					}
+					//https://developers.mailerlite.com/reference#subscribers
+					if (operation === 'getAll') {
+						const returnAll = this.getNodeParameter('returnAll', i);
+
+						const filters = this.getNodeParameter('filters', i);
+
+						if (filters.status) {
+							qs['filter[status]'] = filters.status as string;
+						}
+
+						if (returnAll) {
+							responseData = await mailerliteApiRequestAllItems.call(
+								this,
+								'GET',
+								'/subscribers',
+								{},
+								qs,
+							);
+						} else {
+							qs.limit = this.getNodeParameter('limit', i);
+
+							responseData = await mailerliteApiRequest.call(this, 'GET', '/subscribers', {}, qs);
+							responseData = responseData.data;
+						}
+					}
+					//https://developers.mailerlite.com/reference#update-subscriber
+					if (operation === 'update') {
+						const subscriberId = this.getNodeParameter('subscriberId', i) as string;
+
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+
+						const body: IDataObject = {};
+
+						Object.assign(body, additionalFields);
+
+						if (additionalFields.customFieldsUi) {
+							const customFieldsValues = (additionalFields.customFieldsUi as IDataObject)
+								.customFieldsValues as IDataObject[];
+
+							if (customFieldsValues) {
+								const fields = {};
+
+								for (const customFieldValue of customFieldsValues) {
+									//@ts-ignore
+									fields[customFieldValue.fieldId] = customFieldValue.value;
+								}
+
+								body.fields = fields;
+								delete body.customFieldsUi;
+							}
+						}
+
+						responseData = await mailerliteApiRequest.call(
+							this,
+							'PUT',
+							`/subscribers/${subscriberId}`,
+							body,
+						);
+					}
+				}
+			} catch (error) {
+				if (this.continueOnFail()) {
+					const executionErrorData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray({ error: error.message }),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionErrorData);
+					continue;
+				}
+				throw error;
+			}
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray(responseData as IDataObject[]),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		}
+
+		return [returnData];
+	}
+}
diff --git a/packages/nodes-base/nodes/MailerLite/v2/SubscriberDescription.ts b/packages/nodes-base/nodes/MailerLite/v2/SubscriberDescription.ts
new file mode 100644
index 0000000000000..10ddfe22f5b49
--- /dev/null
+++ b/packages/nodes-base/nodes/MailerLite/v2/SubscriberDescription.ts
@@ -0,0 +1,304 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const subscriberOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['subscriber'],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a new subscriber',
+				action: 'Create a subscriber',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get an subscriber',
+				action: 'Get a subscriber',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Get many subscribers',
+				action: 'Get many subscribers',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update an subscriber',
+				action: 'Update a subscriber',
+			},
+		],
+		default: 'create',
+	},
+];
+
+export const subscriberFields: INodeProperties[] = [
+	/* -------------------------------------------------------------------------- */
+	/*                                subscriber:create                           */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Email',
+		name: 'email',
+		type: 'string',
+		placeholder: 'name@email.com',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['subscriber'],
+				operation: ['create'],
+			},
+		},
+		description: 'Email of new subscriber',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                subscriber:update                           */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Subscriber Email',
+		name: 'subscriberId',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['subscriber'],
+				operation: ['update'],
+			},
+		},
+		default: '',
+		description: 'Email of subscriber',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['subscriber'],
+				operation: ['update', 'create'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Custom Fields',
+				name: 'customFieldsUi',
+				placeholder: 'Add Custom Field',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				description: 'Filter by custom fields',
+				default: {},
+				options: [
+					{
+						name: 'customFieldsValues',
+						displayName: 'Custom Field',
+						values: [
+							{
+								displayName: 'Field Name or ID',
+								name: 'fieldId',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getCustomFields',
+								},
+								default: '',
+								description:
+									'The ID of the field to add custom field to. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'The value to set on custom field',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Status',
+				name: 'status',
+				type: 'options',
+				options: [
+					{
+						name: 'Active',
+						value: 'active',
+					},
+					{
+						name: 'Bounced',
+						value: 'bounced',
+					},
+					{
+						name: 'Junk',
+						value: 'junk',
+					},
+					{
+						name: 'Unconfirmed',
+						value: 'unconfirmed',
+					},
+					{
+						name: 'Unsubscribed',
+						value: 'unsubscribed',
+					},
+				],
+				default: '',
+			},
+			{
+				displayName: 'Subscribed At',
+				name: 'subscribed_at',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'IP Address',
+				name: 'ip_address',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Opted In At',
+				name: 'opted_in_at',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Opt In IP',
+				name: 'optin_ip',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Unsubscribed At',
+				name: 'unsubscribed_at',
+				type: 'dateTime',
+				default: '',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                subscriber:delete                           */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Subscriber Email',
+		name: 'subscriberId',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['subscriber'],
+				operation: ['delete'],
+			},
+		},
+		default: '',
+		description: 'Email of subscriber to delete',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                  subscriber:get                            */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Subscriber Email',
+		name: 'subscriberId',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['subscriber'],
+				operation: ['get'],
+			},
+		},
+		default: '',
+		description: 'Email of subscriber to get',
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                  subscriber:getAll                         */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['subscriber'],
+				operation: ['getAll'],
+			},
+		},
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: ['subscriber'],
+				operation: ['getAll'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 50,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Filters',
+		name: 'filters',
+		type: 'collection',
+		placeholder: 'Add Filter',
+		displayOptions: {
+			show: {
+				operation: ['getAll'],
+				resource: ['subscriber'],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Status',
+				name: 'status',
+				type: 'options',
+				options: [
+					{
+						name: 'Active',
+						value: 'active',
+					},
+					{
+						name: 'Bounced',
+						value: 'bounced',
+					},
+					{
+						name: 'Junk',
+						value: 'junk',
+					},
+					{
+						name: 'Unconfirmed',
+						value: 'unconfirmed',
+					},
+					{
+						name: 'Unsubscribed',
+						value: 'unsubscribed',
+					},
+				],
+				default: '',
+			},
+		],
+	},
+];
diff --git a/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts b/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
index 324118a46e81e..24a1eb94480c8 100644
--- a/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
+++ b/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
@@ -163,7 +163,6 @@ export class Mailgun implements INodeType {
 					}
 
 					if (attachments.length) {
-						// @ts-ignore
 						formData.attachment = attachments;
 					}
 				}
diff --git a/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts b/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts
index 0b02a4590cfb1..303ef673ef1ab 100644
--- a/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts
+++ b/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts
@@ -9,11 +9,9 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
+import { emailFields, emailOperations } from './EmailDescription';
 import type { IMessage } from './GenericFunctions';
 import { mailjetApiRequest, validateJSON } from './GenericFunctions';
-
-import { emailFields, emailOperations } from './EmailDescription';
-
 import { smsFields, smsOperations } from './SmsDescription';
 export class Mailjet implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts b/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
index ddd3d4d7924f0..43ed419ddb687 100644
--- a/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
+++ b/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
@@ -1,3 +1,6 @@
+import isEmpty from 'lodash/isEmpty';
+import map from 'lodash/map';
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -10,10 +13,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeApiError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
-import map from 'lodash/map';
-import isEmpty from 'lodash/isEmpty';
 import {
 	getGoogleAnalyticsDomainsArray,
 	getTags,
@@ -838,7 +837,6 @@ export class Mandrill implements INodeType {
 								// @ts-ignore
 								attachmentsValues = map(attachmentsUi.attachmentsValues, (o: IDataObject) => {
 									const aux: IDataObject = {};
-									// @ts-ignore
 									aux.name = o.name;
 									aux.content = o.content;
 									aux.type = o.type;
diff --git a/packages/nodes-base/nodes/Markdown/Markdown.node.ts b/packages/nodes-base/nodes/Markdown/Markdown.node.ts
index bcd270797d5de..dbefae898901c 100644
--- a/packages/nodes-base/nodes/Markdown/Markdown.node.ts
+++ b/packages/nodes-base/nodes/Markdown/Markdown.node.ts
@@ -1,3 +1,5 @@
+import isEmpty from 'lodash/isEmpty';
+import set from 'lodash/set';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -7,13 +9,8 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeConnectionType, deepCopy } from 'n8n-workflow';
-
-import { Converter } from 'showdown';
-
 import { NodeHtmlMarkdown } from 'node-html-markdown';
-
-import isEmpty from 'lodash/isEmpty';
-import set from 'lodash/set';
+import { Converter } from 'showdown';
 
 export class Markdown implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Marketstack/Marketstack.node.ts b/packages/nodes-base/nodes/Marketstack/Marketstack.node.ts
index 62617ee6fa376..370fdb261b0c7 100644
--- a/packages/nodes-base/nodes/Marketstack/Marketstack.node.ts
+++ b/packages/nodes-base/nodes/Marketstack/Marketstack.node.ts
@@ -15,14 +15,12 @@ import {
 	tickerFields,
 	tickerOperations,
 } from './descriptions';
-
 import {
 	format,
 	marketstackApiRequest,
 	marketstackApiRequestAllItems,
 	validateTimeOptions,
 } from './GenericFunctions';
-
 import type { EndOfDayDataFilters, Operation, Resource } from './types';
 
 export class Marketstack implements INodeType {
diff --git a/packages/nodes-base/nodes/Matrix/GenericFunctions.ts b/packages/nodes-base/nodes/Matrix/GenericFunctions.ts
index 112db518da881..c00d819015cff 100644
--- a/packages/nodes-base/nodes/Matrix/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Matrix/GenericFunctions.ts
@@ -7,7 +7,6 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
-
 import { v4 as uuid } from 'uuid';
 
 export async function matrixApiRequest(
@@ -40,7 +39,6 @@ export async function matrixApiRequest(
 		const credentials = await this.getCredentials('matrixApi');
 
 		options.uri = `${credentials.homeserverUrl}/_matrix/${
-			//@ts-ignore
 			option.overridePrefix || 'client'
 		}/r0${resource}`;
 		options.headers!.Authorization = `Bearer ${credentials.accessToken}`;
diff --git a/packages/nodes-base/nodes/Matrix/Matrix.node.ts b/packages/nodes-base/nodes/Matrix/Matrix.node.ts
index 141a6c51814cb..6a0c4b40ac198 100644
--- a/packages/nodes-base/nodes/Matrix/Matrix.node.ts
+++ b/packages/nodes-base/nodes/Matrix/Matrix.node.ts
@@ -9,18 +9,12 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { handleMatrixCall, matrixApiRequest } from './GenericFunctions';
-
 import { accountOperations } from './AccountDescription';
-
 import { eventFields, eventOperations } from './EventDescription';
-
+import { handleMatrixCall, matrixApiRequest } from './GenericFunctions';
 import { mediaFields, mediaOperations } from './MediaDescription';
-
 import { messageFields, messageOperations } from './MessageDescription';
-
 import { roomFields, roomOperations } from './RoomDescription';
-
 import { roomMemberFields, roomMemberOperations } from './RoomMemberDescription';
 
 export class Matrix implements INodeType {
diff --git a/packages/nodes-base/nodes/Mattermost/v1/MattermostV1.node.ts b/packages/nodes-base/nodes/Mattermost/v1/MattermostV1.node.ts
index 744a6f37095e4..926be610aed19 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/MattermostV1.node.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/MattermostV1.node.ts
@@ -5,9 +5,9 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import { router } from './actions/router';
 import { versionDescription } from './actions/versionDescription';
 import { loadOptions } from './methods';
-import { router } from './actions/router';
 
 export class MattermostV1 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/addUser/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/addUser/index.ts
index 53e45541441e8..742724846203e 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/addUser/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/addUser/index.ts
@@ -1,4 +1,4 @@
-import { addUser as execute } from './execute';
 import { channelAddUserDescription as description } from './description';
+import { addUser as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/create/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/create/index.ts
index 6d0b5e029813c..295ea9864068b 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/create/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/create/index.ts
@@ -1,4 +1,4 @@
-import { create as execute } from './execute';
 import { channelCreateDescription as description } from './description';
+import { create as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/del/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/del/index.ts
index 6a1a439d788c6..337e950330bcf 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/del/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/del/index.ts
@@ -1,4 +1,4 @@
-import { del as execute } from './execute';
 import { channelDeleteDescription as description } from './description';
+import { del as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/index.ts
index 26cf5301a3eef..2edfc23da4043 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/index.ts
@@ -1,11 +1,12 @@
 import type { INodeProperties } from 'n8n-workflow';
+
+import * as addUser from './addUser';
 import * as create from './create';
 import * as del from './del';
 import * as members from './members';
 import * as restore from './restore';
-import * as addUser from './addUser';
-import * as statistics from './statistics';
 import * as search from './search';
+import * as statistics from './statistics';
 
 export { create, del as delete, members, restore, addUser, statistics, search };
 
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/members/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/members/index.ts
index 21b6549c6dfcc..9849dbfbd856f 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/members/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/members/index.ts
@@ -1,4 +1,4 @@
-import { members as execute } from './execute';
 import { channelMembersDescription as description } from './description';
+import { members as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/restore/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/restore/index.ts
index 7bf9f4c595a55..7d99464fc6bfe 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/restore/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/restore/index.ts
@@ -1,4 +1,4 @@
-import { restore as execute } from './execute';
 import { channelRestoreDescription as description } from './description';
+import { restore as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/search/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/search/index.ts
index 9b3ac397d09f8..9c5c467bb7d3c 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/search/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/search/index.ts
@@ -1,4 +1,4 @@
-import { search as execute } from './execute';
 import { channelSearchDescription as description } from './description';
+import { search as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/statistics/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/statistics/index.ts
index 946856f3b1ee5..c2c2bca7a6337 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/statistics/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/statistics/index.ts
@@ -1,4 +1,4 @@
-import { statistics as execute } from './execute';
 import { channelStatisticsDescription as description } from './description';
+import { statistics as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/message/del/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/message/del/index.ts
index 13161e7481015..68cff0cdb7e5f 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/message/del/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/message/del/index.ts
@@ -1,4 +1,4 @@
-import { del as execute } from './execute';
 import { messageDeleteDescription as description } from './description';
+import { del as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/message/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/message/index.ts
index 433e0e95e19ec..e74d546d43448 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/message/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/message/index.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as del from './del';
 import * as post from './post';
 import * as postEphemeral from './postEphemeral';
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/message/post/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/message/post/execute.ts
index 38f3eb6797186..82362ec0e021b 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/message/post/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/message/post/execute.ts
@@ -1,7 +1,6 @@
 import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
-
 import type { IAttachment } from '../../Interfaces';
 
 export async function post(this: IExecuteFunctions, index: number): Promise<INodeExecutionData[]> {
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/message/post/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/message/post/index.ts
index e823fd7dc242a..1c3b259ab5ae9 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/message/post/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/message/post/index.ts
@@ -1,4 +1,4 @@
-import { post as execute } from './execute';
 import { messagePostDescription as description } from './description';
+import { post as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/message/postEphemeral/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/message/postEphemeral/index.ts
index db3575bba9f52..1c2725e009e15 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/message/postEphemeral/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/message/postEphemeral/index.ts
@@ -1,4 +1,4 @@
-import { postEphemeral as execute } from './execute';
 import { messagePostEphemeralDescription as description } from './description';
+import { postEphemeral as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/create/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/create/index.ts
index d146e47a54bd5..7b256a04f2dca 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/create/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/create/index.ts
@@ -1,4 +1,4 @@
-import { create as execute } from './execute';
 import { reactionCreateDescription as description } from './description';
+import { create as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/del/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/del/index.ts
index 1464e57a39849..835773772577a 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/del/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/del/index.ts
@@ -1,4 +1,4 @@
-import { del as execute } from './execute';
 import { reactionDeleteDescription as description } from './description';
+import { del as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/getAll/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/getAll/index.ts
index 8e2c2bcdb513d..8b1e83c8ac9c3 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/getAll/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/getAll/index.ts
@@ -1,4 +1,4 @@
-import { getAll as execute } from './execute';
 import { reactionGetAllDescription as description } from './description';
+import { getAll as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/index.ts
index e1da062e19731..a27bbf23c21e7 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/index.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as create from './create';
 import * as del from './del';
 import * as getAll from './getAll';
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/router.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/router.ts
index bd1af59af2ed4..9f775e178e786 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/router.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/router.ts
@@ -1,10 +1,10 @@
 import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import * as channel from './channel';
+import type { Mattermost } from './Interfaces';
 import * as message from './message';
 import * as reaction from './reaction';
 import * as user from './user';
-import type { Mattermost } from './Interfaces';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	const items = this.getInputData();
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/user/create/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/user/create/index.ts
index b577b89d6ac38..cdc5974dc1d0b 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/user/create/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/user/create/index.ts
@@ -1,4 +1,4 @@
-import { create as execute } from './execute';
 import { userCreateDescription as description } from './description';
+import { create as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/user/deactive/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/user/deactive/index.ts
index c94f40b60d991..cc7ea96d449ef 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/user/deactive/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/user/deactive/index.ts
@@ -1,4 +1,4 @@
-import { deactive as execute } from './execute';
 import { userDeactiveDescription as description } from './description';
+import { deactive as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/user/getAll/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/user/getAll/execute.ts
index 099de6e0cdf4b..86511eda0b0e7 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/user/getAll/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/user/getAll/execute.ts
@@ -1,7 +1,7 @@
+import { snakeCase } from 'change-case';
 import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
 import { apiRequest, apiRequestAllItems } from '../../../transport';
 
 export async function getAll(
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/user/getAll/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/user/getAll/index.ts
index f0ca9da66cbb5..6cdefb692296e 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/user/getAll/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/user/getAll/index.ts
@@ -1,4 +1,4 @@
-import { getAll as execute } from './execute';
 import { userGetAllDescription as description } from './description';
+import { getAll as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/user/getByEmail/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/user/getByEmail/index.ts
index cfea09fd8d163..aae3018fe8344 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/user/getByEmail/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/user/getByEmail/index.ts
@@ -1,4 +1,4 @@
-import { getByEmail as execute } from './execute';
 import { userGetByEmailDescription as description } from './description';
+import { getByEmail as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/user/getById/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/user/getById/index.ts
index c7e5dc2641658..8b0bcb1dcb5bc 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/user/getById/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/user/getById/index.ts
@@ -1,4 +1,4 @@
-import { getById as execute } from './execute';
 import { userGetByIdDescription as description } from './description';
+import { getById as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/user/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/user/index.ts
index 7ac78aea128eb..cf1859f7577ca 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/user/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/user/index.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as create from './create';
 import * as deactive from './deactive';
 import * as getAll from './getAll';
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/user/invite/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/user/invite/index.ts
index f6217f915699e..17f51ca035c88 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/user/invite/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/user/invite/index.ts
@@ -1,4 +1,4 @@
-import { invite as execute } from './execute';
 import { userInviteDescription as description } from './description';
+import { invite as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/versionDescription.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/versionDescription.ts
index 787c1af46aaf1..bdd0fc57de093 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/versionDescription.ts
@@ -1,5 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import { NodeConnectionType, type INodeTypeDescription } from 'n8n-workflow';
+
 import * as channel from './channel';
 import * as message from './message';
 import * as reaction from './reaction';
diff --git a/packages/nodes-base/nodes/Mautic/GenericFunctions.ts b/packages/nodes-base/nodes/Mautic/GenericFunctions.ts
index 415c70afc0f07..e612e7656374e 100644
--- a/packages/nodes-base/nodes/Mautic/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mautic/GenericFunctions.ts
@@ -37,14 +37,12 @@ export async function mauticApiRequest(
 			const baseUrl = credentials.url as string;
 
 			options.uri = `${baseUrl.endsWith('/') ? baseUrl.slice(0, -1) : baseUrl}${options.uri}`;
-			//@ts-ignore
 			returnData = await this.helpers.requestWithAuthentication.call(this, 'mauticApi', options);
 		} else {
 			const credentials = await this.getCredentials('mauticOAuth2Api');
 			const baseUrl = credentials.url as string;
 
 			options.uri = `${baseUrl.endsWith('/') ? baseUrl.slice(0, -1) : baseUrl}${options.uri}`;
-			//@ts-ignore
 			returnData = await this.helpers.requestOAuth2.call(this, 'mauticOAuth2Api', options, {
 				includeCredentialsOnRefreshOnBody: true,
 			});
@@ -83,7 +81,6 @@ export async function mauticApiRequestAllItems(
 	do {
 		responseData = await mauticApiRequest.call(this, method, endpoint, body, query);
 		const values = Object.values(responseData[propertyName] as IDataObject[]);
-		//@ts-ignore
 		returnData.push.apply(returnData, values);
 		query.start += query.limit;
 	} while (
diff --git a/packages/nodes-base/nodes/Mautic/Mautic.node.ts b/packages/nodes-base/nodes/Mautic/Mautic.node.ts
index 25a1aad38125b..0a5d61739ce93 100644
--- a/packages/nodes-base/nodes/Mautic/Mautic.node.ts
+++ b/packages/nodes-base/nodes/Mautic/Mautic.node.ts
@@ -1,3 +1,4 @@
+import { snakeCase } from 'change-case';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -10,20 +11,13 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
-import { mauticApiRequest, mauticApiRequestAllItems, validateJSON } from './GenericFunctions';
-
-import { contactFields, contactOperations } from './ContactDescription';
-
-import { segmentEmailFields, segmentEmailOperations } from './SegmentEmailDescription';
-
-import { companyFields, companyOperations } from './CompanyDescription';
-
+import { campaignContactFields, campaignContactOperations } from './CampaignContactDescription';
 import { companyContactFields, companyContactOperations } from './CompanyContactDescription';
-
+import { companyFields, companyOperations } from './CompanyDescription';
+import { contactFields, contactOperations } from './ContactDescription';
 import { contactSegmentFields, contactSegmentOperations } from './ContactSegmentDescription';
-
-import { campaignContactFields, campaignContactOperations } from './CampaignContactDescription';
+import { mauticApiRequest, mauticApiRequestAllItems, validateJSON } from './GenericFunctions';
+import { segmentEmailFields, segmentEmailOperations } from './SegmentEmailDescription';
 
 export class Mautic implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Mautic/MauticTrigger.node.ts b/packages/nodes-base/nodes/Mautic/MauticTrigger.node.ts
index 01a87bd7caeb7..cf7251b7eef92 100644
--- a/packages/nodes-base/nodes/Mautic/MauticTrigger.node.ts
+++ b/packages/nodes-base/nodes/Mautic/MauticTrigger.node.ts
@@ -1,5 +1,3 @@
-import { parse as urlParse } from 'url';
-
 import {
 	type IHookFunctions,
 	type IWebhookFunctions,
@@ -11,6 +9,7 @@ import {
 	type IWebhookResponseData,
 	NodeConnectionType,
 } from 'n8n-workflow';
+import { parse as urlParse } from 'url';
 
 import { mauticApiRequest } from './GenericFunctions';
 
diff --git a/packages/nodes-base/nodes/Merge/test/v3/operations.test.ts b/packages/nodes-base/nodes/Merge/test/v3/operations.test.ts
index ae9dcfd954727..a318885edcc16 100644
--- a/packages/nodes-base/nodes/Merge/test/v3/operations.test.ts
+++ b/packages/nodes-base/nodes/Merge/test/v3/operations.test.ts
@@ -1,4 +1,5 @@
 import type { IDataObject, INode } from 'n8n-workflow';
+
 import { createMockExecuteFunction } from '../../../../test/nodes/Helpers';
 import * as mode from '../../v3/actions/mode';
 
diff --git a/packages/nodes-base/nodes/Merge/v1/MergeV1.node.ts b/packages/nodes-base/nodes/Merge/v1/MergeV1.node.ts
index 7105e1aa9a50d..069f46ba08142 100644
--- a/packages/nodes-base/nodes/Merge/v1/MergeV1.node.ts
+++ b/packages/nodes-base/nodes/Merge/v1/MergeV1.node.ts
@@ -1,5 +1,4 @@
 import get from 'lodash/get';
-
 import type {
 	IExecuteFunctions,
 	GenericValue,
@@ -11,9 +10,10 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, deepCopy } from 'n8n-workflow';
 
-import { generatePairedItemData } from '../../../utils/utilities';
 import { oldVersionNotice } from '@utils/descriptions';
 
+import { generatePairedItemData } from '../../../utils/utilities';
+
 export class MergeV1 implements INodeType {
 	description: INodeTypeDescription;
 
diff --git a/packages/nodes-base/nodes/Merge/v2/MergeV2.node.ts b/packages/nodes-base/nodes/Merge/v2/MergeV2.node.ts
index 6adc63aa1e5ee..955835dd3ab92 100644
--- a/packages/nodes-base/nodes/Merge/v2/MergeV2.node.ts
+++ b/packages/nodes-base/nodes/Merge/v2/MergeV2.node.ts
@@ -1,5 +1,4 @@
 import merge from 'lodash/merge';
-
 import {
 	type IExecuteFunctions,
 	type IDataObject,
@@ -11,13 +10,15 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
+import { preparePairedItemDataArray } from '@utils/utilities';
+
+import { optionsDescription } from './descriptions';
 import type {
 	ClashResolveOptions,
 	MatchFieldsJoinMode,
 	MatchFieldsOptions,
 	MatchFieldsOutput,
 } from './interfaces';
-
 import {
 	addSourceField,
 	addSuffixToEntriesKeys,
@@ -28,9 +29,6 @@ import {
 	selectMergeMethod,
 } from './utils';
 
-import { optionsDescription } from './descriptions';
-import { preparePairedItemDataArray } from '@utils/utilities';
-
 export class MergeV2 implements INodeType {
 	description: INodeTypeDescription;
 
diff --git a/packages/nodes-base/nodes/Merge/v2/utils.ts b/packages/nodes-base/nodes/Merge/v2/utils.ts
index ec5180c5a50c7..1f5437f663d18 100644
--- a/packages/nodes-base/nodes/Merge/v2/utils.ts
+++ b/packages/nodes-base/nodes/Merge/v2/utils.ts
@@ -1,4 +1,8 @@
-import { ApplicationError } from 'n8n-workflow';
+import assign from 'lodash/assign';
+import assignWith from 'lodash/assignWith';
+import get from 'lodash/get';
+import merge from 'lodash/merge';
+import mergeWith from 'lodash/mergeWith';
 import type {
 	GenericValue,
 	IBinaryKeyData,
@@ -6,15 +10,11 @@ import type {
 	INodeExecutionData,
 	IPairedItemData,
 } from 'n8n-workflow';
+import { ApplicationError } from 'n8n-workflow';
 
-import assign from 'lodash/assign';
-import assignWith from 'lodash/assignWith';
-import get from 'lodash/get';
-import merge from 'lodash/merge';
-import mergeWith from 'lodash/mergeWith';
+import { fuzzyCompare, preparePairedItemDataArray } from '@utils/utilities';
 
 import type { ClashResolveOptions, MatchFieldsJoinMode, MatchFieldsOptions } from './interfaces';
-import { fuzzyCompare, preparePairedItemDataArray } from '@utils/utilities';
 
 type PairToMatch = {
 	field1: string;
diff --git a/packages/nodes-base/nodes/Merge/v3/MergeV3.node.ts b/packages/nodes-base/nodes/Merge/v3/MergeV3.node.ts
index f194d9e54a8d8..254d248f6e32f 100644
--- a/packages/nodes-base/nodes/Merge/v3/MergeV3.node.ts
+++ b/packages/nodes-base/nodes/Merge/v3/MergeV3.node.ts
@@ -5,8 +5,8 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import { versionDescription } from './actions/versionDescription';
 import { router } from './actions/router';
+import { versionDescription } from './actions/versionDescription';
 import { loadOptions } from './methods';
 
 export class MergeV3 implements INodeType {
diff --git a/packages/nodes-base/nodes/Merge/v3/actions/mode/append.ts b/packages/nodes-base/nodes/Merge/v3/actions/mode/append.ts
index 5bf9896216b50..e9f9251495840 100644
--- a/packages/nodes-base/nodes/Merge/v3/actions/mode/append.ts
+++ b/packages/nodes-base/nodes/Merge/v3/actions/mode/append.ts
@@ -4,9 +4,10 @@ import {
 	type INodeProperties,
 } from 'n8n-workflow';
 
-import { numberInputsProperty } from '../../helpers/descriptions';
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { numberInputsProperty } from '../../helpers/descriptions';
+
 export const properties: INodeProperties[] = [numberInputsProperty];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/Merge/v3/actions/mode/chooseBranch.ts b/packages/nodes-base/nodes/Merge/v3/actions/mode/chooseBranch.ts
index 053365e415ce0..dc94daaf0e1b2 100644
--- a/packages/nodes-base/nodes/Merge/v3/actions/mode/chooseBranch.ts
+++ b/packages/nodes-base/nodes/Merge/v3/actions/mode/chooseBranch.ts
@@ -1,9 +1,10 @@
 import { NodeOperationError } from 'n8n-workflow';
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
 
-import { numberInputsProperty } from '../../helpers/descriptions';
 import { preparePairedItemDataArray, updateDisplayOptions } from '@utils/utilities';
 
+import { numberInputsProperty } from '../../helpers/descriptions';
+
 export const properties: INodeProperties[] = [
 	numberInputsProperty,
 	{
diff --git a/packages/nodes-base/nodes/Merge/v3/actions/mode/combineAll.ts b/packages/nodes-base/nodes/Merge/v3/actions/mode/combineAll.ts
index 089ecf92351ae..7f130de307a7e 100644
--- a/packages/nodes-base/nodes/Merge/v3/actions/mode/combineAll.ts
+++ b/packages/nodes-base/nodes/Merge/v3/actions/mode/combineAll.ts
@@ -1,3 +1,4 @@
+import merge from 'lodash/merge';
 import type {
 	IExecuteFunctions,
 	INodeExecutionData,
@@ -5,12 +6,11 @@ import type {
 	IPairedItemData,
 } from 'n8n-workflow';
 
-import merge from 'lodash/merge';
-import type { ClashResolveOptions } from '../../helpers/interfaces';
+import { updateDisplayOptions } from '@utils/utilities';
 
 import { clashHandlingProperties, fuzzyCompareProperty } from '../../helpers/descriptions';
+import type { ClashResolveOptions } from '../../helpers/interfaces';
 import { addSuffixToEntriesKeys, selectMergeMethod } from '../../helpers/utils';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Merge/v3/actions/mode/combineByFields.ts b/packages/nodes-base/nodes/Merge/v3/actions/mode/combineByFields.ts
index bdbd40c444329..0e848666eec8e 100644
--- a/packages/nodes-base/nodes/Merge/v3/actions/mode/combineByFields.ts
+++ b/packages/nodes-base/nodes/Merge/v3/actions/mode/combineByFields.ts
@@ -5,13 +5,15 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { clashHandlingProperties, fuzzyCompareProperty } from '../../helpers/descriptions';
 import type {
 	ClashResolveOptions,
 	MatchFieldsJoinMode,
 	MatchFieldsOptions,
 	MatchFieldsOutput,
 } from '../../helpers/interfaces';
-import { clashHandlingProperties, fuzzyCompareProperty } from '../../helpers/descriptions';
 import {
 	addSourceField,
 	addSuffixToEntriesKeys,
@@ -20,7 +22,6 @@ import {
 	findMatches,
 	mergeMatched,
 } from '../../helpers/utils';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const multipleMatchesProperty: INodeProperties = {
 	displayName: 'Multiple Matches',
diff --git a/packages/nodes-base/nodes/Merge/v3/actions/mode/combineByPosition.ts b/packages/nodes-base/nodes/Merge/v3/actions/mode/combineByPosition.ts
index 8cd7e6ed41b13..8b9067156c1d5 100644
--- a/packages/nodes-base/nodes/Merge/v3/actions/mode/combineByPosition.ts
+++ b/packages/nodes-base/nodes/Merge/v3/actions/mode/combineByPosition.ts
@@ -1,3 +1,4 @@
+import merge from 'lodash/merge';
 import {
 	NodeExecutionOutput,
 	type IExecuteFunctions,
@@ -6,12 +7,11 @@ import {
 	type IPairedItemData,
 } from 'n8n-workflow';
 
-import merge from 'lodash/merge';
-import type { ClashResolveOptions } from '../../helpers/interfaces';
+import { updateDisplayOptions } from '@utils/utilities';
 
 import { clashHandlingProperties, numberInputsProperty } from '../../helpers/descriptions';
+import type { ClashResolveOptions } from '../../helpers/interfaces';
 import { addSuffixToEntriesKeys, selectMergeMethod } from '../../helpers/utils';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	numberInputsProperty,
diff --git a/packages/nodes-base/nodes/Merge/v3/actions/mode/combineBySql.ts b/packages/nodes-base/nodes/Merge/v3/actions/mode/combineBySql.ts
index 9fd09abc73527..bd6921082f77a 100644
--- a/packages/nodes-base/nodes/Merge/v3/actions/mode/combineBySql.ts
+++ b/packages/nodes-base/nodes/Merge/v3/actions/mode/combineBySql.ts
@@ -1,3 +1,5 @@
+import alasql from 'alasql';
+import type { Database } from 'alasql';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -7,11 +9,10 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import alasql from 'alasql';
-import type { Database } from 'alasql';
-import { numberInputsProperty } from '../../helpers/descriptions';
 import { getResolvables, updateDisplayOptions } from '@utils/utilities';
 
+import { numberInputsProperty } from '../../helpers/descriptions';
+
 export const properties: INodeProperties[] = [
 	numberInputsProperty,
 	{
diff --git a/packages/nodes-base/nodes/Merge/v3/actions/mode/index.ts b/packages/nodes-base/nodes/Merge/v3/actions/mode/index.ts
index fb10117b79f5c..d704b11b2250b 100644
--- a/packages/nodes-base/nodes/Merge/v3/actions/mode/index.ts
+++ b/packages/nodes-base/nodes/Merge/v3/actions/mode/index.ts
@@ -4,8 +4,8 @@ import * as append from './append';
 import * as chooseBranch from './chooseBranch';
 import * as combineAll from './combineAll';
 import * as combineByFields from './combineByFields';
-import * as combineBySql from './combineBySql';
 import * as combineByPosition from './combineByPosition';
+import * as combineBySql from './combineBySql';
 
 export { append, chooseBranch, combineAll, combineByFields, combineBySql, combineByPosition };
 
diff --git a/packages/nodes-base/nodes/Merge/v3/actions/router.ts b/packages/nodes-base/nodes/Merge/v3/actions/router.ts
index 437ef1b3b64f9..9ecbc4f6554bd 100644
--- a/packages/nodes-base/nodes/Merge/v3/actions/router.ts
+++ b/packages/nodes-base/nodes/Merge/v3/actions/router.ts
@@ -1,7 +1,8 @@
 import type { IExecuteFunctions } from 'n8n-workflow';
-import { getNodeInputsData } from '../helpers/utils';
-import type { MergeType } from './node.type';
+
 import * as mode from './mode';
+import type { MergeType } from './node.type';
+import { getNodeInputsData } from '../helpers/utils';
 
 export async function router(this: IExecuteFunctions) {
 	const inputsData = getNodeInputsData.call(this);
diff --git a/packages/nodes-base/nodes/Merge/v3/actions/versionDescription.ts b/packages/nodes-base/nodes/Merge/v3/actions/versionDescription.ts
index efcd726f82b72..788b45446dc1d 100644
--- a/packages/nodes-base/nodes/Merge/v3/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/Merge/v3/actions/versionDescription.ts
@@ -1,8 +1,8 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import { NodeConnectionType, type INodeTypeDescription } from 'n8n-workflow';
 
-import { configuredInputs } from '../helpers/utils';
 import * as mode from './mode';
+import { configuredInputs } from '../helpers/utils';
 
 export const versionDescription: INodeTypeDescription = {
 	displayName: 'Merge',
diff --git a/packages/nodes-base/nodes/Merge/v3/helpers/utils.ts b/packages/nodes-base/nodes/Merge/v3/helpers/utils.ts
index 0dd650f790f57..a8d44ce550a8e 100644
--- a/packages/nodes-base/nodes/Merge/v3/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Merge/v3/helpers/utils.ts
@@ -1,4 +1,8 @@
-import { ApplicationError, NodeConnectionType, NodeHelpers } from 'n8n-workflow';
+import assign from 'lodash/assign';
+import assignWith from 'lodash/assignWith';
+import get from 'lodash/get';
+import merge from 'lodash/merge';
+import mergeWith from 'lodash/mergeWith';
 import type {
 	GenericValue,
 	IBinaryKeyData,
@@ -8,15 +12,11 @@ import type {
 	INodeParameters,
 	IPairedItemData,
 } from 'n8n-workflow';
+import { ApplicationError, NodeConnectionType, NodeHelpers } from 'n8n-workflow';
 
-import assign from 'lodash/assign';
-import assignWith from 'lodash/assignWith';
-import get from 'lodash/get';
-import merge from 'lodash/merge';
-import mergeWith from 'lodash/mergeWith';
+import { fuzzyCompare, preparePairedItemDataArray } from '@utils/utilities';
 
 import type { ClashResolveOptions, MatchFieldsJoinMode, MatchFieldsOptions } from './interfaces';
-import { fuzzyCompare, preparePairedItemDataArray } from '@utils/utilities';
 
 type PairToMatch = {
 	field1: string;
diff --git a/packages/nodes-base/nodes/Metabase/Metabase.node.ts b/packages/nodes-base/nodes/Metabase/Metabase.node.ts
index cf13c705cd251..1d00a0f38a9ac 100644
--- a/packages/nodes-base/nodes/Metabase/Metabase.node.ts
+++ b/packages/nodes-base/nodes/Metabase/Metabase.node.ts
@@ -1,13 +1,10 @@
 import type { INodeType, INodeTypeDescription } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { questionsFields, questionsOperations } from './QuestionsDescription';
-
-import { metricsFields, metricsOperations } from './MetricsDescription';
-
-import { databasesFields, databasesOperations } from './DatabasesDescription';
-
 import { alertsFields, alertsOperations } from './AlertsDescription';
+import { databasesFields, databasesOperations } from './DatabasesDescription';
+import { metricsFields, metricsOperations } from './MetricsDescription';
+import { questionsFields, questionsOperations } from './QuestionsDescription';
 
 export class Metabase implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Microsoft/Dynamics/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Dynamics/GenericFunctions.ts
index b24a95b6a72a1..2ccbb82553b52 100644
--- a/packages/nodes-base/nodes/Microsoft/Dynamics/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Dynamics/GenericFunctions.ts
@@ -42,7 +42,6 @@ export async function microsoftApiRequest(
 		if (Object.keys(option).length !== 0) {
 			options = Object.assign({}, options, option);
 		}
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'microsoftDynamicsOAuth2Api', options, {
 			property: 'id_token',
 		});
diff --git a/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.ts b/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.ts
index 08ee11ae4ae37..3ffaacbd69a7e 100644
--- a/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.ts
@@ -9,6 +9,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
+import { accountFields, accountOperations } from './descriptions';
 import type { IField } from './GenericFunctions';
 import {
 	adjustAddresses,
@@ -19,8 +20,6 @@ import {
 	sort,
 } from './GenericFunctions';
 
-import { accountFields, accountOperations } from './descriptions';
-
 export class MicrosoftDynamicsCrm implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Microsoft Dynamics CRM',
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/addTable.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/addTable.test.ts
index cb0054e315e13..d53a43bd04259 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/addTable.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/addTable.test.ts
@@ -1,10 +1,11 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/append.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/append.test.ts
index 446abb5b5e5cc..04c51e71cdd98 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/append.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/append.test.ts
@@ -1,10 +1,11 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/convertToRange.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/convertToRange.test.ts
index faba8409efc53..797e6c9de4872 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/convertToRange.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/convertToRange.test.ts
@@ -1,10 +1,11 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/deleteTable.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/deleteTable.test.ts
index 62616cf156bac..a771b77b5a5e8 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/deleteTable.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/deleteTable.test.ts
@@ -1,10 +1,11 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getColumns.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getColumns.test.ts
index e69bd72165948..815c9581a1a49 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getColumns.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getColumns.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getRows.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getRows.test.ts
index e9627700c9e70..d46d1a48a75de 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getRows.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getRows.test.ts
@@ -1,10 +1,11 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/lookup.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/lookup.test.ts
index e468b62336570..1dd75ce25c5f6 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/lookup.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/lookup.test.ts
@@ -1,10 +1,11 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/addWorksheet.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/addWorksheet.test.ts
index 2c62bd6967611..3ecc29f3ae4fe 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/addWorksheet.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/addWorksheet.test.ts
@@ -1,10 +1,11 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/deleteWorkbook.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/deleteWorkbook.test.ts
index 007f579d21e13..0f4ba9e4b522b 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/deleteWorkbook.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/deleteWorkbook.test.ts
@@ -1,10 +1,11 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/getAll.test.ts
index bdcf6a6333c0e..f87820ebcd54b 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/getAll.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/getAll.test.ts
@@ -1,10 +1,11 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/append.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/append.test.ts
index dd1752ce7992c..8cac626c00aa0 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/append.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/append.test.ts
@@ -1,5 +1,6 @@
-import nock from 'nock';
 import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
 import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/clear.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/clear.test.ts
index 7d60587541932..aed1657626e05 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/clear.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/clear.test.ts
@@ -1,10 +1,11 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/deleteWorksheet.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/deleteWorksheet.test.ts
index 06711c01832bb..54b1ae221e505 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/deleteWorksheet.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/deleteWorksheet.test.ts
@@ -1,10 +1,11 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/getAll.test.ts
index dbdd0a2ac7e2b..1f9057a687041 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/getAll.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/getAll.test.ts
@@ -1,10 +1,11 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/readRows.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/readRows.test.ts
index 17a8549dc1260..181913cc89ccb 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/readRows.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/readRows.test.ts
@@ -1,5 +1,6 @@
-import nock from 'nock';
 import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
 import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/update.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/update.test.ts
index 3fef581c7ce86..0433d968dbe79 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/update.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/update.test.ts
@@ -1,5 +1,6 @@
-import nock from 'nock';
 import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
 import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/upsert.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/upsert.test.ts
index 9a81d34eb162c..5de97bf39df16 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/upsert.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/upsert.test.ts
@@ -1,5 +1,6 @@
-import nock from 'nock';
 import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
 import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/utils/utils.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/utils/utils.test.ts
index 8a67dbcf18589..55deec3a00268 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/utils/utils.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/utils/utils.test.ts
@@ -1,7 +1,8 @@
-import { get } from 'lodash';
 import { mock } from 'jest-mock-extended';
-import type { IDataObject, IExecuteFunctions, IGetNodeParameterOptions, INode } from 'n8n-workflow';
+import { get } from 'lodash';
 import { constructExecutionMetaData } from 'n8n-core';
+import type { IDataObject, IExecuteFunctions, IGetNodeParameterOptions, INode } from 'n8n-workflow';
+
 import {
 	checkRange,
 	prepareOutput,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v1/MicrosoftExcelV1.node.ts b/packages/nodes-base/nodes/Microsoft/Excel/v1/MicrosoftExcelV1.node.ts
index 9eecb99e2bf09..53d7764dfcbb1 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v1/MicrosoftExcelV1.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v1/MicrosoftExcelV1.node.ts
@@ -11,20 +11,17 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeConnectionType } from 'n8n-workflow';
 
-import { generatePairedItemData } from '../../../../utils/utilities';
+import { oldVersionNotice } from '@utils/descriptions';
+
 import {
 	microsoftApiRequest,
 	microsoftApiRequestAllItems,
 	microsoftApiRequestAllItemsSkip,
 } from './GenericFunctions';
-
+import { tableFields, tableOperations } from './TableDescription';
 import { workbookFields, workbookOperations } from './WorkbookDescription';
-
 import { worksheetFields, worksheetOperations } from './WorksheetDescription';
-
-import { tableFields, tableOperations } from './TableDescription';
-
-import { oldVersionNotice } from '@utils/descriptions';
+import { generatePairedItemData } from '../../../../utils/utilities';
 
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Microsoft Excel',
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/MicrosoftExcelV2.node.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/MicrosoftExcelV2.node.ts
index e3bfcbac95e69..bcec8f635434b 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/MicrosoftExcelV2.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/MicrosoftExcelV2.node.ts
@@ -5,9 +5,9 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import { listSearch, loadOptions } from './methods';
-import { versionDescription } from './actions/versionDescription';
 import { router } from './actions/router';
+import { versionDescription } from './actions/versionDescription';
+import { listSearch, loadOptions } from './methods';
 
 export class MicrosoftExcelV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/router.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/router.ts
index a868bfa2c7bf8..d2bd7a12f5801 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/router.ts
@@ -1,7 +1,7 @@
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import type { MicrosoftExcel } from './node.type';
 
+import type { MicrosoftExcel } from './node.type';
 import * as table from './table/Table.resource';
 import * as workbook from './workbook/Workbook.resource';
 import * as worksheet from './worksheet/Worksheet.resource';
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/Table.resource.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/Table.resource.ts
index 6fc4497805454..f2f56b34a12b9 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/Table.resource.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/Table.resource.ts
@@ -1,7 +1,7 @@
 import type { INodeProperties } from 'n8n-workflow';
 
-import * as append from './append.operation';
 import * as addTable from './addTable.operation';
+import * as append from './append.operation';
 import * as convertToRange from './convertToRange.operation';
 import * as deleteTable from './deleteTable.operation';
 import * as getColumns from './getColumns.operation';
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/addTable.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/addTable.operation.ts
index 6ab2109211cff..80db436622e35 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/addTable.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/addTable.operation.ts
@@ -4,9 +4,11 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { microsoftApiRequest } from '../../transport';
 import { workbookRLC, worksheetRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/append.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/append.operation.ts
index 11095e27cfacd..11e345c28b085 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/append.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/append.operation.ts
@@ -4,11 +4,13 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { generatePairedItemData, processJsonInput, updateDisplayOptions } from '@utils/utilities';
+
 import type { ExcelResponse } from '../../helpers/interfaces';
 import { prepareOutput } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
 import { tableRLC, workbookRLC, worksheetRLC } from '../common.descriptions';
-import { generatePairedItemData, processJsonInput, updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/convertToRange.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/convertToRange.operation.ts
index 9b20ab77c38d7..a09cb8b36a26d 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/convertToRange.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/convertToRange.operation.ts
@@ -4,9 +4,11 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { microsoftApiRequest } from '../../transport';
 import { tableRLC, workbookRLC, worksheetRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [workbookRLC, worksheetRLC, tableRLC];
 
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/deleteTable.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/deleteTable.operation.ts
index 5e1ec86f4f002..fb1673ea21ef5 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/deleteTable.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/deleteTable.operation.ts
@@ -1,7 +1,9 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { microsoftApiRequest } from '../../transport';
 import { tableRLC, workbookRLC, worksheetRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [workbookRLC, worksheetRLC, tableRLC];
 
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getColumns.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getColumns.operation.ts
index e91596a4021c0..17aa9da13b40e 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getColumns.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getColumns.operation.ts
@@ -4,9 +4,11 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { microsoftApiRequest, microsoftApiRequestAllItemsSkip } from '../../transport';
 import { tableRLC, workbookRLC, worksheetRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getRows.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getRows.operation.ts
index 059c195a2bc6b..90ae8d6903815 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getRows.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getRows.operation.ts
@@ -4,9 +4,11 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { microsoftApiRequest, microsoftApiRequestAllItemsSkip } from '../../transport';
 import { tableRLC, workbookRLC, worksheetRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/lookup.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/lookup.operation.ts
index 9e2f9f3cefc31..ccc11f6b74515 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/lookup.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/lookup.operation.ts
@@ -6,9 +6,11 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { microsoftApiRequestAllItemsSkip } from '../../transport';
 import { tableRLC, workbookRLC, worksheetRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/addWorksheet.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/addWorksheet.operation.ts
index 69294c0911eac..ca1ce95ae35ea 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/addWorksheet.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/addWorksheet.operation.ts
@@ -4,9 +4,11 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { microsoftApiRequest } from '../../transport';
 import { workbookRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/deleteWorkbook.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/deleteWorkbook.operation.ts
index 297fbc37c49ca..ee389316dbfc2 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/deleteWorkbook.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/deleteWorkbook.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { microsoftApiRequest } from '../../transport';
 import { workbookRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [workbookRLC];
 
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/getAll.operation.ts
index 81a2081572674..a506bf14bc696 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/getAll.operation.ts
@@ -4,9 +4,11 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
+
 const properties: INodeProperties[] = [
 	{
 		displayName: 'Return All',
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/append.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/append.operation.ts
index e8af1938c887e..94680f80dd002 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/append.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/append.operation.ts
@@ -4,11 +4,13 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { processJsonInput, updateDisplayOptions } from '@utils/utilities';
+
 import type { ExcelResponse } from '../../helpers/interfaces';
 import { prepareOutput } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
 import { workbookRLC, worksheetRLC } from '../common.descriptions';
-import { processJsonInput, updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/clear.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/clear.operation.ts
index 8299ee18b115c..427a6ab8e134e 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/clear.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/clear.operation.ts
@@ -1,7 +1,9 @@
 import type { INodeExecutionData, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { microsoftApiRequest } from '../../transport';
 import { workbookRLC, worksheetRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/deleteWorksheet.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/deleteWorksheet.operation.ts
index 0ecae73b4615a..0d2271a5a196f 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/deleteWorksheet.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/deleteWorksheet.operation.ts
@@ -1,7 +1,9 @@
 import type { INodeExecutionData, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { microsoftApiRequest } from '../../transport';
 import { workbookRLC, worksheetRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [workbookRLC, worksheetRLC];
 
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/getAll.operation.ts
index 3681b60270d13..c22b87f33181c 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/getAll.operation.ts
@@ -4,9 +4,11 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
 import { workbookRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/readRows.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/readRows.operation.ts
index 7b6389d8147c6..26977a8078a05 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/readRows.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/readRows.operation.ts
@@ -4,11 +4,13 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import type { ExcelResponse } from '../../helpers/interfaces';
 import { checkRange, prepareOutput } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
 import { workbookRLC, worksheetRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/update.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/update.operation.ts
index 40a08a975e4f7..b21a6b039e0e4 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/update.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/update.operation.ts
@@ -5,6 +5,9 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
+import { generatePairedItemData, processJsonInput, updateDisplayOptions } from '@utils/utilities';
+
 import type { ExcelResponse, UpdateSummary } from '../../helpers/interfaces';
 import {
 	checkRange,
@@ -14,7 +17,6 @@ import {
 } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
 import { workbookRLC, worksheetRLC } from '../common.descriptions';
-import { generatePairedItemData, processJsonInput, updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/upsert.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/upsert.operation.ts
index 3745c76cacc13..c27feae6d5dc4 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/upsert.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/upsert.operation.ts
@@ -5,6 +5,9 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
+import { generatePairedItemData, processJsonInput, updateDisplayOptions } from '@utils/utilities';
+
 import type { ExcelResponse, UpdateSummary } from '../../helpers/interfaces';
 import {
 	checkRange,
@@ -14,7 +17,6 @@ import {
 } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
 import { workbookRLC, worksheetRLC } from '../common.descriptions';
-import { generatePairedItemData, processJsonInput, updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/helpers/utils.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/helpers/utils.ts
index 2303147ab3892..12151a471a2be 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/helpers/utils.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INode, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import type { ExcelResponse, SheetData, UpdateSummary } from './interfaces';
+
 import { generatePairedItemData, wrapData } from '@utils/utilities';
 
+import type { ExcelResponse, SheetData, UpdateSummary } from './interfaces';
+
 type PrepareOutputConfig = {
 	rawData: boolean;
 	dataProperty?: string;
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/methods/listSearch.ts
index fa30a1ead54f9..f4d440c7f7be0 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/methods/listSearch.ts
@@ -4,6 +4,7 @@ import type {
 	INodeListSearchItems,
 	INodeListSearchResult,
 } from 'n8n-workflow';
+
 import { microsoftApiRequest } from '../transport';
 
 export async function searchWorkbooks(
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/methods/loadOptions.ts
index 576f02c8c293c..825ffd32e78eb 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/methods/loadOptions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/methods/loadOptions.ts
@@ -1,4 +1,5 @@
 import type { IDataObject, ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
+
 import { microsoftApiRequest } from '../transport';
 
 export async function getWorksheetColumnRow(
diff --git a/packages/nodes-base/nodes/Microsoft/GraphSecurity/MicrosoftGraphSecurity.node.ts b/packages/nodes-base/nodes/Microsoft/GraphSecurity/MicrosoftGraphSecurity.node.ts
index 0f465b0b523d8..293e84758213c 100644
--- a/packages/nodes-base/nodes/Microsoft/GraphSecurity/MicrosoftGraphSecurity.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/GraphSecurity/MicrosoftGraphSecurity.node.ts
@@ -7,18 +7,17 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import {
-	msGraphSecurityApiRequest,
-	throwOnEmptyUpdate,
-	tolerateDoubleQuotes,
-} from './GenericFunctions';
-
 import {
 	secureScoreControlProfileFields,
 	secureScoreControlProfileOperations,
 	secureScoreFields,
 	secureScoreOperations,
 } from './descriptions';
+import {
+	msGraphSecurityApiRequest,
+	throwOnEmptyUpdate,
+	tolerateDoubleQuotes,
+} from './GenericFunctions';
 
 export class MicrosoftGraphSecurity implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts
index 31381e65e361b..8949db933ce93 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import { DateTime } from 'luxon';
 import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
@@ -8,7 +9,6 @@ import type {
 	IPollFunctions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
-import { DateTime } from 'luxon';
 
 export async function microsoftApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
@@ -41,7 +41,6 @@ export async function microsoftApiRequest(
 		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'microsoftOneDriveOAuth2Api', options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
index bc067531ecfff..555d6faea2e26 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
@@ -8,11 +8,9 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { microsoftApiRequest, microsoftApiRequestAllItems } from './GenericFunctions';
-
 import { fileFields, fileOperations } from './FileDescription';
-
 import { folderFields, folderOperations } from './FolderDescription';
+import { microsoftApiRequest, microsoftApiRequestAllItems } from './GenericFunctions';
 
 export class MicrosoftOneDrive implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDriveTrigger.node.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDriveTrigger.node.ts
index 3c49766adfb38..49bf57c686f4b 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDriveTrigger.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDriveTrigger.node.ts
@@ -1,3 +1,4 @@
+import { DateTime } from 'luxon';
 import {
 	type IPollFunctions,
 	type IDataObject,
@@ -7,9 +8,8 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { DateTime } from 'luxon';
-import { triggerDescription } from './TriggerDescription';
 import { getPath, microsoftApiRequest, microsoftApiRequestAllItemsDelta } from './GenericFunctions';
+import { triggerDescription } from './TriggerDescription';
 
 export class MicrosoftOneDriveTrigger implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/TriggerDescription.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/TriggerDescription.ts
index 3c7c5e2674331..8677a02d86018 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/TriggerDescription.ts
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/TriggerDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { MICROSOFT_DRIVE_FILE_URL_REGEX, MICROSOFT_DRIVE_FOLDER_URL_REGEX } from './constants';
 
 export const fileRLC: INodeProperties = {
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlookTrigger.node.ts b/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlookTrigger.node.ts
index 6c1e6805ff748..b455de45c00f7 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlookTrigger.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlookTrigger.node.ts
@@ -1,3 +1,4 @@
+import { DateTime } from 'luxon';
 import {
 	type IPollFunctions,
 	type INodeExecutionData,
@@ -6,11 +7,8 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { DateTime } from 'luxon';
-
-import { properties as messageProperties } from './trigger/MessageDescription';
-
 import { getPollResponse } from './trigger/GenericFunctions';
+import { properties as messageProperties } from './trigger/MessageDescription';
 import { loadOptions } from './v2/methods';
 
 export class MicrosoftOutlookTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/create.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/create.test.ts
index 234d008fe736f..822f20ca8a59f 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/create.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/create.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/delete.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/delete.test.ts
index 8ec751632f9d3..bf14756f739c1 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/delete.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/delete.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/get.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/get.test.ts
index b579d899550a4..4f8b34c9ead82 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/get.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/get.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/getAll.test.ts
index 1e85bc12b76d0..4c8176a05afa0 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/getAll.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/getAll.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/update.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/update.test.ts
index 2ebea471cf20e..80a2acd1ab9d2 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/update.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/update.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/create.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/create.test.ts
index 364da5918d5b0..0dae646594984 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/create.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/create.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/update.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/update.test.ts
index 13832486e041e..239d8bb42ddcb 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/update.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/update.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/create.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/create.test.ts
index b9ca16b504be9..5f1dccf1ed5a8 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/create.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/create.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/send.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/send.test.ts
index d87f1b66fef05..f88e8b2151ab3 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/send.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/send.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/event/create.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/event/create.test.ts
index 9ac1296aa4aa7..3fec538f0b3ee 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/event/create.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/event/create.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folder/create.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folder/create.test.ts
index bcc5826bea751..f9e2026c9d0ff 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folder/create.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folder/create.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folderMessage/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folderMessage/getAll.test.ts
index 694bb3d103b0e..c97a9895f3f64 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folderMessage/getAll.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folderMessage/getAll.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/move.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/move.test.ts
index ac1415d23c4e3..1673027104c1c 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/move.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/move.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/reply.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/reply.test.ts
index 2f4af23db7d76..c7d106847c07e 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/reply.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/reply.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/send.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/send.test.ts
index cc5b6e5a43dc0..0ce4e7f6747ba 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/send.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/send.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/trigger/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Outlook/trigger/GenericFunctions.ts
index 7999c1b8a56dc..0edbc78796f0f 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/trigger/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/trigger/GenericFunctions.ts
@@ -1,14 +1,13 @@
 import { NodeApiError } from 'n8n-workflow';
 import type { JsonObject, IDataObject, INodeExecutionData, IPollFunctions } from 'n8n-workflow';
 
+import { prepareFilterString, simplifyOutputMessages } from '../v2/helpers/utils';
 import {
 	downloadAttachments,
 	microsoftApiRequest,
 	microsoftApiRequestAllItems,
 } from '../v2/transport';
 
-import { prepareFilterString, simplifyOutputMessages } from '../v2/helpers/utils';
-
 export async function getPollResponse(
 	this: IPollFunctions,
 	pollStartDate: string,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/trigger/MessageDescription.ts b/packages/nodes-base/nodes/Microsoft/Outlook/trigger/MessageDescription.ts
index 7c65cf37bbbc8..6e78e9f83ef1d 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/trigger/MessageDescription.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/trigger/MessageDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { messageFields } from '../v2/helpers/utils';
 
 export const properties: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v1/MicrosoftOutlookV1.node.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v1/MicrosoftOutlookV1.node.ts
index e9f8362116906..e83174ef1a93c 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v1/MicrosoftOutlookV1.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v1/MicrosoftOutlookV1.node.ts
@@ -12,6 +12,12 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
+import { oldVersionNotice } from '@utils/descriptions';
+
+import { draftFields, draftOperations } from './DraftDescription';
+import { draftMessageSharedFields } from './DraftMessageSharedDescription';
+import { folderFields, folderOperations } from './FolderDescription';
+import { folderMessageFields, folderMessageOperations } from './FolderMessageDecription';
 import {
 	createMessage,
 	downloadAttachments,
@@ -19,23 +25,11 @@ import {
 	microsoftApiRequest,
 	microsoftApiRequestAllItems,
 } from './GenericFunctions';
-
-import { draftFields, draftOperations } from './DraftDescription';
-
-import { draftMessageSharedFields } from './DraftMessageSharedDescription';
-
-import { messageFields, messageOperations } from './MessageDescription';
-
 import {
 	messageAttachmentFields,
 	messageAttachmentOperations,
 } from './MessageAttachmentDescription';
-
-import { folderFields, folderOperations } from './FolderDescription';
-
-import { folderMessageFields, folderMessageOperations } from './FolderMessageDecription';
-
-import { oldVersionNotice } from '@utils/descriptions';
+import { messageFields, messageOperations } from './MessageDescription';
 
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Microsoft Outlook',
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/MicrosoftOutlookV2.node.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/MicrosoftOutlookV2.node.ts
index 7ac465f0b2212..481c868b3593e 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/MicrosoftOutlookV2.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/MicrosoftOutlookV2.node.ts
@@ -5,9 +5,9 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import { loadOptions, listSearch } from './methods';
 import { description } from './actions/node.description';
 import { router } from './actions/router';
+import { loadOptions, listSearch } from './methods';
 
 export class MicrosoftOutlookV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/create.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/create.operation.ts
index 87239e12c005e..2bbba5d5d2dac 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/create.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/create.operation.ts
@@ -1,7 +1,9 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { microsoftApiRequest } from '../../transport';
+
 export const properties: INodeProperties[] = [
 	{
 		displayName: 'Name',
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/delete.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/delete.operation.ts
index 11100776764f0..acbe8736a8c73 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/delete.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/delete.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { calendarRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { calendarRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 export const properties: INodeProperties[] = [calendarRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/get.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/get.operation.ts
index 826147db039d2..a237380db4489 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/get.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/get.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { calendarRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { calendarRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 export const properties: INodeProperties[] = [calendarRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/getAll.operation.ts
index e122863905830..3568137445c0a 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/getAll.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
-import { returnAllOrLimit } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { returnAllOrLimit } from '../../descriptions';
+import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
+
 export const properties: INodeProperties[] = [
 	...returnAllOrLimit,
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/index.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/index.ts
index 132fa72b4e862..686b06185ab61 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/index.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/index.ts
@@ -1,8 +1,9 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as create from './create.operation';
+import * as del from './delete.operation';
 import * as get from './get.operation';
 import * as getAll from './getAll.operation';
-import * as del from './delete.operation';
 import * as update from './update.operation';
 
 export { create, del as delete, get, getAll, update };
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/update.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/update.operation.ts
index 0564a5dc9effe..3e3f076e02f4b 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/update.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/update.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { calendarRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { calendarRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 export const properties: INodeProperties[] = [
 	calendarRLC,
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/create.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/create.operation.ts
index 223dbfb378c78..72f3eb97ffbd9 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/create.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/create.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { contactFields } from '../../descriptions';
 import { prepareContactFields } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
-import { contactFields } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/delete.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/delete.operation.ts
index 1037021149a93..ca8537b5cd568 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/delete.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/delete.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { contactRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { contactRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 export const properties: INodeProperties[] = [contactRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/get.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/get.operation.ts
index 6849d04d4644b..a4999f98e3ecd 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/get.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/get.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { contactRLC } from '../../descriptions';
 import { contactFields } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
-import { contactRLC } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	contactRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/getAll.operation.ts
index dec28b9dd73e0..071e358ee869d 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/getAll.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { returnAllOrLimit } from '../../descriptions';
 import { contactFields } from '../../helpers/utils';
 import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
-import { returnAllOrLimit } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	...returnAllOrLimit,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/index.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/index.ts
index 81d2bbcf4ed96..9a7299b29b59c 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/index.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/index.ts
@@ -1,8 +1,9 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as create from './create.operation';
 import * as del from './delete.operation';
-import * as getAll from './getAll.operation';
 import * as get from './get.operation';
+import * as getAll from './getAll.operation';
 import * as update from './update.operation';
 
 export { create, del as delete, get, getAll, update };
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/update.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/update.operation.ts
index 07ffde1fda04b..5ee6a2524ab74 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/update.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/update.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { contactFields, contactRLC } from '../../descriptions';
 import { prepareContactFields } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
-import { contactFields, contactRLC } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	contactRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/create.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/create.operation.ts
index 7f7f7d47715fb..ea0249891e1dd 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/create.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/create.operation.ts
@@ -5,9 +5,11 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { createMessage } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/delete.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/delete.operation.ts
index 1ff992d821450..12e17e6abe288 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/delete.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/delete.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { draftRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { draftRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 export const properties: INodeProperties[] = [draftRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/get.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/get.operation.ts
index d8321768a9059..b82810ac0c9f0 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/get.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/get.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { draftRLC } from '../../descriptions';
 import { messageFields, simplifyOutputMessages } from '../../helpers/utils';
 import { downloadAttachments, microsoftApiRequest } from '../../transport';
-import { draftRLC } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	draftRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/index.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/index.ts
index 9e8cc5cd1118d..a66b3509a3065 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/index.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/index.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as create from './create.operation';
 import * as del from './delete.operation';
 import * as get from './get.operation';
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/send.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/send.operation.ts
index a97d8a12c59e9..cc37dd4d5a6e1 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/send.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/send.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { draftRLC } from '../../descriptions';
 import { makeRecipient } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
-import { draftRLC } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	draftRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/update.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/update.operation.ts
index 9f8f100d13d2a..2be5f9141397a 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/update.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/update.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { draftRLC } from '../../descriptions';
 import { createMessage } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
-import { draftRLC } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	draftRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/create.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/create.operation.ts
index 774110002d00e..f3d87d1f75e5a 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/create.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/create.operation.ts
@@ -1,11 +1,13 @@
-import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
 import { DateTime } from 'luxon';
 import moment from 'moment-timezone';
-import { microsoftApiRequest } from '../../transport';
-import { calendarRLC } from '../../descriptions';
+import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { calendarRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 export const properties: INodeProperties[] = [
 	calendarRLC,
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/delete.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/delete.operation.ts
index b211ef8c1c06a..2fa4311a57029 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/delete.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/delete.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { calendarRLC, eventRLC } from '../../descriptions';
 import { decodeOutlookId } from '../../helpers/utils';
-import { updateDisplayOptions } from '@utils/utilities';
+import { microsoftApiRequest } from '../../transport';
 
 export const properties: INodeProperties[] = [calendarRLC, eventRLC];
 
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/get.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/get.operation.ts
index 54f32d7935509..d3a9107762a5a 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/get.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/get.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { calendarRLC, eventRLC } from '../../descriptions';
 import { decodeOutlookId, eventfields } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
-import { calendarRLC, eventRLC } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	calendarRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/getAll.operation.ts
index 60246daffafc0..85d21ea1e5825 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/getAll.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { calendarRLC, returnAllOrLimit } from '../../descriptions';
 import { eventfields } from '../../helpers/utils';
 import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
-import { calendarRLC, returnAllOrLimit } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/index.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/index.ts
index d2881a1858b2a..a725e64930890 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/index.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/index.ts
@@ -1,8 +1,9 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as create from './create.operation';
+import * as del from './delete.operation';
 import * as get from './get.operation';
 import * as getAll from './getAll.operation';
-import * as del from './delete.operation';
 import * as update from './update.operation';
 
 export { create, del as delete, get, getAll, update };
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/update.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/update.operation.ts
index 12bb952469d1c..362434ed66737 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/update.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/update.operation.ts
@@ -1,10 +1,11 @@
+import { DateTime } from 'luxon';
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
 
-import { DateTime } from 'luxon';
-import { microsoftApiRequest } from '../../transport';
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { calendarRLC, eventRLC } from '../../descriptions';
 import { decodeOutlookId } from '../../helpers/utils';
-import { updateDisplayOptions } from '@utils/utilities';
+import { microsoftApiRequest } from '../../transport';
 
 export const properties: INodeProperties[] = [
 	calendarRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/create.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/create.operation.ts
index 521cdbeae937f..c4e48e5f8838c 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/create.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/create.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { folderRLC } from '../../descriptions';
 import { decodeOutlookId } from '../../helpers/utils';
-import { updateDisplayOptions } from '@utils/utilities';
+import { microsoftApiRequest } from '../../transport';
 
 export const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/delete.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/delete.operation.ts
index 2441cf69e4b95..f50cc5d1e1d1c 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/delete.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/delete.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { folderRLC } from '../../descriptions';
 import { decodeOutlookId } from '../../helpers/utils';
-import { updateDisplayOptions } from '@utils/utilities';
+import { microsoftApiRequest } from '../../transport';
 
 export const properties: INodeProperties[] = [folderRLC];
 
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/get.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/get.operation.ts
index b3f1c9014eec7..362174b0ea04d 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/get.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/get.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { folderFields, folderRLC } from '../../descriptions';
 import { decodeOutlookId } from '../../helpers/utils';
-import { updateDisplayOptions } from '@utils/utilities';
+import { microsoftApiRequest } from '../../transport';
 
 export const properties: INodeProperties[] = [
 	folderRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/getAll.operation.ts
index 91df451340214..265f451986410 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/getAll.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { getSubfolders, microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
-import { folderFields, folderRLC, returnAllOrLimit } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { folderFields, folderRLC, returnAllOrLimit } from '../../descriptions';
+import { getSubfolders, microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
+
 export const properties: INodeProperties[] = [
 	...returnAllOrLimit,
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/index.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/index.ts
index 46fd4c038ffe2..4b210655657ac 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/index.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/index.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as create from './create.operation';
 import * as del from './delete.operation';
 import * as get from './get.operation';
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/update.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/update.operation.ts
index 41322e4961ff7..b3cc85805c09b 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/update.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/update.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { folderRLC } from '../../descriptions';
 import { decodeOutlookId } from '../../helpers/utils';
-import { updateDisplayOptions } from '@utils/utilities';
+import { microsoftApiRequest } from '../../transport';
 
 export const properties: INodeProperties[] = [
 	folderRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folderMessage/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folderMessage/getAll.operation.ts
index eec59b506165f..7280553986948 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folderMessage/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folderMessage/getAll.operation.ts
@@ -4,6 +4,10 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { folderRLC, returnAllOrLimit } from '../../descriptions';
 import {
 	decodeOutlookId,
 	messageFields,
@@ -16,9 +20,6 @@ import {
 	microsoftApiRequestAllItems,
 } from '../../transport';
 
-import { folderRLC, returnAllOrLimit } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
-
 export const properties: INodeProperties[] = [
 	folderRLC,
 	...returnAllOrLimit,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folderMessage/index.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folderMessage/index.ts
index 6e206123789a7..91165e4c7c863 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folderMessage/index.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folderMessage/index.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as getAll from './getAll.operation';
 
 export { getAll };
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/delete.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/delete.operation.ts
index 8ee7511b417cd..71c00cb38d027 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/delete.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/delete.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { messageRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { messageRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 export const properties: INodeProperties[] = [messageRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/get.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/get.operation.ts
index a69ca7efb8d3b..69a65166546dd 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/get.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/get.operation.ts
@@ -5,10 +5,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { messageRLC } from '../../descriptions';
 import { messageFields, simplifyOutputMessages } from '../../helpers/utils';
 import { downloadAttachments, getMimeContent, microsoftApiRequest } from '../../transport';
-import { messageRLC } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	messageRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/getAll.operation.ts
index dad68701e8a30..dba8d41cf5163 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/getAll.operation.ts
@@ -4,14 +4,16 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { returnAllOrLimit } from '../../descriptions';
 import { messageFields, prepareFilterString, simplifyOutputMessages } from '../../helpers/utils';
 import {
 	downloadAttachments,
 	microsoftApiRequest,
 	microsoftApiRequestAllItems,
 } from '../../transport';
-import { returnAllOrLimit } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	...returnAllOrLimit,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/index.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/index.ts
index bc81ba47d1503..4002ed6538f4d 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/index.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/index.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as del from './delete.operation';
 import * as get from './get.operation';
 import * as getAll from './getAll.operation';
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/move.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/move.operation.ts
index 55c0f634e4b7c..5f4900253f965 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/move.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/move.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { folderRLC, messageRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { folderRLC, messageRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 export const properties: INodeProperties[] = [
 	messageRLC,
 	{ ...folderRLC, displayName: 'Parent Folder' },
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/reply.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/reply.operation.ts
index c55f89c96502d..1961cf760ba5c 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/reply.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/reply.operation.ts
@@ -5,10 +5,12 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { messageRLC } from '../../descriptions';
 import { createMessage } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
-import { messageRLC } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	messageRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/send.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/send.operation.ts
index 54b8b5108e925..b9baf4ce124f6 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/send.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/send.operation.ts
@@ -5,9 +5,11 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { createMessage } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/update.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/update.operation.ts
index 18d2114804e87..8d7935294f74d 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/update.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/update.operation.ts
@@ -1,9 +1,11 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { folderRLC, messageRLC } from '../../descriptions';
 import { createMessage, decodeOutlookId } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
-import { folderRLC, messageRLC } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	messageRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/add.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/add.operation.ts
index a2216b7255720..f0145954734f1 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/add.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/add.operation.ts
@@ -6,10 +6,12 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { messageRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { messageRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 export const properties: INodeProperties[] = [
 	messageRLC,
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/download.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/download.operation.ts
index 7892b24ffaec8..89afe6f5eb9be 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/download.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/download.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { attachmentRLC, messageRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { attachmentRLC, messageRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 export const properties: INodeProperties[] = [
 	messageRLC,
 	attachmentRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/get.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/get.operation.ts
index 16d1b4e749491..932d51145d48b 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/get.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/get.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { attachmentRLC, messageRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { attachmentRLC, messageRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 export const properties: INodeProperties[] = [
 	messageRLC,
 	attachmentRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/getAll.operation.ts
index be250c309a305..80a215e67b206 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/getAll.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
-import { messageRLC, returnAllOrLimit } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { messageRLC, returnAllOrLimit } from '../../descriptions';
+import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
+
 export const properties: INodeProperties[] = [
 	messageRLC,
 	...returnAllOrLimit,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/index.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/index.ts
index 24beaf050ec6a..02722102fb9bf 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/index.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/index.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as add from './add.operation';
 import * as download from './download.operation';
 import * as get from './get.operation';
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/node.description.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/node.description.ts
index cbcc328fd0034..50d034968374a 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/node.description.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/node.description.ts
@@ -1,5 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import { NodeConnectionType, type INodeTypeDescription } from 'n8n-workflow';
+
 import * as calendar from './calendar';
 import * as contact from './contact';
 import * as draft from './draft';
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/router.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/router.ts
index d6033e3ec8c0d..7fd67db228047 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/router.ts
@@ -1,7 +1,6 @@
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import type { MicrosoftOutlook } from './node.type';
 import * as calendar from './calendar';
 import * as contact from './contact';
 import * as draft from './draft';
@@ -10,6 +9,7 @@ import * as folder from './folder';
 import * as folderMessage from './folderMessage';
 import * as message from './message';
 import * as messageAttachment from './messageAttachment';
+import type { MicrosoftOutlook } from './node.type';
 
 export async function router(this: IExecuteFunctions) {
 	const items = this.getInputData();
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/methods/listSearch.ts
index c0110ac8bc733..ecdd99bf370a3 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/methods/listSearch.ts
@@ -1,6 +1,7 @@
 import type { IDataObject, ILoadOptionsFunctions, INodeListSearchResult } from 'n8n-workflow';
-import { getSubfolders, microsoftApiRequest } from '../transport';
+
 import { encodeOutlookId } from '../helpers/utils';
+import { getSubfolders, microsoftApiRequest } from '../transport';
 
 async function search(
 	this: ILoadOptionsFunctions,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/methods/loadOptions.ts
index 389d8b49a041b..7e32e8ba0a24b 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/methods/loadOptions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/methods/loadOptions.ts
@@ -1,4 +1,5 @@
 import type { ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
+
 import { getSubfolders, microsoftApiRequestAllItems } from '../transport';
 
 export async function getCategoriesNames(
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/transport/index.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/transport/index.ts
index db85f5b60aa76..ef2d372185021 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/transport/index.ts
@@ -8,6 +8,7 @@ import type {
 	INodeExecutionData,
 	IPollFunctions,
 } from 'n8n-workflow';
+
 import { prepareApiError } from '../helpers/utils';
 
 export async function microsoftApiRequest(
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/create.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/create.test.ts
index 41480285511dd..cea94648c3d85 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/create.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/create.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/deleteChannel.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/deleteChannel.test.ts
index 8e972d8b0df75..dfd97010495fd 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/deleteChannel.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/deleteChannel.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/get.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/get.test.ts
index b7ec5e9e0e2a0..fa54945b7e3fd 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/get.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/get.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/getAll.test.ts
index 1b26d0b8f8705..6ffa8ade53f12 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/getAll.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/getAll.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequestAllItems');
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/update.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/update.test.ts
index f3114f5978660..364b4df799584 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/update.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/update.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/create.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/create.test.ts
index 4cf330bf3e4fd..ec15aa2b136af 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/create.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/create.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/getAll.test.ts
index db13528329d29..8c1152e82d6c7 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/getAll.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/getAll.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequestAllItems');
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/create.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/create.test.ts
index 5fac7c0d662df..305c0069b05a7 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/create.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/create.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/get.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/get.test.ts
index 8f9d2a660f90e..20c20ba4b9f85 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/get.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/get.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/getAll.test.ts
index a4c89a077723c..4d340a763a6c9 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/getAll.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/getAll.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequestAllItems');
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/create.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/create.test.ts
index 2ee3a02f19b32..f550bd075bdde 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/create.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/create.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/deleteTask.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/deleteTask.test.ts
index f991d916978ff..f7694b1cf02e2 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/deleteTask.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/deleteTask.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/get.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/get.test.ts
index 7d768ee2aef39..f70d458efbaf2 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/get.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/get.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/getAll.test.ts
index 0e6f63804e2c0..42ce214d8530d 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/getAll.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/getAll.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 const microsoftApiRequestAllItemsSpy = jest.spyOn(transport, 'microsoftApiRequestAllItems');
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/update.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/update.test.ts
index 3f763dd307fd5..9ec11c99bb55d 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/update.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/update.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v1/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Teams/v1/GenericFunctions.ts
index 0449ead6cb947..b4fe1631f1b74 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v1/GenericFunctions.ts
@@ -32,7 +32,6 @@ export async function microsoftApiRequest(
 		if (Object.keys(headers).length !== 0) {
 			options.headers = Object.assign({}, options.headers, headers);
 		}
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'microsoftTeamsOAuth2Api', options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v1/MicrosoftTeamsV1.node.ts b/packages/nodes-base/nodes/Microsoft/Teams/v1/MicrosoftTeamsV1.node.ts
index 88e4b71357710..c3f4e778e3c5f 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v1/MicrosoftTeamsV1.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v1/MicrosoftTeamsV1.node.ts
@@ -10,20 +10,16 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { oldVersionNotice } from '../../../../utils/descriptions';
+import { channelFields, channelOperations } from './ChannelDescription';
+import { channelMessageFields, channelMessageOperations } from './ChannelMessageDescription';
+import { chatMessageFields, chatMessageOperations } from './ChatMessageDescription';
 import {
 	microsoftApiRequest,
 	microsoftApiRequestAllItems,
 	prepareMessage,
 } from './GenericFunctions';
-
-import { channelFields, channelOperations } from './ChannelDescription';
-
-import { channelMessageFields, channelMessageOperations } from './ChannelMessageDescription';
-
-import { chatMessageFields, chatMessageOperations } from './ChatMessageDescription';
-
 import { taskFields, taskOperations } from './TaskDescription';
+import { oldVersionNotice } from '../../../../utils/descriptions';
 
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Microsoft Teams',
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/MicrosoftTeamsV2.node.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/MicrosoftTeamsV2.node.ts
index c953de95a9de4..fbb54a05a07f6 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/MicrosoftTeamsV2.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/MicrosoftTeamsV2.node.ts
@@ -5,9 +5,9 @@ import type {
 	INodeTypeBaseDescription,
 } from 'n8n-workflow';
 
-import { listSearch } from './methods';
 import { router } from './actions/router';
 import { versionDescription } from './actions/versionDescription';
+import { listSearch } from './methods';
 
 export class MicrosoftTeamsV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/create.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/create.operation.ts
index e41110a0b6342..d40cef0ad7788 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/create.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/create.operation.ts
@@ -1,8 +1,10 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { teamRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { teamRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	teamRLC,
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/deleteChannel.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/deleteChannel.operation.ts
index 29231702734fc..605b6db66a999 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/deleteChannel.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/deleteChannel.operation.ts
@@ -1,8 +1,10 @@
 import { type INodeProperties, type IExecuteFunctions, NodeOperationError } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { channelRLC, teamRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { channelRLC, teamRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [teamRLC, channelRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/get.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/get.operation.ts
index a7954ade2828b..4abeabfc87808 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/get.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/get.operation.ts
@@ -1,8 +1,10 @@
 import { type INodeProperties, type IExecuteFunctions, NodeOperationError } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { channelRLC, teamRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { channelRLC, teamRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [teamRLC, channelRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/getAll.operation.ts
index 3a9ecf1056e86..195caefa9bbc1 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/getAll.operation.ts
@@ -1,8 +1,10 @@
 import type { INodeProperties, IExecuteFunctions } from 'n8n-workflow';
-import { microsoftApiRequestAllItems } from '../../transport';
-import { teamRLC } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
+
 import { returnAllOrLimit } from '@utils/descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { teamRLC } from '../../descriptions';
+import { microsoftApiRequestAllItems } from '../../transport';
 
 const properties: INodeProperties[] = [teamRLC, ...returnAllOrLimit];
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/update.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/update.operation.ts
index a88b19981da0d..22333e16396b0 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/update.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/update.operation.ts
@@ -1,8 +1,10 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { channelRLC, teamRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { channelRLC, teamRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	teamRLC,
 	channelRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channelMessage/create.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channelMessage/create.operation.ts
index 8054bccbd61b8..a32497a9aff92 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channelMessage/create.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channelMessage/create.operation.ts
@@ -1,8 +1,10 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { channelRLC, teamRLC } from '../../descriptions';
 import { prepareMessage } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
-import { channelRLC, teamRLC } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	teamRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channelMessage/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channelMessage/getAll.operation.ts
index 1384b508f34e3..0846673e66cdc 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channelMessage/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channelMessage/getAll.operation.ts
@@ -1,8 +1,10 @@
 import type { INodeProperties, IExecuteFunctions } from 'n8n-workflow';
-import { microsoftApiRequestAllItems } from '../../transport';
-import { channelRLC, teamRLC } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
+
 import { returnAllOrLimit } from '@utils/descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { channelRLC, teamRLC } from '../../descriptions';
+import { microsoftApiRequestAllItems } from '../../transport';
 
 const properties: INodeProperties[] = [teamRLC, channelRLC, ...returnAllOrLimit];
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/create.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/create.operation.ts
index de4cf5dcab07f..afef101ac127a 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/create.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/create.operation.ts
@@ -1,8 +1,10 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { chatRLC } from '../../descriptions';
 import { prepareMessage } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
-import { chatRLC } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	chatRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/get.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/get.operation.ts
index 3aa27f7818af2..68f714b7bfa9d 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/get.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/get.operation.ts
@@ -1,8 +1,10 @@
 import { type INodeProperties, type IExecuteFunctions, NodeOperationError } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { chatRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { chatRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	chatRLC,
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/getAll.operation.ts
index a9ab2767d7607..7d47d3f76efa8 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/getAll.operation.ts
@@ -1,8 +1,10 @@
 import type { INodeProperties, IExecuteFunctions } from 'n8n-workflow';
-import { microsoftApiRequestAllItems } from '../../transport';
-import { chatRLC } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
+
 import { returnAllOrLimit } from '@utils/descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { chatRLC } from '../../descriptions';
+import { microsoftApiRequestAllItems } from '../../transport';
 
 const properties: INodeProperties[] = [chatRLC, ...returnAllOrLimit];
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/router.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/router.ts
index d3111a95e3462..6e4d966b3eaf3 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/router.ts
@@ -5,11 +5,10 @@ import {
 	NodeOperationError,
 } from 'n8n-workflow';
 
-import type { MicrosoftTeamsType } from './node.type';
-
 import * as channel from './channel';
 import * as channelMessage from './channelMessage';
 import * as chatMessage from './chatMessage';
+import type { MicrosoftTeamsType } from './node.type';
 import * as task from './task';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/create.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/create.operation.ts
index 29b7e46e453a9..5b4ed9e610e63 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/create.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/create.operation.ts
@@ -1,8 +1,10 @@
-import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
 import { DateTime } from 'luxon';
+import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { bucketRLC, groupRLC, memberRLC, planRLC } from '../../descriptions';
 import { microsoftApiRequest } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	groupRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/deleteTask.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/deleteTask.operation.ts
index 4873aa777b53f..c52f01f8e63d3 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/deleteTask.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/deleteTask.operation.ts
@@ -1,7 +1,9 @@
 import type { INodeProperties, IExecuteFunctions } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { microsoftApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	{
 		displayName: 'Task ID',
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/get.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/get.operation.ts
index db48178f4d1a9..d2c02630b1d3e 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/get.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/get.operation.ts
@@ -1,7 +1,9 @@
 import type { INodeProperties, IExecuteFunctions } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { microsoftApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	{
 		displayName: 'Task ID',
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/getAll.operation.ts
index d7a2894e19e31..4174d14f7ec42 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/getAll.operation.ts
@@ -1,8 +1,10 @@
 import type { INodeProperties, IExecuteFunctions } from 'n8n-workflow';
+
+import { returnAllOrLimit } from '@utils/descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { groupRLC, planRLC } from '../../descriptions';
 import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
-import { returnAllOrLimit } from '@utils/descriptions';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/update.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/update.operation.ts
index 56522b8a06f3e..016c1f2bc7790 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/update.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/update.operation.ts
@@ -1,8 +1,10 @@
-import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
 import { DateTime } from 'luxon';
+import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { bucketRLC, groupRLC, memberRLC, planRLC } from '../../descriptions';
 import { microsoftApiRequest } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/methods/listSearch.ts
index 3b7c0ba125367..69657408539da 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/methods/listSearch.ts
@@ -6,8 +6,9 @@ import {
 	type INodeListSearchResult,
 	sleep,
 } from 'n8n-workflow';
-import { microsoftApiRequest } from '../transport';
+
 import { filterSortSearchListItems } from '../helpers/utils';
+import { microsoftApiRequest } from '../transport';
 
 export async function getChats(
 	this: ILoadOptionsFunctions,
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/transport/index.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/transport/index.ts
index 4b0e4fb1d4051..4e53faeb76f17 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/transport/index.ts
@@ -7,6 +7,7 @@ import type {
 	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
+
 import { capitalize } from '../../../../../utils/utilities';
 
 export async function microsoftApiRequest(
@@ -32,7 +33,6 @@ export async function microsoftApiRequest(
 		if (Object.keys(headers).length !== 0) {
 			options.headers = Object.assign({}, options.headers, headers);
 		}
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'microsoftTeamsOAuth2Api', options);
 	} catch (error) {
 		const errorOptions: IDataObject = {};
diff --git a/packages/nodes-base/nodes/Microsoft/ToDo/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/ToDo/GenericFunctions.ts
index 4f5e4deb71302..0e21aae05dc93 100644
--- a/packages/nodes-base/nodes/Microsoft/ToDo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/ToDo/GenericFunctions.ts
@@ -35,7 +35,6 @@ export async function microsoftApiRequest(
 		if (Object.keys(body).length === 0) {
 			delete options.body;
 		}
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'microsoftToDoOAuth2Api', options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.ts b/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.ts
index eb8622ee6fe68..390f38d57aab1 100644
--- a/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,14 +10,10 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import { microsoftApiRequest, microsoftApiRequestAllItems } from './GenericFunctions';
-
 import { linkedResourceFields, linkedResourceOperations } from './LinkedResourceDescription';
-
-import { taskFields, taskOperations } from './TaskDescription';
-
 import { listFields, listOperations } from './ListDescription';
+import { taskFields, taskOperations } from './TaskDescription';
 
 export class MicrosoftToDo implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Misp/GenericFunctions.ts b/packages/nodes-base/nodes/Misp/GenericFunctions.ts
index e7e994f174c0b..ecbc398060417 100644
--- a/packages/nodes-base/nodes/Misp/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Misp/GenericFunctions.ts
@@ -1,4 +1,3 @@
-import { URL } from 'url';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -8,6 +7,8 @@ import type {
 	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError, jsonParse } from 'n8n-workflow';
+import { URL } from 'url';
+
 import type { MispCredentials } from './types';
 
 export async function mispApiRequest(
@@ -17,9 +18,7 @@ export async function mispApiRequest(
 	body: IDataObject = {},
 	qs: IDataObject = {},
 ) {
-	const { baseUrl, allowUnauthorizedCerts } = (await this.getCredentials(
-		'mispApi',
-	)) as MispCredentials;
+	const { baseUrl, allowUnauthorizedCerts } = await this.getCredentials<MispCredentials>('mispApi');
 
 	const options: IRequestOptions = {
 		method,
diff --git a/packages/nodes-base/nodes/Misp/Misp.node.ts b/packages/nodes-base/nodes/Misp/Misp.node.ts
index 59ce7b809507d..0e42e15bcf35c 100644
--- a/packages/nodes-base/nodes/Misp/Misp.node.ts
+++ b/packages/nodes-base/nodes/Misp/Misp.node.ts
@@ -8,15 +8,6 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import {
-	mispApiRequest,
-	mispApiRequestAllItems,
-	mispApiRestSearch,
-	throwOnEmptyUpdate,
-	throwOnInvalidUrl,
-	throwOnMissingSharingGroup,
-} from './GenericFunctions';
-
 import {
 	attributeFields,
 	attributeOperations,
@@ -41,7 +32,14 @@ import {
 	warninglistFields,
 	warninglistOperations,
 } from './descriptions';
-
+import {
+	mispApiRequest,
+	mispApiRequestAllItems,
+	mispApiRestSearch,
+	throwOnEmptyUpdate,
+	throwOnInvalidUrl,
+	throwOnMissingSharingGroup,
+} from './GenericFunctions';
 import type { LoadedOrgs, LoadedSharingGroups, LoadedTags, LoadedUsers } from './types';
 
 export class Misp implements INodeType {
diff --git a/packages/nodes-base/nodes/Misp/descriptions/AttributeDescription.ts b/packages/nodes-base/nodes/Misp/descriptions/AttributeDescription.ts
index a04d76eb112d7..27e4de28cdc25 100644
--- a/packages/nodes-base/nodes/Misp/descriptions/AttributeDescription.ts
+++ b/packages/nodes-base/nodes/Misp/descriptions/AttributeDescription.ts
@@ -1,6 +1,7 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { updateDisplayOptions } from '../../../utils/utilities';
+
 import { searchProperties } from './common.descriptions';
+import { updateDisplayOptions } from '../../../utils/utilities';
 
 const searchDisplayOptions = {
 	show: {
diff --git a/packages/nodes-base/nodes/Misp/descriptions/EventDescription.ts b/packages/nodes-base/nodes/Misp/descriptions/EventDescription.ts
index 94d2a1a1e5247..62a7a24010346 100644
--- a/packages/nodes-base/nodes/Misp/descriptions/EventDescription.ts
+++ b/packages/nodes-base/nodes/Misp/descriptions/EventDescription.ts
@@ -1,6 +1,7 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { updateDisplayOptions } from '../../../utils/utilities';
+
 import { searchProperties } from './common.descriptions';
+import { updateDisplayOptions } from '../../../utils/utilities';
 
 const searchDisplayOptions = {
 	show: {
diff --git a/packages/nodes-base/nodes/Misp/descriptions/ObjectDescription.ts b/packages/nodes-base/nodes/Misp/descriptions/ObjectDescription.ts
index ad38ede1c8554..f65e438951b15 100644
--- a/packages/nodes-base/nodes/Misp/descriptions/ObjectDescription.ts
+++ b/packages/nodes-base/nodes/Misp/descriptions/ObjectDescription.ts
@@ -1,6 +1,7 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { updateDisplayOptions } from '../../../utils/utilities';
+
 import { searchProperties } from './common.descriptions';
+import { updateDisplayOptions } from '../../../utils/utilities';
 
 const searchDisplayOptions = {
 	show: {
diff --git a/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts b/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts
index ff993c7d1c6ca..24d5a71c070c8 100644
--- a/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
@@ -9,8 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
 export async function mondayComApiRequest(
 	this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions,
 	body: any = {},
diff --git a/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts b/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts
index c84cd9d87274c..a9064ae047f74 100644
--- a/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts
+++ b/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts
@@ -1,3 +1,5 @@
+import { snakeCase } from 'change-case';
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -7,23 +9,17 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
+import { boardColumnFields, boardColumnOperations } from './BoardColumnDescription';
+import { boardFields, boardOperations } from './BoardDescription';
+import { boardGroupFields, boardGroupOperations } from './BoardGroupDescription';
+import { boardItemFields, boardItemOperations } from './BoardItemDescription';
 import {
 	mondayComApiPaginatedRequest,
 	mondayComApiRequest,
 	mondayComApiRequestAllItems,
 } from './GenericFunctions';
 
-import { boardFields, boardOperations } from './BoardDescription';
-
-import { boardColumnFields, boardColumnOperations } from './BoardColumnDescription';
-
-import { boardGroupFields, boardGroupOperations } from './BoardGroupDescription';
-
-import { boardItemFields, boardItemOperations } from './BoardItemDescription';
-
 interface IGraphqlBody {
 	query: string;
 	variables: IDataObject;
diff --git a/packages/nodes-base/nodes/MongoDb/GenericFunctions.ts b/packages/nodes-base/nodes/MongoDb/GenericFunctions.ts
index 3fda2c1f26336..68edc03e1dcc5 100644
--- a/packages/nodes-base/nodes/MongoDb/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MongoDb/GenericFunctions.ts
@@ -1,21 +1,21 @@
-import { createSecureContext } from 'tls';
+import get from 'lodash/get';
+import set from 'lodash/set';
+import { MongoClient, ObjectId } from 'mongodb';
+import { NodeOperationError } from 'n8n-workflow';
 import type {
 	ICredentialDataDecryptedObject,
 	IDataObject,
 	IExecuteFunctions,
 	INodeExecutionData,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
+import { createSecureContext } from 'tls';
 
-import get from 'lodash/get';
-import set from 'lodash/set';
-import { MongoClient, ObjectId } from 'mongodb';
-import { formatPrivateKey } from '../../utils/utilities';
 import type {
 	IMongoCredentials,
 	IMongoCredentialsType,
 	IMongoParametricCredentials,
 } from './mongoDb.types';
+import { formatPrivateKey } from '../../utils/utilities';
 
 /**
  * Standard way of building the MongoDB connection string, unless overridden with a provided string
diff --git a/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts b/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
index 14d8718b92f92..349e56fd43c48 100644
--- a/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
+++ b/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
@@ -1,3 +1,11 @@
+import type {
+	FindOneAndReplaceOptions,
+	FindOneAndUpdateOptions,
+	UpdateOptions,
+	Sort,
+} from 'mongodb';
+import { ObjectId } from 'mongodb';
+import { ApplicationError, NodeConnectionType } from 'n8n-workflow';
 import type {
 	IExecuteFunctions,
 	ICredentialsDecrypted,
@@ -9,17 +17,6 @@ import type {
 	INodeTypeDescription,
 	JsonObject,
 } from 'n8n-workflow';
-import { ApplicationError, NodeConnectionType } from 'n8n-workflow';
-
-import type {
-	FindOneAndReplaceOptions,
-	FindOneAndUpdateOptions,
-	UpdateOptions,
-	Sort,
-} from 'mongodb';
-import { ObjectId } from 'mongodb';
-import { generatePairedItemData } from '../../utils/utilities';
-import { nodeProperties } from './MongoDbProperties';
 
 import {
 	buildParameterizedConnString,
@@ -29,8 +26,9 @@ import {
 	stringifyObjectIDs,
 	validateAndResolveMongoCredentials,
 } from './GenericFunctions';
-
 import type { IMongoParametricCredentials } from './mongoDb.types';
+import { nodeProperties } from './MongoDbProperties';
+import { generatePairedItemData } from '../../utils/utilities';
 
 export class MongoDb implements INodeType {
 	description: INodeTypeDescription = {
@@ -210,7 +208,11 @@ export class MongoDb implements INodeType {
 						query = query.sort(sort);
 					}
 
-					if (projection && projection instanceof Document) {
+					if (
+						projection &&
+						Object.keys(projection).length !== 0 &&
+						projection.constructor === Object
+					) {
 						query = query.project(projection);
 					}
 
diff --git a/packages/nodes-base/nodes/MonicaCrm/MonicaCrm.node.ts b/packages/nodes-base/nodes/MonicaCrm/MonicaCrm.node.ts
index 32ef253ef816c..30bb08789bb95 100644
--- a/packages/nodes-base/nodes/MonicaCrm/MonicaCrm.node.ts
+++ b/packages/nodes-base/nodes/MonicaCrm/MonicaCrm.node.ts
@@ -8,13 +8,6 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import {
-	getDateParts,
-	monicaCrmApiRequest,
-	monicaCrmApiRequestAllItems,
-	toOptions,
-} from './GenericFunctions';
-
 import {
 	activityFields,
 	activityOperations,
@@ -41,7 +34,12 @@ import {
 	taskFields,
 	taskOperations,
 } from './descriptions';
-
+import {
+	getDateParts,
+	monicaCrmApiRequest,
+	monicaCrmApiRequestAllItems,
+	toOptions,
+} from './GenericFunctions';
 import type { LoaderGetResponse, Option } from './types';
 
 export class MonicaCrm implements INodeType {
diff --git a/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.ts b/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.ts
index fa2597a341d70..0c379ad591284 100644
--- a/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.ts
+++ b/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.ts
@@ -1,7 +1,7 @@
+import iconv from 'iconv-lite';
 import get from 'lodash/get';
 import set from 'lodash/set';
 import unset from 'lodash/unset';
-
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -18,8 +18,6 @@ import {
 	NodeOperationError,
 } from 'n8n-workflow';
 
-import iconv from 'iconv-lite';
-
 iconv.encodingExists('utf8');
 
 // Create options for bomAware and encoding
diff --git a/packages/nodes-base/nodes/MoveBinaryData/test/MoveBinaryData.test.ts b/packages/nodes-base/nodes/MoveBinaryData/test/MoveBinaryData.test.ts
index 698284f9be081..087c1f461ccc6 100644
--- a/packages/nodes-base/nodes/MoveBinaryData/test/MoveBinaryData.test.ts
+++ b/packages/nodes-base/nodes/MoveBinaryData/test/MoveBinaryData.test.ts
@@ -1,8 +1,9 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
 import path from 'path';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import * as Helpers from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 
 describe('Test Move Binary Data Node', () => {
 	beforeEach(async () => {
diff --git a/packages/nodes-base/nodes/MySql/test/v1/executeQuery.test.ts b/packages/nodes-base/nodes/MySql/test/v1/executeQuery.test.ts
index 55c4007edae54..b9dff77153135 100644
--- a/packages/nodes-base/nodes/MySql/test/v1/executeQuery.test.ts
+++ b/packages/nodes-base/nodes/MySql/test/v1/executeQuery.test.ts
@@ -1,9 +1,9 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 
 const queryMock = jest.fn(async function () {
 	return [{ success: true }];
diff --git a/packages/nodes-base/nodes/MySql/test/v2/operations.test.ts b/packages/nodes-base/nodes/MySql/test/v2/operations.test.ts
index 359c21c465c2f..97ba52cc77e3e 100644
--- a/packages/nodes-base/nodes/MySql/test/v2/operations.test.ts
+++ b/packages/nodes-base/nodes/MySql/test/v2/operations.test.ts
@@ -1,17 +1,16 @@
+import mysql2 from 'mysql2/promise';
 import type { IDataObject, INode } from 'n8n-workflow';
 
-import mysql2 from 'mysql2/promise';
-import * as deleteTable from '../../v2/actions/database/deleteTable.operation';
+import { createMockExecuteFunction } from '@test/nodes/Helpers';
 
+import * as deleteTable from '../../v2/actions/database/deleteTable.operation';
 import * as executeQuery from '../../v2/actions/database/executeQuery.operation';
 import * as insert from '../../v2/actions/database/insert.operation';
 import * as select from '../../v2/actions/database/select.operation';
 import * as update from '../../v2/actions/database/update.operation';
 import * as upsert from '../../v2/actions/database/upsert.operation';
-
 import type { Mysql2Pool, QueryRunner } from '../../v2/helpers/interfaces';
 import { configureQueryRunner } from '../../v2/helpers/utils';
-import { createMockExecuteFunction } from '@test/nodes/Helpers';
 
 const mySqlMockNode: INode = {
 	id: '1',
diff --git a/packages/nodes-base/nodes/MySql/test/v2/runQueries.test.ts b/packages/nodes-base/nodes/MySql/test/v2/runQueries.test.ts
index b84a5cf66bc2f..3b07456a96c90 100644
--- a/packages/nodes-base/nodes/MySql/test/v2/runQueries.test.ts
+++ b/packages/nodes-base/nodes/MySql/test/v2/runQueries.test.ts
@@ -1,11 +1,12 @@
-import type { IDataObject, INode } from 'n8n-workflow';
 import mysql2 from 'mysql2/promise';
-import { configureQueryRunner } from '../../v2/helpers/utils';
-import type { Mysql2Pool, QueryRunner } from '../../v2/helpers/interfaces';
-import { BATCH_MODE } from '../../v2/helpers/interfaces';
+import type { IDataObject, INode } from 'n8n-workflow';
 
 import { createMockExecuteFunction } from '@test/nodes/Helpers';
 
+import type { Mysql2Pool, QueryRunner } from '../../v2/helpers/interfaces';
+import { BATCH_MODE } from '../../v2/helpers/interfaces';
+import { configureQueryRunner } from '../../v2/helpers/utils';
+
 const mySqlMockNode: INode = {
 	id: '1',
 	name: 'MySQL node',
diff --git a/packages/nodes-base/nodes/MySql/test/v2/utils.test.ts b/packages/nodes-base/nodes/MySql/test/v2/utils.test.ts
index 92bfa58ed0862..0fb385488ff4e 100644
--- a/packages/nodes-base/nodes/MySql/test/v2/utils.test.ts
+++ b/packages/nodes-base/nodes/MySql/test/v2/utils.test.ts
@@ -1,6 +1,6 @@
 import type { INode } from 'n8n-workflow';
-import type { SortRule, WhereClause } from '../../v2/helpers/interfaces';
 
+import type { SortRule, WhereClause } from '../../v2/helpers/interfaces';
 import {
 	prepareQueryAndReplacements,
 	wrapData,
diff --git a/packages/nodes-base/nodes/MySql/v1/GenericFunctions.ts b/packages/nodes-base/nodes/MySql/v1/GenericFunctions.ts
index 0cdf6ce19d45e..68b35a980d779 100644
--- a/packages/nodes-base/nodes/MySql/v1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MySql/v1/GenericFunctions.ts
@@ -1,10 +1,10 @@
+import mysql2 from 'mysql2/promise';
 import type {
 	ICredentialDataDecryptedObject,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeListSearchResult,
 } from 'n8n-workflow';
-import mysql2 from 'mysql2/promise';
 
 export async function createConnection(
 	credentials: ICredentialDataDecryptedObject,
diff --git a/packages/nodes-base/nodes/MySql/v1/MySqlV1.node.ts b/packages/nodes-base/nodes/MySql/v1/MySqlV1.node.ts
index 6209111b67bae..977c37b3a6a9b 100644
--- a/packages/nodes-base/nodes/MySql/v1/MySqlV1.node.ts
+++ b/packages/nodes-base/nodes/MySql/v1/MySqlV1.node.ts
@@ -1,3 +1,4 @@
+import type mysql2 from 'mysql2/promise';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
@@ -12,13 +13,11 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import type mysql2 from 'mysql2/promise';
-
-import { createConnection, searchTables } from './GenericFunctions';
-
 import { oldVersionNotice } from '@utils/descriptions';
 import { getResolvables } from '@utils/utilities';
 
+import { createConnection, searchTables } from './GenericFunctions';
+
 const versionDescription: INodeTypeDescription = {
 	displayName: 'MySQL',
 	name: 'mySql',
diff --git a/packages/nodes-base/nodes/MySql/v2/MySqlV2.node.ts b/packages/nodes-base/nodes/MySql/v2/MySqlV2.node.ts
index 2adf717a5c212..f14a7f0b74d7b 100644
--- a/packages/nodes-base/nodes/MySql/v2/MySqlV2.node.ts
+++ b/packages/nodes-base/nodes/MySql/v2/MySqlV2.node.ts
@@ -6,11 +6,9 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import { listSearch, credentialTest, loadOptions } from './methods';
-
-import { versionDescription } from './actions/versionDescription';
-
 import { router } from './actions/router';
+import { versionDescription } from './actions/versionDescription';
+import { listSearch, credentialTest, loadOptions } from './methods';
 
 export class MySqlV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/MySql/v2/actions/common.descriptions.ts b/packages/nodes-base/nodes/MySql/v2/actions/common.descriptions.ts
index 6591e62233bc0..0cc86008a6d59 100644
--- a/packages/nodes-base/nodes/MySql/v2/actions/common.descriptions.ts
+++ b/packages/nodes-base/nodes/MySql/v2/actions/common.descriptions.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { BATCH_MODE, SINGLE } from '../helpers/interfaces';
 
 export const tableRLC: INodeProperties = {
diff --git a/packages/nodes-base/nodes/MySql/v2/actions/database/Database.resource.ts b/packages/nodes-base/nodes/MySql/v2/actions/database/Database.resource.ts
index 90e07ae7d27db..88e93664e036a 100644
--- a/packages/nodes-base/nodes/MySql/v2/actions/database/Database.resource.ts
+++ b/packages/nodes-base/nodes/MySql/v2/actions/database/Database.resource.ts
@@ -1,12 +1,12 @@
 import type { INodeProperties } from 'n8n-workflow';
 
-import { tableRLC } from '../common.descriptions';
 import * as deleteTable from './deleteTable.operation';
 import * as executeQuery from './executeQuery.operation';
 import * as insert from './insert.operation';
 import * as select from './select.operation';
 import * as update from './update.operation';
 import * as upsert from './upsert.operation';
+import { tableRLC } from '../common.descriptions';
 
 export { deleteTable, executeQuery, insert, select, update, upsert };
 
diff --git a/packages/nodes-base/nodes/MySql/v2/actions/database/deleteTable.operation.ts b/packages/nodes-base/nodes/MySql/v2/actions/database/deleteTable.operation.ts
index 3b725739774c0..385c9eb93fcae 100644
--- a/packages/nodes-base/nodes/MySql/v2/actions/database/deleteTable.operation.ts
+++ b/packages/nodes-base/nodes/MySql/v2/actions/database/deleteTable.operation.ts
@@ -6,21 +6,20 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import type {
 	QueryRunner,
 	QueryValues,
 	QueryWithValues,
 	WhereClause,
 } from '../../helpers/interfaces';
-
 import { addWhereClauses, escapeSqlIdentifier } from '../../helpers/utils';
-
 import {
 	optionsCollection,
 	selectRowsFixedCollection,
 	combineConditionsCollection,
 } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/MySql/v2/actions/database/executeQuery.operation.ts b/packages/nodes-base/nodes/MySql/v2/actions/database/executeQuery.operation.ts
index 9af1b9eaa3872..8991f4590e035 100644
--- a/packages/nodes-base/nodes/MySql/v2/actions/database/executeQuery.operation.ts
+++ b/packages/nodes-base/nodes/MySql/v2/actions/database/executeQuery.operation.ts
@@ -6,12 +6,11 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import type { QueryRunner, QueryWithValues } from '../../helpers/interfaces';
+import { getResolvables, updateDisplayOptions } from '@utils/utilities';
 
+import type { QueryRunner, QueryWithValues } from '../../helpers/interfaces';
 import { prepareQueryAndReplacements, replaceEmptyStringsByNulls } from '../../helpers/utils';
-
 import { optionsCollection } from '../common.descriptions';
-import { getResolvables, updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/MySql/v2/actions/database/insert.operation.ts b/packages/nodes-base/nodes/MySql/v2/actions/database/insert.operation.ts
index 5ff05181ed70a..4646b73a0055b 100644
--- a/packages/nodes-base/nodes/MySql/v2/actions/database/insert.operation.ts
+++ b/packages/nodes-base/nodes/MySql/v2/actions/database/insert.operation.ts
@@ -5,19 +5,17 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import type {
 	QueryMode,
 	QueryRunner,
 	QueryValues,
 	QueryWithValues,
 } from '../../helpers/interfaces';
-
 import { AUTO_MAP, BATCH_MODE, DATA_MODE } from '../../helpers/interfaces';
-
 import { escapeSqlIdentifier, replaceEmptyStringsByNulls } from '../../helpers/utils';
-
 import { optionsCollection } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/MySql/v2/actions/database/select.operation.ts b/packages/nodes-base/nodes/MySql/v2/actions/database/select.operation.ts
index 7b16574f7510f..d8d5341c3688a 100644
--- a/packages/nodes-base/nodes/MySql/v2/actions/database/select.operation.ts
+++ b/packages/nodes-base/nodes/MySql/v2/actions/database/select.operation.ts
@@ -5,6 +5,8 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import type {
 	QueryRunner,
 	QueryValues,
@@ -12,16 +14,13 @@ import type {
 	SortRule,
 	WhereClause,
 } from '../../helpers/interfaces';
-
 import { addSortRules, addWhereClauses, escapeSqlIdentifier } from '../../helpers/utils';
-
 import {
 	optionsCollection,
 	sortFixedCollection,
 	selectRowsFixedCollection,
 	combineConditionsCollection,
 } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/MySql/v2/actions/database/update.operation.ts b/packages/nodes-base/nodes/MySql/v2/actions/database/update.operation.ts
index 62ba0c23ab83b..e21cf8ee3ab94 100644
--- a/packages/nodes-base/nodes/MySql/v2/actions/database/update.operation.ts
+++ b/packages/nodes-base/nodes/MySql/v2/actions/database/update.operation.ts
@@ -5,13 +5,12 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import type { QueryRunner, QueryValues, QueryWithValues } from '../../helpers/interfaces';
 import { AUTO_MAP, DATA_MODE } from '../../helpers/interfaces';
-
 import { escapeSqlIdentifier, replaceEmptyStringsByNulls } from '../../helpers/utils';
-
 import { optionsCollection } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/MySql/v2/actions/database/upsert.operation.ts b/packages/nodes-base/nodes/MySql/v2/actions/database/upsert.operation.ts
index 7009edecc2c0b..746441188bf22 100644
--- a/packages/nodes-base/nodes/MySql/v2/actions/database/upsert.operation.ts
+++ b/packages/nodes-base/nodes/MySql/v2/actions/database/upsert.operation.ts
@@ -5,13 +5,12 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import type { QueryRunner, QueryValues, QueryWithValues } from '../../helpers/interfaces';
 import { AUTO_MAP, DATA_MODE } from '../../helpers/interfaces';
-
 import { escapeSqlIdentifier, replaceEmptyStringsByNulls } from '../../helpers/utils';
-
 import { optionsCollection } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/MySql/v2/actions/router.ts b/packages/nodes-base/nodes/MySql/v2/actions/router.ts
index e9ef6a8591460..722d9bb06fab2 100644
--- a/packages/nodes-base/nodes/MySql/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/MySql/v2/actions/router.ts
@@ -1,11 +1,11 @@
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { createPool } from '../transport';
-import type { MysqlNodeCredentials, QueryRunner } from '../helpers/interfaces';
-import { configureQueryRunner } from '../helpers/utils';
 import * as database from './database/Database.resource';
 import type { MySqlType } from './node.type';
+import type { MysqlNodeCredentials, QueryRunner } from '../helpers/interfaces';
+import { configureQueryRunner } from '../helpers/utils';
+import { createPool } from '../transport';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	let returnData: INodeExecutionData[] = [];
diff --git a/packages/nodes-base/nodes/MySql/v2/helpers/utils.ts b/packages/nodes-base/nodes/MySql/v2/helpers/utils.ts
index 60df3545282bd..7d7bbda262ef9 100644
--- a/packages/nodes-base/nodes/MySql/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/MySql/v2/helpers/utils.ts
@@ -6,10 +6,8 @@ import type {
 	IPairedItemData,
 	NodeExecutionWithMetadata,
 } from 'n8n-workflow';
-
 import { NodeOperationError } from 'n8n-workflow';
 
-import { generatePairedItemData } from '../../../../utils/utilities';
 import type {
 	Mysql2Pool,
 	QueryMode,
@@ -18,8 +16,8 @@ import type {
 	SortRule,
 	WhereClause,
 } from './interfaces';
-
 import { BATCH_MODE } from './interfaces';
+import { generatePairedItemData } from '../../../../utils/utilities';
 
 export function escapeSqlIdentifier(identifier: string): string {
 	const parts = identifier.match(/(`[^`]*`|[^.`]+)/g) ?? [];
diff --git a/packages/nodes-base/nodes/MySql/v2/methods/credentialTest.ts b/packages/nodes-base/nodes/MySql/v2/methods/credentialTest.ts
index b89e18f691906..0a8bb34d51f3c 100644
--- a/packages/nodes-base/nodes/MySql/v2/methods/credentialTest.ts
+++ b/packages/nodes-base/nodes/MySql/v2/methods/credentialTest.ts
@@ -4,8 +4,8 @@ import type {
 	INodeCredentialTestResult,
 } from 'n8n-workflow';
 
-import { createPool } from '../transport';
 import type { MysqlNodeCredentials } from '../helpers/interfaces';
+import { createPool } from '../transport';
 
 export async function mysqlConnectionTest(
 	this: ICredentialTestFunctions,
diff --git a/packages/nodes-base/nodes/MySql/v2/methods/listSearch.ts b/packages/nodes-base/nodes/MySql/v2/methods/listSearch.ts
index bf4af6b612082..65ec2f5306790 100644
--- a/packages/nodes-base/nodes/MySql/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/MySql/v2/methods/listSearch.ts
@@ -1,6 +1,7 @@
 import type { IDataObject, ILoadOptionsFunctions, INodeListSearchResult } from 'n8n-workflow';
-import { createPool } from '../transport';
+
 import type { MysqlNodeCredentials } from '../helpers/interfaces';
+import { createPool } from '../transport';
 
 export async function searchTables(this: ILoadOptionsFunctions): Promise<INodeListSearchResult> {
 	const credentials = await this.getCredentials<MysqlNodeCredentials>('mySql');
diff --git a/packages/nodes-base/nodes/MySql/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/MySql/v2/methods/loadOptions.ts
index f74da247ab9d9..08aa444b0f9e2 100644
--- a/packages/nodes-base/nodes/MySql/v2/methods/loadOptions.ts
+++ b/packages/nodes-base/nodes/MySql/v2/methods/loadOptions.ts
@@ -1,7 +1,8 @@
 import type { IDataObject, ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
-import { createPool } from '../transport';
-import { escapeSqlIdentifier } from '../helpers/utils';
+
 import type { MysqlNodeCredentials } from '../helpers/interfaces';
+import { escapeSqlIdentifier } from '../helpers/utils';
+import { createPool } from '../transport';
 
 export async function getColumns(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 	const credentials = await this.getCredentials<MysqlNodeCredentials>('mySql');
diff --git a/packages/nodes-base/nodes/MySql/v2/transport/index.ts b/packages/nodes-base/nodes/MySql/v2/transport/index.ts
index ca7d55bcb64a6..49b6434f1248d 100644
--- a/packages/nodes-base/nodes/MySql/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/MySql/v2/transport/index.ts
@@ -1,4 +1,3 @@
-import { createServer, type AddressInfo } from 'node:net';
 import mysql2 from 'mysql2/promise';
 import type {
 	ICredentialTestFunctions,
@@ -6,10 +5,12 @@ import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
 } from 'n8n-workflow';
+import { createServer, type AddressInfo } from 'node:net';
 
-import type { Mysql2Pool, MysqlNodeCredentials } from '../helpers/interfaces';
-import { formatPrivateKey } from '@utils/utilities';
 import { LOCALHOST } from '@utils/constants';
+import { formatPrivateKey } from '@utils/utilities';
+
+import type { Mysql2Pool, MysqlNodeCredentials } from '../helpers/interfaces';
 
 export async function createPool(
 	this: IExecuteFunctions | ICredentialTestFunctions | ILoadOptionsFunctions,
diff --git a/packages/nodes-base/nodes/N8n/CredentialDescription.ts b/packages/nodes-base/nodes/N8n/CredentialDescription.ts
index fa701d081537d..6ca1ef502beca 100644
--- a/packages/nodes-base/nodes/N8n/CredentialDescription.ts
+++ b/packages/nodes-base/nodes/N8n/CredentialDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { parseAndSetBodyJson } from './GenericFunctions';
 
 export const credentialOperations: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/N8n/ExecutionDescription.ts b/packages/nodes-base/nodes/N8n/ExecutionDescription.ts
index b37184c77201d..e4c7eaf854a17 100644
--- a/packages/nodes-base/nodes/N8n/ExecutionDescription.ts
+++ b/packages/nodes-base/nodes/N8n/ExecutionDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { getCursorPaginator } from './GenericFunctions';
 import { workflowIdLocator } from './WorkflowLocator';
 
diff --git a/packages/nodes-base/nodes/N8n/N8n.node.ts b/packages/nodes-base/nodes/N8n/N8n.node.ts
index a58c8551645a0..12e976af7399d 100644
--- a/packages/nodes-base/nodes/N8n/N8n.node.ts
+++ b/packages/nodes-base/nodes/N8n/N8n.node.ts
@@ -1,4 +1,5 @@
 import { NodeConnectionType, type INodeType, type INodeTypeDescription } from 'n8n-workflow';
+
 import { auditFields, auditOperations } from './AuditDescription';
 import { credentialFields, credentialOperations } from './CredentialDescription';
 import { executionFields, executionOperations } from './ExecutionDescription';
diff --git a/packages/nodes-base/nodes/N8n/WorkflowDescription.ts b/packages/nodes-base/nodes/N8n/WorkflowDescription.ts
index 20a97719b0f0d..9b8d4360b7b6b 100644
--- a/packages/nodes-base/nodes/N8n/WorkflowDescription.ts
+++ b/packages/nodes-base/nodes/N8n/WorkflowDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import {
 	getCursorPaginator,
 	parseAndSetBodyJson,
diff --git a/packages/nodes-base/nodes/N8n/WorkflowLocator.ts b/packages/nodes-base/nodes/N8n/WorkflowLocator.ts
index 612a12c275e9c..7b55435231dfa 100644
--- a/packages/nodes-base/nodes/N8n/WorkflowLocator.ts
+++ b/packages/nodes-base/nodes/N8n/WorkflowLocator.ts
@@ -1,4 +1,5 @@
 import type { ILoadOptionsFunctions, INodeListSearchResult, INodeProperties } from 'n8n-workflow';
+
 import { apiRequestAllItems } from './GenericFunctions';
 
 type DataItemsResponse<T> = {
diff --git a/packages/nodes-base/nodes/N8n/test/node/N8n.test.ts b/packages/nodes-base/nodes/N8n/test/node/N8n.test.ts
index e4b0b4d930365..d4776686627c0 100644
--- a/packages/nodes-base/nodes/N8n/test/node/N8n.test.ts
+++ b/packages/nodes-base/nodes/N8n/test/node/N8n.test.ts
@@ -1,9 +1,8 @@
-import nock from 'nock';
 import type { INodeTypes } from 'n8n-workflow';
-import { setup, workflowToTests, getWorkflowFilenames } from '@test/nodes/Helpers';
+import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
-
+import { setup, workflowToTests, getWorkflowFilenames } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
 
 describe('Test N8n Node, expect base_url to be received from credentials', () => {
diff --git a/packages/nodes-base/nodes/Nasa/Nasa.node.ts b/packages/nodes-base/nodes/Nasa/Nasa.node.ts
index 70884650094b5..36e33e5ed34fd 100644
--- a/packages/nodes-base/nodes/Nasa/Nasa.node.ts
+++ b/packages/nodes-base/nodes/Nasa/Nasa.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -7,7 +8,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import { nasaApiRequest, nasaApiRequestAllItems } from './GenericFunctions';
 
 export class Nasa implements INodeType {
diff --git a/packages/nodes-base/nodes/Netlify/Netlify.node.ts b/packages/nodes-base/nodes/Netlify/Netlify.node.ts
index c2f6f9332087d..43894ea1303a2 100644
--- a/packages/nodes-base/nodes/Netlify/Netlify.node.ts
+++ b/packages/nodes-base/nodes/Netlify/Netlify.node.ts
@@ -9,10 +9,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { netlifyApiRequest, netlifyRequestAllItems } from './GenericFunctions';
-
 import { deployFields, deployOperations } from './DeployDescription';
-
+import { netlifyApiRequest, netlifyRequestAllItems } from './GenericFunctions';
 import { siteFields, siteOperations } from './SiteDescription';
 
 export class Netlify implements INodeType {
diff --git a/packages/nodes-base/nodes/Netlify/NetlifyTrigger.node.ts b/packages/nodes-base/nodes/Netlify/NetlifyTrigger.node.ts
index 4723001318dce..ac8b6b529491a 100644
--- a/packages/nodes-base/nodes/Netlify/NetlifyTrigger.node.ts
+++ b/packages/nodes-base/nodes/Netlify/NetlifyTrigger.node.ts
@@ -1,3 +1,4 @@
+import { snakeCase } from 'change-case';
 import type {
 	IHookFunctions,
 	IWebhookFunctions,
@@ -10,7 +11,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
 import { netlifyApiRequest } from './GenericFunctions';
 
 export class NetlifyTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Netscaler/ADC/NetscalerAdc.node.ts b/packages/nodes-base/nodes/Netscaler/ADC/NetscalerAdc.node.ts
index 2f7fff154dc48..19b067b0276fa 100644
--- a/packages/nodes-base/nodes/Netscaler/ADC/NetscalerAdc.node.ts
+++ b/packages/nodes-base/nodes/Netscaler/ADC/NetscalerAdc.node.ts
@@ -9,11 +9,9 @@ import {
 	type JsonObject,
 } from 'n8n-workflow';
 
-import { netscalerADCApiRequest } from './GenericFunctions';
-
-import { fileDescription } from './FileDescription';
-
 import { certificateDescription } from './CertificateDescription';
+import { fileDescription } from './FileDescription';
+import { netscalerADCApiRequest } from './GenericFunctions';
 
 export class NetscalerAdc implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts b/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
index 9a710c2a9c830..bcae490194bba 100644
--- a/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
+++ b/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
@@ -1,4 +1,3 @@
-import { URLSearchParams } from 'url';
 import type {
 	IBinaryKeyData,
 	IDataObject,
@@ -10,11 +9,11 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-
+import { URLSearchParams } from 'url';
 import { parseString } from 'xml2js';
 
-import { wrapData } from '../../utils/utilities';
 import { nextCloudApiRequest } from './GenericFunctions';
+import { wrapData } from '../../utils/utilities';
 
 export class NextCloud implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts b/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts
index 0cadbc5b1d6df..77775f082ba8f 100644
--- a/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts
+++ b/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts
@@ -12,7 +12,6 @@ import type {
 import { NodeApiError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
 import { apiRequest, apiRequestAllItems, downloadRecordAttachments } from './GenericFunctions';
-
 import { operationFields } from './OperationDescription';
 
 export class NocoDB implements INodeType {
diff --git a/packages/nodes-base/nodes/Notion/NotionTrigger.node.ts b/packages/nodes-base/nodes/Notion/NotionTrigger.node.ts
index 49079c3c81514..3d83fed7f1c47 100644
--- a/packages/nodes-base/nodes/Notion/NotionTrigger.node.ts
+++ b/packages/nodes-base/nodes/Notion/NotionTrigger.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import {
 	type IPollFunctions,
 	type IDataObject,
@@ -7,16 +8,14 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-import { notionApiRequest, simplifyObjects } from './shared/GenericFunctions';
-
-import { listSearch } from './shared/methods';
 import {
 	databaseUrlExtractionRegexp,
 	databaseUrlValidationRegexp,
 	idExtractionRegexp,
 	idValidationRegexp,
 } from './shared/constants';
+import { notionApiRequest, simplifyObjects } from './shared/GenericFunctions';
+import { listSearch } from './shared/methods';
 
 export class NotionTrigger implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Notion/shared/GenericFunctions.ts b/packages/nodes-base/nodes/Notion/shared/GenericFunctions.ts
index bf483b66a0867..b7404b04007a1 100644
--- a/packages/nodes-base/nodes/Notion/shared/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Notion/shared/GenericFunctions.ts
@@ -1,3 +1,6 @@
+import { camelCase, capitalCase, snakeCase } from 'change-case';
+import set from 'lodash/set';
+import moment from 'moment-timezone';
 import type {
 	IBinaryKeyData,
 	IDataObject,
@@ -16,15 +19,10 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
-
-import { camelCase, capitalCase, snakeCase } from 'change-case';
-
-import moment from 'moment-timezone';
-
 import { validate as uuidValidate } from 'uuid';
-import set from 'lodash/set';
-import { filters } from './descriptions/Filters';
+
 import { blockUrlExtractionRegexp, databasePageUrlValidationRegexp } from './constants';
+import { filters } from './descriptions/Filters';
 
 function uuidValidateWithoutDashes(this: IExecuteFunctions, value: string) {
 	if (uuidValidate(value)) return true;
diff --git a/packages/nodes-base/nodes/Notion/shared/descriptions/Blocks.ts b/packages/nodes-base/nodes/Notion/shared/descriptions/Blocks.ts
index 3b49e23fbe991..59f4560162760 100644
--- a/packages/nodes-base/nodes/Notion/shared/descriptions/Blocks.ts
+++ b/packages/nodes-base/nodes/Notion/shared/descriptions/Blocks.ts
@@ -1,4 +1,5 @@
 import type { IDisplayOptions, INodeProperties } from 'n8n-workflow';
+
 import {
 	databaseUrlExtractionRegexp,
 	databaseUrlValidationRegexp,
diff --git a/packages/nodes-base/nodes/Notion/shared/descriptions/DatabaseDescription.ts b/packages/nodes-base/nodes/Notion/shared/descriptions/DatabaseDescription.ts
index f814139603b91..81dc932f0a71f 100644
--- a/packages/nodes-base/nodes/Notion/shared/descriptions/DatabaseDescription.ts
+++ b/packages/nodes-base/nodes/Notion/shared/descriptions/DatabaseDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import {
 	databaseUrlExtractionRegexp,
 	databaseUrlValidationRegexp,
diff --git a/packages/nodes-base/nodes/Notion/shared/descriptions/DatabasePageDescription.ts b/packages/nodes-base/nodes/Notion/shared/descriptions/DatabasePageDescription.ts
index 1a590457da26e..581863f87f645 100644
--- a/packages/nodes-base/nodes/Notion/shared/descriptions/DatabasePageDescription.ts
+++ b/packages/nodes-base/nodes/Notion/shared/descriptions/DatabasePageDescription.ts
@@ -1,9 +1,6 @@
 import type { INodeProperties } from 'n8n-workflow';
 
-import { getConditions, getSearchFilters } from '../GenericFunctions';
-
 import { blocks, text } from './Blocks';
-
 import { filters } from './Filters';
 import {
 	databaseUrlExtractionRegexp,
@@ -13,6 +10,7 @@ import {
 	idExtractionRegexp,
 	idValidationRegexp,
 } from '../constants';
+import { getConditions, getSearchFilters } from '../GenericFunctions';
 
 export const databasePageOperations: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Notion/shared/methods/listSearch.ts b/packages/nodes-base/nodes/Notion/shared/methods/listSearch.ts
index 1caba20dcff65..557f77052f9b5 100644
--- a/packages/nodes-base/nodes/Notion/shared/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Notion/shared/methods/listSearch.ts
@@ -4,6 +4,7 @@ import type {
 	INodeListSearchItems,
 	INodeListSearchResult,
 } from 'n8n-workflow';
+
 import { notionApiRequestAllItems } from '../GenericFunctions';
 
 export async function getDatabases(
diff --git a/packages/nodes-base/nodes/Notion/test/GenericFunctions.test.ts b/packages/nodes-base/nodes/Notion/test/GenericFunctions.test.ts
index 1250a0231ae02..5db400afa2ab0 100644
--- a/packages/nodes-base/nodes/Notion/test/GenericFunctions.test.ts
+++ b/packages/nodes-base/nodes/Notion/test/GenericFunctions.test.ts
@@ -1,9 +1,10 @@
+import type { MockProxy } from 'jest-mock-extended';
+import { mock } from 'jest-mock-extended';
 import type { IExecuteFunctions, INode, INodeParameterResourceLocator } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
 import { databasePageUrlExtractionRegexp } from '../shared/constants';
 import { extractPageId, formatBlocks, getPageId } from '../shared/GenericFunctions';
-import type { MockProxy } from 'jest-mock-extended';
-import { mock } from 'jest-mock-extended';
 
 describe('Test NotionV2, formatBlocks', () => {
 	it('should format to_do block', () => {
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/block/append.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/block/append.test.ts
new file mode 100644
index 0000000000000..5bd576ae4c947
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/block/append.test.ts
@@ -0,0 +1,445 @@
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+const API_RESPONSE = {
+	object: 'list',
+	results: [
+		{
+			object: 'block',
+			id: '15bfb9cb-4cf0-8162-bd53-fc201157675f',
+			parent: {
+				type: 'block_id',
+				block_id: '90e03468-f8aa-4576-95da-02ccad963040',
+			},
+			created_time: '2024-12-13T03:40:00.000Z',
+			last_edited_time: '2024-12-13T03:40:00.000Z',
+			created_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			last_edited_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			has_children: false,
+			archived: false,
+			in_trash: false,
+			type: 'paragraph',
+			paragraph: {
+				color: 'default',
+				text: [
+					{
+						type: 'text',
+						text: {
+							content: 'new text',
+							link: null,
+						},
+						annotations: {
+							bold: false,
+							italic: false,
+							strikethrough: false,
+							underline: false,
+							code: false,
+							color: 'default',
+						},
+						plain_text: 'new text',
+						href: null,
+					},
+				],
+			},
+		},
+		{
+			object: 'block',
+			id: '15bfb9cb-4cf0-8104-8d3f-c8ca8919e791',
+			parent: {
+				type: 'block_id',
+				block_id: '90e03468-f8aa-4576-95da-02ccad963040',
+			},
+			created_time: '2024-12-13T03:40:00.000Z',
+			last_edited_time: '2024-12-13T03:40:00.000Z',
+			created_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			last_edited_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			has_children: false,
+			archived: false,
+			in_trash: false,
+			type: 'heading_1',
+			heading_1: {
+				is_toggleable: false,
+				color: 'default',
+				text: [
+					{
+						type: 'text',
+						text: {
+							content: 'h1',
+							link: null,
+						},
+						annotations: {
+							bold: false,
+							italic: false,
+							strikethrough: false,
+							underline: false,
+							code: false,
+							color: 'default',
+						},
+						plain_text: 'h1',
+						href: null,
+					},
+				],
+			},
+		},
+		{
+			object: 'block',
+			id: '15bfb9cb-4cf0-814d-b4ad-f65a2c558bb9',
+			parent: {
+				type: 'block_id',
+				block_id: '90e03468-f8aa-4576-95da-02ccad963040',
+			},
+			created_time: '2024-12-13T03:40:00.000Z',
+			last_edited_time: '2024-12-13T03:40:00.000Z',
+			created_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			last_edited_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			has_children: false,
+			archived: false,
+			in_trash: false,
+			type: 'heading_2',
+			heading_2: {
+				is_toggleable: false,
+				color: 'default',
+				text: [
+					{
+						type: 'text',
+						text: {
+							content: 'h2',
+							link: null,
+						},
+						annotations: {
+							bold: false,
+							italic: false,
+							strikethrough: false,
+							underline: false,
+							code: false,
+							color: 'default',
+						},
+						plain_text: 'h2',
+						href: null,
+					},
+				],
+			},
+		},
+		{
+			object: 'block',
+			id: '15bfb9cb-4cf0-8135-9e43-f3f8a21e2e86',
+			parent: {
+				type: 'block_id',
+				block_id: '90e03468-f8aa-4576-95da-02ccad963040',
+			},
+			created_time: '2024-12-13T03:40:00.000Z',
+			last_edited_time: '2024-12-13T03:40:00.000Z',
+			created_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			last_edited_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			has_children: false,
+			archived: false,
+			in_trash: false,
+			type: 'heading_3',
+			heading_3: {
+				is_toggleable: false,
+				color: 'default',
+				text: [
+					{
+						type: 'text',
+						text: {
+							content: 'h3',
+							link: null,
+						},
+						annotations: {
+							bold: false,
+							italic: false,
+							strikethrough: false,
+							underline: false,
+							code: false,
+							color: 'default',
+						},
+						plain_text: 'h3',
+						href: null,
+					},
+				],
+			},
+		},
+		{
+			object: 'block',
+			id: '15bfb9cb-4cf0-816b-9457-efba183a957c',
+			parent: {
+				type: 'block_id',
+				block_id: '90e03468-f8aa-4576-95da-02ccad963040',
+			},
+			created_time: '2024-12-13T03:40:00.000Z',
+			last_edited_time: '2024-12-13T03:40:00.000Z',
+			created_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			last_edited_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			has_children: false,
+			archived: false,
+			in_trash: false,
+			type: 'toggle',
+			toggle: {
+				color: 'default',
+				text: [
+					{
+						type: 'text',
+						text: {
+							content: 'toggle',
+							link: null,
+						},
+						annotations: {
+							bold: false,
+							italic: false,
+							strikethrough: false,
+							underline: false,
+							code: false,
+							color: 'default',
+						},
+						plain_text: 'toggle',
+						href: null,
+					},
+				],
+			},
+		},
+		{
+			object: 'block',
+			id: '15bfb9cb-4cf0-814f-9928-ed87ed0d9470',
+			parent: {
+				type: 'block_id',
+				block_id: '90e03468-f8aa-4576-95da-02ccad963040',
+			},
+			created_time: '2024-12-13T03:40:00.000Z',
+			last_edited_time: '2024-12-13T03:40:00.000Z',
+			created_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			last_edited_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			has_children: false,
+			archived: false,
+			in_trash: false,
+			type: 'to_do',
+			to_do: {
+				checked: false,
+				color: 'default',
+				text: [
+					{
+						type: 'text',
+						text: {
+							content: 'todo',
+							link: null,
+						},
+						annotations: {
+							bold: false,
+							italic: false,
+							strikethrough: false,
+							underline: false,
+							code: false,
+							color: 'default',
+						},
+						plain_text: 'todo',
+						href: null,
+					},
+				],
+			},
+		},
+		{
+			object: 'block',
+			id: '15bfb9cb-4cf0-812d-95e9-dc8ddc3153dd',
+			parent: {
+				type: 'block_id',
+				block_id: '90e03468-f8aa-4576-95da-02ccad963040',
+			},
+			created_time: '2024-12-13T03:40:00.000Z',
+			last_edited_time: '2024-12-13T03:40:00.000Z',
+			created_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			last_edited_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			has_children: false,
+			archived: false,
+			in_trash: false,
+			type: 'bulleted_list_item',
+			bulleted_list_item: {
+				color: 'default',
+				text: [
+					{
+						type: 'text',
+						text: {
+							content: 'bullet 1',
+							link: null,
+						},
+						annotations: {
+							bold: false,
+							italic: false,
+							strikethrough: false,
+							underline: false,
+							code: false,
+							color: 'default',
+						},
+						plain_text: 'bullet 1',
+						href: null,
+					},
+				],
+			},
+		},
+		{
+			object: 'block',
+			id: '15bfb9cb-4cf0-8106-9a25-d3859984ce34',
+			parent: {
+				type: 'block_id',
+				block_id: '90e03468-f8aa-4576-95da-02ccad963040',
+			},
+			created_time: '2024-12-13T03:40:00.000Z',
+			last_edited_time: '2024-12-13T03:40:00.000Z',
+			created_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			last_edited_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			has_children: false,
+			archived: false,
+			in_trash: false,
+			type: 'numbered_list_item',
+			numbered_list_item: {
+				color: 'default',
+				text: [
+					{
+						type: 'text',
+						text: {
+							content: 'point 1',
+							link: null,
+						},
+						annotations: {
+							bold: false,
+							italic: false,
+							strikethrough: false,
+							underline: false,
+							code: false,
+							color: 'default',
+						},
+						plain_text: 'point 1',
+						href: null,
+					},
+				],
+			},
+		},
+		{
+			object: 'block',
+			id: '15bfb9cb-4cf0-81b1-a6f1-eac377c4d163',
+			parent: {
+				type: 'block_id',
+				block_id: '90e03468-f8aa-4576-95da-02ccad963040',
+			},
+			created_time: '2024-12-13T03:40:00.000Z',
+			last_edited_time: '2024-12-13T03:40:00.000Z',
+			created_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			last_edited_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			has_children: false,
+			archived: false,
+			in_trash: false,
+			type: 'paragraph',
+			paragraph: {
+				color: 'default',
+				text: [
+					{
+						type: 'text',
+						text: {
+							content: '',
+							link: null,
+						},
+						annotations: {
+							bold: false,
+							italic: false,
+							strikethrough: false,
+							underline: false,
+							code: false,
+							color: 'default',
+						},
+						plain_text: '',
+						href: null,
+					},
+				],
+			},
+		},
+	],
+	next_cursor: null,
+	has_more: false,
+	request_id: '33358f1b-fc4d-4387-8d95-43c7d03519a5',
+};
+
+jest.mock('../../../../shared/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../shared/GenericFunctions');
+	return {
+		...originalModule,
+		notionApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'PATCH') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test NotionV2, block => append', () => {
+	const workflows = ['nodes/Notion/test/node/v2/block/append.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../shared/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/block/append.workflow.json b/packages/nodes-base/nodes/Notion/test/node/v2/block/append.workflow.json
new file mode 100644
index 0000000000000..413962cbce846
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/block/append.workflow.json
@@ -0,0 +1,535 @@
+{
+	"name": "tests notion",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "4260fdbd-e92f-4712-8114-38b85f8289ea",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "block",
+				"blockId": {
+					"__rl": true,
+					"value": "https://www.notion.so/Block-Test-88188cbb303e4f44847f27d24bd7ad8e?pvs=4#90e03468f8aa457695da02ccad963040",
+					"mode": "url"
+				},
+				"blockUi": {
+					"blockValues": [
+						{
+							"richText": true,
+							"text": {
+								"text": [
+									{
+										"text": "new text",
+										"annotationUi": {}
+									}
+								]
+							}
+						},
+						{
+							"type": "heading_1",
+							"textContent": "h1"
+						},
+						{
+							"type": "heading_2",
+							"textContent": "h2"
+						},
+						{
+							"type": "heading_3",
+							"textContent": "h3"
+						},
+						{
+							"type": "toggle",
+							"textContent": "toggle"
+						},
+						{
+							"type": "to_do",
+							"textContent": "todo"
+						},
+						{
+							"type": "bulleted_list_item",
+							"textContent": "bullet 1"
+						},
+						{
+							"type": "numbered_list_item",
+							"textContent": "point 1"
+						},
+						{}
+					]
+				}
+			},
+			"id": "5ab80e6a-c9c4-4cc5-9332-2fc7a3f8ae24",
+			"name": "Notion",
+			"type": "n8n-nodes-base.notion",
+			"typeVersion": 2.2,
+			"position": [1040, 360],
+			"credentials": {
+				"notionApi": {
+					"id": "CiZXWkDmjiZzpcL1",
+					"name": "Notion account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "a664f506-72a5-4e50-80b4-97ed2e6eb334",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"object": "list",
+					"results": [
+						{
+							"object": "block",
+							"id": "15bfb9cb-4cf0-8162-bd53-fc201157675f",
+							"parent": {
+								"type": "block_id",
+								"block_id": "90e03468-f8aa-4576-95da-02ccad963040"
+							},
+							"created_time": "2024-12-13T03:40:00.000Z",
+							"last_edited_time": "2024-12-13T03:40:00.000Z",
+							"created_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"last_edited_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"has_children": false,
+							"archived": false,
+							"in_trash": false,
+							"type": "paragraph",
+							"paragraph": {
+								"color": "default",
+								"text": [
+									{
+										"type": "text",
+										"text": {
+											"content": "new text",
+											"link": null
+										},
+										"annotations": {
+											"bold": false,
+											"italic": false,
+											"strikethrough": false,
+											"underline": false,
+											"code": false,
+											"color": "default"
+										},
+										"plain_text": "new text",
+										"href": null
+									}
+								]
+							}
+						},
+						{
+							"object": "block",
+							"id": "15bfb9cb-4cf0-8104-8d3f-c8ca8919e791",
+							"parent": {
+								"type": "block_id",
+								"block_id": "90e03468-f8aa-4576-95da-02ccad963040"
+							},
+							"created_time": "2024-12-13T03:40:00.000Z",
+							"last_edited_time": "2024-12-13T03:40:00.000Z",
+							"created_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"last_edited_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"has_children": false,
+							"archived": false,
+							"in_trash": false,
+							"type": "heading_1",
+							"heading_1": {
+								"is_toggleable": false,
+								"color": "default",
+								"text": [
+									{
+										"type": "text",
+										"text": {
+											"content": "h1",
+											"link": null
+										},
+										"annotations": {
+											"bold": false,
+											"italic": false,
+											"strikethrough": false,
+											"underline": false,
+											"code": false,
+											"color": "default"
+										},
+										"plain_text": "h1",
+										"href": null
+									}
+								]
+							}
+						},
+						{
+							"object": "block",
+							"id": "15bfb9cb-4cf0-814d-b4ad-f65a2c558bb9",
+							"parent": {
+								"type": "block_id",
+								"block_id": "90e03468-f8aa-4576-95da-02ccad963040"
+							},
+							"created_time": "2024-12-13T03:40:00.000Z",
+							"last_edited_time": "2024-12-13T03:40:00.000Z",
+							"created_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"last_edited_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"has_children": false,
+							"archived": false,
+							"in_trash": false,
+							"type": "heading_2",
+							"heading_2": {
+								"is_toggleable": false,
+								"color": "default",
+								"text": [
+									{
+										"type": "text",
+										"text": {
+											"content": "h2",
+											"link": null
+										},
+										"annotations": {
+											"bold": false,
+											"italic": false,
+											"strikethrough": false,
+											"underline": false,
+											"code": false,
+											"color": "default"
+										},
+										"plain_text": "h2",
+										"href": null
+									}
+								]
+							}
+						},
+						{
+							"object": "block",
+							"id": "15bfb9cb-4cf0-8135-9e43-f3f8a21e2e86",
+							"parent": {
+								"type": "block_id",
+								"block_id": "90e03468-f8aa-4576-95da-02ccad963040"
+							},
+							"created_time": "2024-12-13T03:40:00.000Z",
+							"last_edited_time": "2024-12-13T03:40:00.000Z",
+							"created_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"last_edited_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"has_children": false,
+							"archived": false,
+							"in_trash": false,
+							"type": "heading_3",
+							"heading_3": {
+								"is_toggleable": false,
+								"color": "default",
+								"text": [
+									{
+										"type": "text",
+										"text": {
+											"content": "h3",
+											"link": null
+										},
+										"annotations": {
+											"bold": false,
+											"italic": false,
+											"strikethrough": false,
+											"underline": false,
+											"code": false,
+											"color": "default"
+										},
+										"plain_text": "h3",
+										"href": null
+									}
+								]
+							}
+						},
+						{
+							"object": "block",
+							"id": "15bfb9cb-4cf0-816b-9457-efba183a957c",
+							"parent": {
+								"type": "block_id",
+								"block_id": "90e03468-f8aa-4576-95da-02ccad963040"
+							},
+							"created_time": "2024-12-13T03:40:00.000Z",
+							"last_edited_time": "2024-12-13T03:40:00.000Z",
+							"created_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"last_edited_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"has_children": false,
+							"archived": false,
+							"in_trash": false,
+							"type": "toggle",
+							"toggle": {
+								"color": "default",
+								"text": [
+									{
+										"type": "text",
+										"text": {
+											"content": "toggle",
+											"link": null
+										},
+										"annotations": {
+											"bold": false,
+											"italic": false,
+											"strikethrough": false,
+											"underline": false,
+											"code": false,
+											"color": "default"
+										},
+										"plain_text": "toggle",
+										"href": null
+									}
+								]
+							}
+						},
+						{
+							"object": "block",
+							"id": "15bfb9cb-4cf0-814f-9928-ed87ed0d9470",
+							"parent": {
+								"type": "block_id",
+								"block_id": "90e03468-f8aa-4576-95da-02ccad963040"
+							},
+							"created_time": "2024-12-13T03:40:00.000Z",
+							"last_edited_time": "2024-12-13T03:40:00.000Z",
+							"created_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"last_edited_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"has_children": false,
+							"archived": false,
+							"in_trash": false,
+							"type": "to_do",
+							"to_do": {
+								"checked": false,
+								"color": "default",
+								"text": [
+									{
+										"type": "text",
+										"text": {
+											"content": "todo",
+											"link": null
+										},
+										"annotations": {
+											"bold": false,
+											"italic": false,
+											"strikethrough": false,
+											"underline": false,
+											"code": false,
+											"color": "default"
+										},
+										"plain_text": "todo",
+										"href": null
+									}
+								]
+							}
+						},
+						{
+							"object": "block",
+							"id": "15bfb9cb-4cf0-812d-95e9-dc8ddc3153dd",
+							"parent": {
+								"type": "block_id",
+								"block_id": "90e03468-f8aa-4576-95da-02ccad963040"
+							},
+							"created_time": "2024-12-13T03:40:00.000Z",
+							"last_edited_time": "2024-12-13T03:40:00.000Z",
+							"created_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"last_edited_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"has_children": false,
+							"archived": false,
+							"in_trash": false,
+							"type": "bulleted_list_item",
+							"bulleted_list_item": {
+								"color": "default",
+								"text": [
+									{
+										"type": "text",
+										"text": {
+											"content": "bullet 1",
+											"link": null
+										},
+										"annotations": {
+											"bold": false,
+											"italic": false,
+											"strikethrough": false,
+											"underline": false,
+											"code": false,
+											"color": "default"
+										},
+										"plain_text": "bullet 1",
+										"href": null
+									}
+								]
+							}
+						},
+						{
+							"object": "block",
+							"id": "15bfb9cb-4cf0-8106-9a25-d3859984ce34",
+							"parent": {
+								"type": "block_id",
+								"block_id": "90e03468-f8aa-4576-95da-02ccad963040"
+							},
+							"created_time": "2024-12-13T03:40:00.000Z",
+							"last_edited_time": "2024-12-13T03:40:00.000Z",
+							"created_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"last_edited_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"has_children": false,
+							"archived": false,
+							"in_trash": false,
+							"type": "numbered_list_item",
+							"numbered_list_item": {
+								"color": "default",
+								"text": [
+									{
+										"type": "text",
+										"text": {
+											"content": "point 1",
+											"link": null
+										},
+										"annotations": {
+											"bold": false,
+											"italic": false,
+											"strikethrough": false,
+											"underline": false,
+											"code": false,
+											"color": "default"
+										},
+										"plain_text": "point 1",
+										"href": null
+									}
+								]
+							}
+						},
+						{
+							"object": "block",
+							"id": "15bfb9cb-4cf0-81b1-a6f1-eac377c4d163",
+							"parent": {
+								"type": "block_id",
+								"block_id": "90e03468-f8aa-4576-95da-02ccad963040"
+							},
+							"created_time": "2024-12-13T03:40:00.000Z",
+							"last_edited_time": "2024-12-13T03:40:00.000Z",
+							"created_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"last_edited_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"has_children": false,
+							"archived": false,
+							"in_trash": false,
+							"type": "paragraph",
+							"paragraph": {
+								"color": "default",
+								"text": [
+									{
+										"type": "text",
+										"text": {
+											"content": "",
+											"link": null
+										},
+										"annotations": {
+											"bold": false,
+											"italic": false,
+											"strikethrough": false,
+											"underline": false,
+											"code": false,
+											"color": "default"
+										},
+										"plain_text": "",
+										"href": null
+									}
+								]
+							}
+						}
+					],
+					"next_cursor": null,
+					"has_more": false,
+					"request_id": "33358f1b-fc4d-4387-8d95-43c7d03519a5"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Notion",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Notion": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "87575721-cf21-472f-a9f0-24aa31c8100f",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "Ucav6QC99JNMCkd3",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/block/getAll.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/block/getAll.test.ts
new file mode 100644
index 0000000000000..a482d97a06235
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/block/getAll.test.ts
@@ -0,0 +1,241 @@
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+const API_RESPONSE = [
+	{
+		object: 'block',
+		id: 'b14bdaaf-b7e9-48c9-a7fa-1b9e1e2092ae',
+		parent: {
+			type: 'block_id',
+			block_id: '90e03468-f8aa-4576-95da-02ccad963040',
+		},
+		created_time: '2023-11-23T10:42:00.000Z',
+		last_edited_time: '2024-12-13T03:35:00.000Z',
+		created_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		last_edited_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		has_children: true,
+		archived: false,
+		in_trash: false,
+		type: 'toggle',
+		toggle: {
+			color: 'default',
+			text: [
+				{
+					type: 'text',
+					text: {
+						content: 'Drop down First',
+						link: null,
+					},
+					annotations: {
+						bold: false,
+						italic: false,
+						strikethrough: false,
+						underline: false,
+						code: false,
+						color: 'default',
+					},
+					plain_text: 'Drop down First',
+					href: null,
+				},
+			],
+		},
+	},
+	{
+		object: 'block',
+		id: 'de572f5d-ff5c-4c13-a879-efc20fe47db0',
+		parent: {
+			type: 'block_id',
+			block_id: '90e03468-f8aa-4576-95da-02ccad963040',
+		},
+		created_time: '2023-11-23T10:42:00.000Z',
+		last_edited_time: '2024-03-11T12:39:00.000Z',
+		created_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		last_edited_by: {
+			object: 'user',
+			id: 'f215e49c-4677-40c0-9adc-87440d341324',
+		},
+		has_children: true,
+		archived: false,
+		in_trash: false,
+		type: 'bulleted_list_item',
+		bulleted_list_item: {
+			color: 'default',
+			text: [
+				{
+					type: 'text',
+					text: {
+						content: 'Bullet Point Second',
+						link: null,
+					},
+					annotations: {
+						bold: false,
+						italic: false,
+						strikethrough: false,
+						underline: false,
+						code: false,
+						color: 'default',
+					},
+					plain_text: 'Bullet Point Second',
+					href: null,
+				},
+			],
+		},
+	},
+	{
+		object: 'block',
+		id: 'c98cf981-c967-47f5-9948-4aa1be9ce9d0',
+		parent: {
+			type: 'block_id',
+			block_id: '90e03468-f8aa-4576-95da-02ccad963040',
+		},
+		created_time: '2023-11-24T04:41:00.000Z',
+		last_edited_time: '2024-12-13T03:35:00.000Z',
+		created_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		last_edited_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		has_children: false,
+		archived: false,
+		in_trash: false,
+		type: 'heading_2',
+		heading_2: {
+			is_toggleable: false,
+			color: 'default',
+			text: [
+				{
+					type: 'text',
+					text: {
+						content: 'Hello World',
+						link: null,
+					},
+					annotations: {
+						bold: false,
+						italic: false,
+						strikethrough: false,
+						underline: false,
+						code: false,
+						color: 'default',
+					},
+					plain_text: 'Hello World',
+					href: null,
+				},
+			],
+		},
+	},
+	{
+		object: 'block',
+		id: '527a0555-a486-401e-93a8-19819615c132',
+		parent: {
+			type: 'block_id',
+			block_id: '90e03468-f8aa-4576-95da-02ccad963040',
+		},
+		created_time: '2023-11-23T10:42:00.000Z',
+		last_edited_time: '2023-11-23T10:43:00.000Z',
+		created_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		last_edited_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		has_children: false,
+		archived: false,
+		in_trash: false,
+		type: 'child_page',
+		child_page: {
+			title: 'Page Third',
+		},
+	},
+	{
+		object: 'block',
+		id: '15bfb9cb-4cf0-81b1-a6f1-eac377c4d163',
+		parent: {
+			type: 'block_id',
+			block_id: '90e03468-f8aa-4576-95da-02ccad963040',
+		},
+		created_time: '2024-12-13T03:40:00.000Z',
+		last_edited_time: '2024-12-13T06:15:00.000Z',
+		created_by: {
+			object: 'user',
+			id: 'f215e49c-4677-40c0-9adc-87440d341324',
+		},
+		last_edited_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		has_children: false,
+		archived: false,
+		in_trash: false,
+		type: 'paragraph',
+		paragraph: {
+			color: 'default',
+			text: [
+				{
+					type: 'text',
+					text: {
+						content: '',
+						link: null,
+					},
+					annotations: {
+						bold: false,
+						italic: false,
+						strikethrough: false,
+						underline: false,
+						code: false,
+						color: 'default',
+					},
+					plain_text: '',
+					href: null,
+				},
+			],
+		},
+	},
+];
+
+jest.mock('../../../../shared/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../shared/GenericFunctions');
+	return {
+		...originalModule,
+		notionApiRequestAllItems: jest.fn(async function (_: string, method: IHttpRequestMethods) {
+			if (method === 'GET') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test NotionV2, block => getAll', () => {
+	const workflows = ['nodes/Notion/test/node/v2/block/getAll.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../shared/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/block/getAll.workflow.json b/packages/nodes-base/nodes/Notion/test/node/v2/block/getAll.workflow.json
new file mode 100644
index 0000000000000..9d4c041365b14
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/block/getAll.workflow.json
@@ -0,0 +1,188 @@
+{
+	"name": "tests notion",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "4260fdbd-e92f-4712-8114-38b85f8289ea",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "block",
+				"operation": "getAll",
+				"blockId": {
+					"__rl": true,
+					"value": "https://www.notion.so/Block-Test-88188cbb303e4f44847f27d24bd7ad8e?pvs=4#90e03468f8aa457695da02ccad963040",
+					"mode": "url"
+				},
+				"returnAll": true
+			},
+			"id": "5ab80e6a-c9c4-4cc5-9332-2fc7a3f8ae24",
+			"name": "Notion",
+			"type": "n8n-nodes-base.notion",
+			"typeVersion": 2.2,
+			"position": [1040, 360],
+			"credentials": {
+				"notionApi": {
+					"id": "CiZXWkDmjiZzpcL1",
+					"name": "Notion account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "a664f506-72a5-4e50-80b4-97ed2e6eb334",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"object": "block",
+					"parent_id": "90e03468f8aa457695da02ccad963040",
+					"id": "b14bdaaf-b7e9-48c9-a7fa-1b9e1e2092ae",
+					"parent": {
+						"type": "block_id",
+						"block_id": "90e03468-f8aa-4576-95da-02ccad963040"
+					},
+					"last_edited_by": {
+						"object": "user",
+						"id": "88f72c1a-07ed-4bae-9fa0-231365d813d9"
+					},
+					"has_children": true,
+					"archived": false,
+					"in_trash": false,
+					"type": "toggle",
+					"root_id": "90e03468f8aa457695da02ccad963040",
+					"content": "Drop down First"
+				}
+			},
+			{
+				"json": {
+					"object": "block",
+					"parent_id": "90e03468f8aa457695da02ccad963040",
+					"id": "de572f5d-ff5c-4c13-a879-efc20fe47db0",
+					"parent": {
+						"type": "block_id",
+						"block_id": "90e03468-f8aa-4576-95da-02ccad963040"
+					},
+					"last_edited_by": {
+						"object": "user",
+						"id": "f215e49c-4677-40c0-9adc-87440d341324"
+					},
+					"has_children": true,
+					"archived": false,
+					"in_trash": false,
+					"type": "bulleted_list_item",
+					"root_id": "90e03468f8aa457695da02ccad963040",
+					"content": "Bullet Point Second"
+				}
+			},
+			{
+				"json": {
+					"object": "block",
+					"parent_id": "90e03468f8aa457695da02ccad963040",
+					"id": "c98cf981-c967-47f5-9948-4aa1be9ce9d0",
+					"parent": {
+						"type": "block_id",
+						"block_id": "90e03468-f8aa-4576-95da-02ccad963040"
+					},
+					"last_edited_by": {
+						"object": "user",
+						"id": "88f72c1a-07ed-4bae-9fa0-231365d813d9"
+					},
+					"has_children": false,
+					"archived": false,
+					"in_trash": false,
+					"type": "heading_2",
+					"root_id": "90e03468f8aa457695da02ccad963040",
+					"content": "Hello World"
+				}
+			},
+			{
+				"json": {
+					"object": "block",
+					"parent_id": "90e03468f8aa457695da02ccad963040",
+					"id": "527a0555-a486-401e-93a8-19819615c132",
+					"parent": {
+						"type": "block_id",
+						"block_id": "90e03468-f8aa-4576-95da-02ccad963040"
+					},
+					"last_edited_by": {
+						"object": "user",
+						"id": "88f72c1a-07ed-4bae-9fa0-231365d813d9"
+					},
+					"has_children": false,
+					"archived": false,
+					"in_trash": false,
+					"type": "child_page",
+					"root_id": "90e03468f8aa457695da02ccad963040",
+					"content": "Page Third"
+				}
+			},
+			{
+				"json": {
+					"object": "block",
+					"parent_id": "90e03468f8aa457695da02ccad963040",
+					"id": "15bfb9cb-4cf0-81b1-a6f1-eac377c4d163",
+					"parent": {
+						"type": "block_id",
+						"block_id": "90e03468-f8aa-4576-95da-02ccad963040"
+					},
+					"last_edited_by": {
+						"object": "user",
+						"id": "88f72c1a-07ed-4bae-9fa0-231365d813d9"
+					},
+					"has_children": false,
+					"archived": false,
+					"in_trash": false,
+					"type": "paragraph",
+					"root_id": "90e03468f8aa457695da02ccad963040",
+					"content": ""
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Notion",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Notion": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "3edb0c05-7e84-4953-a6a5-86c3c6824403",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "Ucav6QC99JNMCkd3",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/database/get.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/database/get.test.ts
new file mode 100644
index 0000000000000..b4a36f8629a18
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/database/get.test.ts
@@ -0,0 +1,99 @@
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+const API_RESPONSE = {
+	object: 'database',
+	id: '138fb9cb-4cf0-804c-8663-d8ecdd5e692f',
+	cover: null,
+	icon: null,
+	created_time: '2024-11-08T07:59:00.000Z',
+	created_by: {
+		object: 'user',
+		id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+	},
+	last_edited_by: {
+		object: 'user',
+		id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+	},
+	last_edited_time: '2024-11-08T07:59:00.000Z',
+	title: [
+		{
+			type: 'text',
+			text: {
+				content: 'TEST_DB',
+				link: null,
+			},
+			annotations: {
+				bold: false,
+				italic: false,
+				strikethrough: false,
+				underline: false,
+				code: false,
+				color: 'default',
+			},
+			plain_text: 'TEST_DB',
+			href: null,
+		},
+	],
+	description: [],
+	is_inline: false,
+	properties: {
+		Tags: {
+			id: '%40~Tp',
+			name: 'Tags',
+			type: 'multi_select',
+			multi_select: {
+				options: [],
+			},
+		},
+		Name: {
+			id: 'title',
+			name: 'Name',
+			type: 'title',
+			title: {},
+		},
+	},
+	parent: {
+		type: 'page_id',
+		page_id: 'cc3d2b3c-f31a-4773-ab39-17a60c54567a',
+	},
+	url: 'https://www.notion.so/138fb9cb4cf0804c8663d8ecdd5e692f',
+	public_url: null,
+	archived: false,
+	in_trash: false,
+	request_id: 'd22a9046-be0d-4ef5-b551-8691da552d47',
+};
+
+jest.mock('../../../../shared/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../shared/GenericFunctions');
+	return {
+		...originalModule,
+		notionApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'GET') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test NotionV2, database => get', () => {
+	const workflows = ['nodes/Notion/test/node/v2/database/get.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../shared/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/database/get.workflow.json b/packages/nodes-base/nodes/Notion/test/node/v2/database/get.workflow.json
new file mode 100644
index 0000000000000..55c052683a3af
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/database/get.workflow.json
@@ -0,0 +1,90 @@
+{
+	"name": "tests notion",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "4260fdbd-e92f-4712-8114-38b85f8289ea",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "database",
+				"databaseId": {
+					"__rl": true,
+					"value": "138fb9cb-4cf0-804c-8663-d8ecdd5e692f",
+					"mode": "list",
+					"cachedResultName": "TEST_DB",
+					"cachedResultUrl": "https://www.notion.so/138fb9cb4cf0804c8663d8ecdd5e692f"
+				}
+			},
+			"id": "5ab80e6a-c9c4-4cc5-9332-2fc7a3f8ae24",
+			"name": "Notion",
+			"type": "n8n-nodes-base.notion",
+			"typeVersion": 2.2,
+			"position": [1040, 360],
+			"credentials": {
+				"notionApi": {
+					"id": "CiZXWkDmjiZzpcL1",
+					"name": "Notion account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "a664f506-72a5-4e50-80b4-97ed2e6eb334",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": "138fb9cb-4cf0-804c-8663-d8ecdd5e692f",
+					"name": "TEST_DB",
+					"url": "https://www.notion.so/138fb9cb4cf0804c8663d8ecdd5e692f"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Notion",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Notion": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "9f59436f-17e7-4c9d-a550-a594bb15618f",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "Ucav6QC99JNMCkd3",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/database/getAll.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/database/getAll.test.ts
new file mode 100644
index 0000000000000..467b6300604ee
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/database/getAll.test.ts
@@ -0,0 +1,340 @@
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+const API_RESPONSE = [
+	{
+		object: 'database',
+		id: '138fb9cb-4cf0-804c-8663-d8ecdd5e692f',
+		cover: null,
+		icon: null,
+		created_time: '2024-11-08T07:59:00.000Z',
+		created_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		last_edited_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		last_edited_time: '2024-11-08T07:59:00.000Z',
+		title: [
+			{
+				type: 'text',
+				text: {
+					content: 'TEST_DB',
+					link: null,
+				},
+				annotations: {
+					bold: false,
+					italic: false,
+					strikethrough: false,
+					underline: false,
+					code: false,
+					color: 'default',
+				},
+				plain_text: 'TEST_DB',
+				href: null,
+			},
+		],
+		description: [],
+		is_inline: false,
+		properties: {
+			Tags: {
+				id: '%40~Tp',
+				name: 'Tags',
+				type: 'multi_select',
+				multi_select: {
+					options: [],
+				},
+			},
+			Name: {
+				id: 'title',
+				name: 'Name',
+				type: 'title',
+				title: {},
+			},
+		},
+		parent: {
+			type: 'page_id',
+			page_id: 'cc3d2b3c-f31a-4773-ab39-17a60c54567a',
+		},
+		url: 'https://www.notion.so/138fb9cb4cf0804c8663d8ecdd5e692f',
+		public_url: null,
+		archived: false,
+		in_trash: false,
+	},
+	{
+		object: 'database',
+		id: 'f7216195-e0d4-46cd-a2d3-587a05baf472',
+		cover: null,
+		icon: null,
+		created_time: '2022-03-07T11:25:00.000Z',
+		created_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		last_edited_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		last_edited_time: '2024-11-08T07:54:00.000Z',
+		title: [
+			{
+				type: 'text',
+				text: {
+					content: 'ListDatabase',
+					link: null,
+				},
+				annotations: {
+					bold: false,
+					italic: false,
+					strikethrough: false,
+					underline: false,
+					code: false,
+					color: 'default',
+				},
+				plain_text: 'ListDatabase',
+				href: null,
+			},
+		],
+		description: [],
+		is_inline: false,
+		properties: {
+			Email: {
+				id: 'Fitu',
+				name: 'Email',
+				type: 'email',
+				email: {},
+			},
+			'Last edited by': {
+				id: 'XZ~H',
+				name: 'Last edited by',
+				type: 'last_edited_by',
+				last_edited_by: {},
+			},
+			Tags: {
+				id: 'a%7BRG',
+				name: 'Tags',
+				type: 'multi_select',
+				multi_select: {
+					options: [],
+				},
+			},
+			Created: {
+				id: 'eqq~',
+				name: 'Created',
+				type: 'created_time',
+				created_time: {},
+			},
+			Status: {
+				id: 'nZEQ',
+				name: 'Status',
+				type: 'status',
+				status: {
+					options: [
+						{
+							id: '70312bf9-84d5-40e6-b1eb-d71798ee556f',
+							name: 'Not started',
+							color: 'default',
+							description: null,
+						},
+						{
+							id: '02a6bb40-3f4b-47d6-818d-6a4129cc6091',
+							name: 'In progress',
+							color: 'gray',
+							description: null,
+						},
+						{
+							id: 'a3c13d01-63b2-4571-8a02-8c1801649af7',
+							name: 'Done',
+							color: 'green',
+							description: null,
+						},
+					],
+					groups: [
+						{
+							id: '82e2022c-001d-47ac-a8b8-243ef7fac352',
+							name: 'To-do',
+							color: 'gray',
+							option_ids: ['70312bf9-84d5-40e6-b1eb-d71798ee556f'],
+						},
+						{
+							id: '296000d7-287e-4121-9445-98fa8f7de298',
+							name: 'In progress',
+							color: 'blue',
+							option_ids: ['02a6bb40-3f4b-47d6-818d-6a4129cc6091'],
+						},
+						{
+							id: 'db7689ae-127d-4218-8b3c-306e59e02070',
+							name: 'Complete',
+							color: 'green',
+							option_ids: ['a3c13d01-63b2-4571-8a02-8c1801649af7'],
+						},
+					],
+				},
+			},
+			Name: {
+				id: 'title',
+				name: 'Name',
+				type: 'title',
+				title: {},
+			},
+		},
+		parent: {
+			type: 'page_id',
+			page_id: 'cc3d2b3c-f31a-4773-ab39-17a60c54567a',
+		},
+		url: 'https://www.notion.so/f7216195e0d446cda2d3587a05baf472',
+		public_url: 'https://pleasant-halloumi-63e.notion.site/f7216195e0d446cda2d3587a05baf472',
+		archived: false,
+		in_trash: false,
+	},
+	{
+		object: 'database',
+		id: 'e9c354e3-e506-4c42-83e2-d9c81a083f05',
+		cover: null,
+		icon: null,
+		created_time: '2022-03-07T11:05:00.000Z',
+		created_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		last_edited_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		last_edited_time: '2023-09-29T08:00:00.000Z',
+		title: [
+			{
+				type: 'text',
+				text: {
+					content: 'n8n-trigger',
+					link: null,
+				},
+				annotations: {
+					bold: false,
+					italic: false,
+					strikethrough: false,
+					underline: false,
+					code: false,
+					color: 'default',
+				},
+				plain_text: 'n8n-trigger',
+				href: null,
+			},
+		],
+		description: [],
+		is_inline: false,
+		properties: {
+			Total: {
+				id: 'A%3DdW',
+				name: 'Total',
+				type: 'formula',
+				formula: {
+					expression:
+						'((({{notion:block_property:n%7DI%5E:00000000-0000-0000-0000-000000000000:fe91914e-2dc5-4510-82f8-399dd9b2daf8}} + {{notion:block_property:MH~%3B:00000000-0000-0000-0000-000000000000:fe91914e-2dc5-4510-82f8-399dd9b2daf8}}) - {{notion:block_property:MwMd:00000000-0000-0000-0000-000000000000:fe91914e-2dc5-4510-82f8-399dd9b2daf8}}) + {{notion:block_property:fJea:00000000-0000-0000-0000-000000000000:fe91914e-2dc5-4510-82f8-399dd9b2daf8}}) - {{notion:block_property:rSrM:00000000-0000-0000-0000-000000000000:fe91914e-2dc5-4510-82f8-399dd9b2daf8}}',
+				},
+			},
+			'Total Incomes': {
+				id: 'MH~%3B',
+				name: 'Total Incomes',
+				type: 'number',
+				number: {
+					format: 'number',
+				},
+			},
+			'Total Expenses': {
+				id: 'MwMd',
+				name: 'Total Expenses',
+				type: 'number',
+				number: {
+					format: 'number',
+				},
+			},
+			'Created time': {
+				id: 'Z%3BGM',
+				name: 'Created time',
+				type: 'created_time',
+				created_time: {},
+			},
+			'Last edited time': {
+				id: '%60%5ElG',
+				name: 'Last edited time',
+				type: 'last_edited_time',
+				last_edited_time: {},
+			},
+			'Total Transfer-In': {
+				id: 'fJea',
+				name: 'Total Transfer-In',
+				type: 'number',
+				number: {
+					format: 'number',
+				},
+			},
+			'Starting Balance': {
+				id: 'n%7DI%5E',
+				name: 'Starting Balance',
+				type: 'number',
+				number: {
+					format: 'number',
+				},
+			},
+			'Total Transfer-Out': {
+				id: 'rSrM',
+				name: 'Total Transfer-Out',
+				type: 'number',
+				number: {
+					format: 'number',
+				},
+			},
+			Name: {
+				id: 'title',
+				name: 'Name',
+				type: 'title',
+				title: {},
+			},
+		},
+		parent: {
+			type: 'page_id',
+			page_id: 'cc3d2b3c-f31a-4773-ab39-17a60c54567a',
+		},
+		url: 'https://www.notion.so/e9c354e3e5064c4283e2d9c81a083f05',
+		public_url: null,
+		archived: false,
+		in_trash: false,
+	},
+];
+
+jest.mock('../../../../shared/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../shared/GenericFunctions');
+	return {
+		...originalModule,
+		notionApiRequestAllItems: jest.fn(async function (_: string, method: IHttpRequestMethods) {
+			if (method === 'POST') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test NotionV2, database => getAll', () => {
+	const workflows = ['nodes/Notion/test/node/v2/database/getAll.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../shared/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/database/getAll.workflow.json b/packages/nodes-base/nodes/Notion/test/node/v2/database/getAll.workflow.json
new file mode 100644
index 0000000000000..380ef6ef9364d
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/database/getAll.workflow.json
@@ -0,0 +1,99 @@
+{
+	"name": "tests notion",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "4260fdbd-e92f-4712-8114-38b85f8289ea",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "database",
+				"operation": "getAll",
+				"returnAll": true
+			},
+			"id": "5ab80e6a-c9c4-4cc5-9332-2fc7a3f8ae24",
+			"name": "Notion",
+			"type": "n8n-nodes-base.notion",
+			"typeVersion": 2.2,
+			"position": [1040, 360],
+			"credentials": {
+				"notionApi": {
+					"id": "CiZXWkDmjiZzpcL1",
+					"name": "Notion account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "a664f506-72a5-4e50-80b4-97ed2e6eb334",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": "138fb9cb-4cf0-804c-8663-d8ecdd5e692f",
+					"name": "TEST_DB",
+					"url": "https://www.notion.so/138fb9cb4cf0804c8663d8ecdd5e692f"
+				}
+			},
+			{
+				"json": {
+					"id": "f7216195-e0d4-46cd-a2d3-587a05baf472",
+					"name": "ListDatabase",
+					"url": "https://www.notion.so/f7216195e0d446cda2d3587a05baf472"
+				}
+			},
+			{
+				"json": {
+					"id": "e9c354e3-e506-4c42-83e2-d9c81a083f05",
+					"name": "n8n-trigger",
+					"url": "https://www.notion.so/e9c354e3e5064c4283e2d9c81a083f05"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Notion",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Notion": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "c9094e39-7195-4d4c-9e08-928415e1902b",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "Ucav6QC99JNMCkd3",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/database/search.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/database/search.test.ts
new file mode 100644
index 0000000000000..4208d1524e41e
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/database/search.test.ts
@@ -0,0 +1,214 @@
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+const API_RESPONSE = [
+	{
+		object: 'database',
+		id: 'e9c354e3-e506-4c42-83e2-d9c81a083f05',
+		cover: null,
+		icon: null,
+		created_time: '2022-03-07T11:05:00.000Z',
+		created_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		last_edited_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		last_edited_time: '2023-09-29T08:00:00.000Z',
+		title: [
+			{
+				type: 'text',
+				text: {
+					content: 'n8n-trigger',
+					link: null,
+				},
+				annotations: {
+					bold: false,
+					italic: false,
+					strikethrough: false,
+					underline: false,
+					code: false,
+					color: 'default',
+				},
+				plain_text: 'n8n-trigger',
+				href: null,
+			},
+		],
+		description: [],
+		is_inline: false,
+		properties: {
+			Total: {
+				id: 'A%3DdW',
+				name: 'Total',
+				type: 'formula',
+				formula: {
+					expression:
+						'((({{notion:block_property:n%7DI%5E:00000000-0000-0000-0000-000000000000:fe91914e-2dc5-4510-82f8-399dd9b2daf8}} + {{notion:block_property:MH~%3B:00000000-0000-0000-0000-000000000000:fe91914e-2dc5-4510-82f8-399dd9b2daf8}}) - {{notion:block_property:MwMd:00000000-0000-0000-0000-000000000000:fe91914e-2dc5-4510-82f8-399dd9b2daf8}}) + {{notion:block_property:fJea:00000000-0000-0000-0000-000000000000:fe91914e-2dc5-4510-82f8-399dd9b2daf8}}) - {{notion:block_property:rSrM:00000000-0000-0000-0000-000000000000:fe91914e-2dc5-4510-82f8-399dd9b2daf8}}',
+				},
+			},
+			'Total Incomes': {
+				id: 'MH~%3B',
+				name: 'Total Incomes',
+				type: 'number',
+				number: {
+					format: 'number',
+				},
+			},
+			'Total Expenses': {
+				id: 'MwMd',
+				name: 'Total Expenses',
+				type: 'number',
+				number: {
+					format: 'number',
+				},
+			},
+			'Created time': {
+				id: 'Z%3BGM',
+				name: 'Created time',
+				type: 'created_time',
+				created_time: {},
+			},
+			'Last edited time': {
+				id: '%60%5ElG',
+				name: 'Last edited time',
+				type: 'last_edited_time',
+				last_edited_time: {},
+			},
+			'Total Transfer-In': {
+				id: 'fJea',
+				name: 'Total Transfer-In',
+				type: 'number',
+				number: {
+					format: 'number',
+				},
+			},
+			'Starting Balance': {
+				id: 'n%7DI%5E',
+				name: 'Starting Balance',
+				type: 'number',
+				number: {
+					format: 'number',
+				},
+			},
+			'Total Transfer-Out': {
+				id: 'rSrM',
+				name: 'Total Transfer-Out',
+				type: 'number',
+				number: {
+					format: 'number',
+				},
+			},
+			Name: {
+				id: 'title',
+				name: 'Name',
+				type: 'title',
+				title: {},
+			},
+		},
+		parent: {
+			type: 'page_id',
+			page_id: 'cc3d2b3c-f31a-4773-ab39-17a60c54567a',
+		},
+		url: 'https://www.notion.so/e9c354e3e5064c4283e2d9c81a083f05',
+		public_url: null,
+		archived: false,
+		in_trash: false,
+	},
+	{
+		object: 'database',
+		id: '138fb9cb-4cf0-804c-8663-d8ecdd5e692f',
+		cover: null,
+		icon: null,
+		created_time: '2024-11-08T07:59:00.000Z',
+		created_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		last_edited_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		last_edited_time: '2024-11-08T07:59:00.000Z',
+		title: [
+			{
+				type: 'text',
+				text: {
+					content: 'TEST_DB',
+					link: null,
+				},
+				annotations: {
+					bold: false,
+					italic: false,
+					strikethrough: false,
+					underline: false,
+					code: false,
+					color: 'default',
+				},
+				plain_text: 'TEST_DB',
+				href: null,
+			},
+		],
+		description: [],
+		is_inline: false,
+		properties: {
+			Tags: {
+				id: '%40~Tp',
+				name: 'Tags',
+				type: 'multi_select',
+				multi_select: {
+					options: [],
+				},
+			},
+			Name: {
+				id: 'title',
+				name: 'Name',
+				type: 'title',
+				title: {},
+			},
+		},
+		parent: {
+			type: 'page_id',
+			page_id: 'cc3d2b3c-f31a-4773-ab39-17a60c54567a',
+		},
+		url: 'https://www.notion.so/138fb9cb4cf0804c8663d8ecdd5e692f',
+		public_url: null,
+		archived: false,
+		in_trash: false,
+	},
+];
+
+jest.mock('../../../../shared/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../shared/GenericFunctions');
+	return {
+		...originalModule,
+		notionApiRequestAllItems: jest.fn(async function (_: string, method: IHttpRequestMethods) {
+			if (method === 'POST') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test NotionV2, database => search', () => {
+	const workflows = ['nodes/Notion/test/node/v2/database/search.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../shared/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/database/search.workflow.json b/packages/nodes-base/nodes/Notion/test/node/v2/database/search.workflow.json
new file mode 100644
index 0000000000000..b04abcc5ab321
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/database/search.workflow.json
@@ -0,0 +1,265 @@
+{
+	"name": "tests notion",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "4260fdbd-e92f-4712-8114-38b85f8289ea",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "database",
+				"operation": "search",
+				"text": "t",
+				"limit": 2,
+				"simple": false,
+				"options": {
+					"sort": {
+						"sortValue": {
+							"direction": "ascending"
+						}
+					}
+				}
+			},
+			"id": "5ab80e6a-c9c4-4cc5-9332-2fc7a3f8ae24",
+			"name": "Notion",
+			"type": "n8n-nodes-base.notion",
+			"typeVersion": 2.2,
+			"position": [1040, 360],
+			"credentials": {
+				"notionApi": {
+					"id": "CiZXWkDmjiZzpcL1",
+					"name": "Notion account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "a664f506-72a5-4e50-80b4-97ed2e6eb334",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"object": "database",
+					"id": "e9c354e3-e506-4c42-83e2-d9c81a083f05",
+					"cover": null,
+					"icon": null,
+					"created_time": "2022-03-07T11:05:00.000Z",
+					"created_by": {
+						"object": "user",
+						"id": "88f72c1a-07ed-4bae-9fa0-231365d813d9"
+					},
+					"last_edited_by": {
+						"object": "user",
+						"id": "88f72c1a-07ed-4bae-9fa0-231365d813d9"
+					},
+					"last_edited_time": "2023-09-29T08:00:00.000Z",
+					"title": [
+						{
+							"type": "text",
+							"text": {
+								"content": "n8n-trigger",
+								"link": null
+							},
+							"annotations": {
+								"bold": false,
+								"italic": false,
+								"strikethrough": false,
+								"underline": false,
+								"code": false,
+								"color": "default"
+							},
+							"plain_text": "n8n-trigger",
+							"href": null
+						}
+					],
+					"description": [],
+					"is_inline": false,
+					"properties": {
+						"Total": {
+							"id": "A%3DdW",
+							"name": "Total",
+							"type": "formula",
+							"formula": {
+								"expression": "((({{notion:block_property:n%7DI%5E:00000000-0000-0000-0000-000000000000:fe91914e-2dc5-4510-82f8-399dd9b2daf8}} + {{notion:block_property:MH~%3B:00000000-0000-0000-0000-000000000000:fe91914e-2dc5-4510-82f8-399dd9b2daf8}}) - {{notion:block_property:MwMd:00000000-0000-0000-0000-000000000000:fe91914e-2dc5-4510-82f8-399dd9b2daf8}}) + {{notion:block_property:fJea:00000000-0000-0000-0000-000000000000:fe91914e-2dc5-4510-82f8-399dd9b2daf8}}) - {{notion:block_property:rSrM:00000000-0000-0000-0000-000000000000:fe91914e-2dc5-4510-82f8-399dd9b2daf8}}"
+							}
+						},
+						"Total Incomes": {
+							"id": "MH~%3B",
+							"name": "Total Incomes",
+							"type": "number",
+							"number": {
+								"format": "number"
+							}
+						},
+						"Total Expenses": {
+							"id": "MwMd",
+							"name": "Total Expenses",
+							"type": "number",
+							"number": {
+								"format": "number"
+							}
+						},
+						"Created time": {
+							"id": "Z%3BGM",
+							"name": "Created time",
+							"type": "created_time",
+							"created_time": {}
+						},
+						"Last edited time": {
+							"id": "%60%5ElG",
+							"name": "Last edited time",
+							"type": "last_edited_time",
+							"last_edited_time": {}
+						},
+						"Total Transfer-In": {
+							"id": "fJea",
+							"name": "Total Transfer-In",
+							"type": "number",
+							"number": {
+								"format": "number"
+							}
+						},
+						"Starting Balance": {
+							"id": "n%7DI%5E",
+							"name": "Starting Balance",
+							"type": "number",
+							"number": {
+								"format": "number"
+							}
+						},
+						"Total Transfer-Out": {
+							"id": "rSrM",
+							"name": "Total Transfer-Out",
+							"type": "number",
+							"number": {
+								"format": "number"
+							}
+						},
+						"Name": {
+							"id": "title",
+							"name": "Name",
+							"type": "title",
+							"title": {}
+						}
+					},
+					"parent": {
+						"type": "page_id",
+						"page_id": "cc3d2b3c-f31a-4773-ab39-17a60c54567a"
+					},
+					"url": "https://www.notion.so/e9c354e3e5064c4283e2d9c81a083f05",
+					"public_url": null,
+					"archived": false,
+					"in_trash": false
+				}
+			},
+			{
+				"json": {
+					"object": "database",
+					"id": "138fb9cb-4cf0-804c-8663-d8ecdd5e692f",
+					"cover": null,
+					"icon": null,
+					"created_time": "2024-11-08T07:59:00.000Z",
+					"created_by": {
+						"object": "user",
+						"id": "88f72c1a-07ed-4bae-9fa0-231365d813d9"
+					},
+					"last_edited_by": {
+						"object": "user",
+						"id": "88f72c1a-07ed-4bae-9fa0-231365d813d9"
+					},
+					"last_edited_time": "2024-11-08T07:59:00.000Z",
+					"title": [
+						{
+							"type": "text",
+							"text": {
+								"content": "TEST_DB",
+								"link": null
+							},
+							"annotations": {
+								"bold": false,
+								"italic": false,
+								"strikethrough": false,
+								"underline": false,
+								"code": false,
+								"color": "default"
+							},
+							"plain_text": "TEST_DB",
+							"href": null
+						}
+					],
+					"description": [],
+					"is_inline": false,
+					"properties": {
+						"Tags": {
+							"id": "%40~Tp",
+							"name": "Tags",
+							"type": "multi_select",
+							"multi_select": {
+								"options": []
+							}
+						},
+						"Name": {
+							"id": "title",
+							"name": "Name",
+							"type": "title",
+							"title": {}
+						}
+					},
+					"parent": {
+						"type": "page_id",
+						"page_id": "cc3d2b3c-f31a-4773-ab39-17a60c54567a"
+					},
+					"url": "https://www.notion.so/138fb9cb4cf0804c8663d8ecdd5e692f",
+					"public_url": null,
+					"archived": false,
+					"in_trash": false
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Notion",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Notion": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "08dad8e3-abcc-42d1-8ad3-c026644d1280",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "Ucav6QC99JNMCkd3",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/create.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/create.test.ts
new file mode 100644
index 0000000000000..f2c010e75a60a
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/create.test.ts
@@ -0,0 +1,115 @@
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+const API_RESPONSE = {
+	object: 'page',
+	id: '15bfb9cb-4cf0-81c7-aab4-c5855b8cb6c3',
+	created_time: '2024-12-13T04:45:00.000Z',
+	last_edited_time: '2024-12-13T04:45:00.000Z',
+	created_by: {
+		object: 'user',
+		id: 'f215e49c-4677-40c0-9adc-87440d341324',
+	},
+	last_edited_by: {
+		object: 'user',
+		id: 'f215e49c-4677-40c0-9adc-87440d341324',
+	},
+	cover: null,
+	icon: {
+		type: 'emoji',
+		emoji: '😗',
+	},
+	parent: {
+		type: 'database_id',
+		database_id: '138fb9cb-4cf0-804c-8663-d8ecdd5e692f',
+	},
+	archived: false,
+	in_trash: false,
+	properties: {
+		Tags: {
+			id: '%40~Tp',
+			type: 'multi_select',
+			multi_select: [],
+		},
+		Name: {
+			id: 'title',
+			type: 'title',
+			title: [
+				{
+					type: 'text',
+					text: {
+						content: 'new name 1',
+						link: null,
+					},
+					annotations: {
+						bold: false,
+						italic: false,
+						strikethrough: false,
+						underline: false,
+						code: false,
+						color: 'default',
+					},
+					plain_text: 'new name 1',
+					href: null,
+				},
+			],
+		},
+	},
+	url: 'https://www.notion.so/new-name-1-15bfb9cb4cf081c7aab4c5855b8cb6c3',
+	public_url: null,
+	request_id: '1416702d-daa8-4f8d-9be3-c55fe52486b5',
+};
+
+jest.mock('../../../../shared/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../shared/GenericFunctions');
+	return {
+		...originalModule,
+		notionApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'GET') {
+				return {
+					properties: {
+						Tags: {
+							id: '%40~Tp',
+							name: 'Tags',
+							type: 'multi_select',
+							multi_select: {
+								options: [],
+							},
+						},
+						Name: {
+							id: 'title',
+							name: 'Name',
+							type: 'title',
+							title: {},
+						},
+					},
+				};
+			}
+			if (method === 'POST') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test NotionV2, databasePage => create', () => {
+	const workflows = ['nodes/Notion/test/node/v2/databasePage/create.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../shared/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/create.workflow.json b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/create.workflow.json
new file mode 100644
index 0000000000000..80022b8c19ae2
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/create.workflow.json
@@ -0,0 +1,116 @@
+{
+	"name": "tests notion",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "4260fdbd-e92f-4712-8114-38b85f8289ea",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "databasePage",
+				"databaseId": {
+					"__rl": true,
+					"value": "138fb9cb-4cf0-804c-8663-d8ecdd5e692f",
+					"mode": "list",
+					"cachedResultName": "TEST_DB",
+					"cachedResultUrl": "https://www.notion.so/138fb9cb4cf0804c8663d8ecdd5e692f"
+				},
+				"title": "new page",
+				"propertiesUi": {
+					"propertyValues": [
+						{
+							"key": "Name|title",
+							"title": "new name 1"
+						}
+					]
+				},
+				"blockUi": {
+					"blockValues": [
+						{
+							"textContent": "new text"
+						},
+						{
+							"type": "toggle",
+							"textContent": "new toggle"
+						}
+					]
+				},
+				"options": {
+					"iconType": "emoji",
+					"icon": "😗"
+				}
+			},
+			"id": "5ab80e6a-c9c4-4cc5-9332-2fc7a3f8ae24",
+			"name": "Notion",
+			"type": "n8n-nodes-base.notion",
+			"typeVersion": 2.2,
+			"position": [1040, 360],
+			"credentials": {
+				"notionApi": {
+					"id": "CiZXWkDmjiZzpcL1",
+					"name": "Notion account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "a664f506-72a5-4e50-80b4-97ed2e6eb334",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": "15bfb9cb-4cf0-81c7-aab4-c5855b8cb6c3",
+					"name": "new name 1",
+					"url": "https://www.notion.so/new-name-1-15bfb9cb4cf081c7aab4c5855b8cb6c3",
+					"property_tags": [],
+					"property_name": "new name 1"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Notion",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Notion": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "5f4f1112-c094-44b6-bc05-005b54190852",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "Ucav6QC99JNMCkd3",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/get.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/get.test.ts
new file mode 100644
index 0000000000000..5b2d5d2eb5997
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/get.test.ts
@@ -0,0 +1,95 @@
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+const API_RESPONSE = {
+	object: 'page',
+	id: '15bfb9cb-4cf0-81c7-aab4-c5855b8cb6c3',
+	created_time: '2024-12-13T04:45:00.000Z',
+	last_edited_time: '2024-12-13T04:45:00.000Z',
+	created_by: {
+		object: 'user',
+		id: 'f215e49c-4677-40c0-9adc-87440d341324',
+	},
+	last_edited_by: {
+		object: 'user',
+		id: 'f215e49c-4677-40c0-9adc-87440d341324',
+	},
+	cover: null,
+	icon: {
+		type: 'emoji',
+		emoji: '😗',
+	},
+	parent: {
+		type: 'database_id',
+		database_id: '138fb9cb-4cf0-804c-8663-d8ecdd5e692f',
+	},
+	archived: false,
+	in_trash: false,
+	properties: {
+		Tags: {
+			id: '%40~Tp',
+			type: 'multi_select',
+			multi_select: [],
+		},
+		Name: {
+			id: 'title',
+			type: 'title',
+			title: [
+				{
+					type: 'text',
+					text: {
+						content: 'new name 1',
+						link: null,
+					},
+					annotations: {
+						bold: false,
+						italic: false,
+						strikethrough: false,
+						underline: false,
+						code: false,
+						color: 'default',
+					},
+					plain_text: 'new name 1',
+					href: null,
+				},
+			],
+		},
+	},
+	url: 'https://www.notion.so/new-name-1-15bfb9cb4cf081c7aab4c5855b8cb6c3',
+	public_url: null,
+	request_id: 'c01d3a3e-d9c3-4e48-8d73-077a8503c3ba',
+};
+
+jest.mock('../../../../shared/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../shared/GenericFunctions');
+	return {
+		...originalModule,
+		notionApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'GET') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test NotionV2, databasePage => get', () => {
+	const workflows = ['nodes/Notion/test/node/v2/databasePage/get.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../shared/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/get.workflow.json b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/get.workflow.json
new file mode 100644
index 0000000000000..7180d48521ca3
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/get.workflow.json
@@ -0,0 +1,91 @@
+{
+	"name": "tests notion",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "4260fdbd-e92f-4712-8114-38b85f8289ea",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "databasePage",
+				"operation": "get",
+				"pageId": {
+					"__rl": true,
+					"value": "https://www.notion.so/138fb9cb4cf0804c8663d8ecdd5e692f?v=7bcc03614eed4c95a9e6168c040e9c58&p=15bfb9cb4cf081c7aab4c5855b8cb6c3&pm=s",
+					"mode": "url"
+				}
+			},
+			"id": "5ab80e6a-c9c4-4cc5-9332-2fc7a3f8ae24",
+			"name": "Notion",
+			"type": "n8n-nodes-base.notion",
+			"typeVersion": 2.2,
+			"position": [1040, 360],
+			"credentials": {
+				"notionApi": {
+					"id": "CiZXWkDmjiZzpcL1",
+					"name": "Notion account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "a664f506-72a5-4e50-80b4-97ed2e6eb334",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": "15bfb9cb-4cf0-81c7-aab4-c5855b8cb6c3",
+					"name": "new name 1",
+					"url": "https://www.notion.so/new-name-1-15bfb9cb4cf081c7aab4c5855b8cb6c3",
+					"property_tags": [],
+					"property_name": "new name 1"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Notion",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Notion": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "68afba7e-c066-458c-984b-c758ef92463c",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "Ucav6QC99JNMCkd3",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/getAll.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/getAll.test.ts
new file mode 100644
index 0000000000000..1160e6c971c3e
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/getAll.test.ts
@@ -0,0 +1,96 @@
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+const API_RESPONSE = [
+	{
+		object: 'page',
+		id: '15bfb9cb-4cf0-81c7-aab4-c5855b8cb6c3',
+		created_time: '2024-12-13T04:45:00.000Z',
+		last_edited_time: '2024-12-13T04:45:00.000Z',
+		created_by: {
+			object: 'user',
+			id: 'f215e49c-4677-40c0-9adc-87440d341324',
+		},
+		last_edited_by: {
+			object: 'user',
+			id: 'f215e49c-4677-40c0-9adc-87440d341324',
+		},
+		cover: null,
+		icon: {
+			type: 'emoji',
+			emoji: '😗',
+		},
+		parent: {
+			type: 'database_id',
+			database_id: '138fb9cb-4cf0-804c-8663-d8ecdd5e692f',
+		},
+		archived: false,
+		in_trash: false,
+		properties: {
+			Tags: {
+				id: '%40~Tp',
+				type: 'multi_select',
+				multi_select: [],
+			},
+			Name: {
+				id: 'title',
+				type: 'title',
+				title: [
+					{
+						type: 'text',
+						text: {
+							content: 'new name 1',
+							link: null,
+						},
+						annotations: {
+							bold: false,
+							italic: false,
+							strikethrough: false,
+							underline: false,
+							code: false,
+							color: 'default',
+						},
+						plain_text: 'new name 1',
+						href: null,
+					},
+				],
+			},
+		},
+		url: 'https://www.notion.so/new-name-1-15bfb9cb4cf081c7aab4c5855b8cb6c3',
+		public_url: null,
+	},
+];
+
+jest.mock('../../../../shared/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../shared/GenericFunctions');
+	return {
+		...originalModule,
+		notionApiRequestAllItems: jest.fn(async function (_: string, method: IHttpRequestMethods) {
+			if (method === 'POST') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test NotionV2, databasePage => getAll', () => {
+	const workflows = ['nodes/Notion/test/node/v2/databasePage/getAll.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../shared/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/getAll.workflow.json b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/getAll.workflow.json
new file mode 100644
index 0000000000000..6efd1f3c07cc8
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/getAll.workflow.json
@@ -0,0 +1,114 @@
+{
+	"name": "tests notion",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "4260fdbd-e92f-4712-8114-38b85f8289ea",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "databasePage",
+				"operation": "getAll",
+				"databaseId": {
+					"__rl": true,
+					"value": "138fb9cb-4cf0-804c-8663-d8ecdd5e692f",
+					"mode": "list",
+					"cachedResultName": "TEST_DB",
+					"cachedResultUrl": "https://www.notion.so/138fb9cb4cf0804c8663d8ecdd5e692f"
+				},
+				"returnAll": true,
+				"filterType": "manual",
+				"filters": {
+					"conditions": [
+						{
+							"key": "Name|title",
+							"condition": "contains",
+							"titleValue": "new"
+						}
+					]
+				},
+				"options": {
+					"sort": {
+						"sortValue": [
+							{
+								"key": "Name|title",
+								"direction": "ascending"
+							}
+						]
+					}
+				}
+			},
+			"id": "5ab80e6a-c9c4-4cc5-9332-2fc7a3f8ae24",
+			"name": "Notion",
+			"type": "n8n-nodes-base.notion",
+			"typeVersion": 2.2,
+			"position": [1040, 360],
+			"credentials": {
+				"notionApi": {
+					"id": "CiZXWkDmjiZzpcL1",
+					"name": "Notion account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "a664f506-72a5-4e50-80b4-97ed2e6eb334",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": "15bfb9cb-4cf0-81c7-aab4-c5855b8cb6c3",
+					"name": "new name 1",
+					"url": "https://www.notion.so/new-name-1-15bfb9cb4cf081c7aab4c5855b8cb6c3",
+					"property_tags": [],
+					"property_name": "new name 1"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Notion",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Notion": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "c69706eb-f8e8-4fe0-b456-23e482743d1c",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "Ucav6QC99JNMCkd3",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/update.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/update.test.ts
new file mode 100644
index 0000000000000..39531dbac794a
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/update.test.ts
@@ -0,0 +1,95 @@
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+const API_RESPONSE = {
+	object: 'page',
+	id: '15bfb9cb-4cf0-81c7-aab4-c5855b8cb6c3',
+	created_time: '2024-12-13T04:45:00.000Z',
+	last_edited_time: '2024-12-13T05:21:00.000Z',
+	created_by: {
+		object: 'user',
+		id: 'f215e49c-4677-40c0-9adc-87440d341324',
+	},
+	last_edited_by: {
+		object: 'user',
+		id: 'f215e49c-4677-40c0-9adc-87440d341324',
+	},
+	cover: null,
+	icon: {
+		type: 'emoji',
+		emoji: '😗',
+	},
+	parent: {
+		type: 'database_id',
+		database_id: '138fb9cb-4cf0-804c-8663-d8ecdd5e692f',
+	},
+	archived: false,
+	in_trash: false,
+	properties: {
+		Tags: {
+			id: '%40~Tp',
+			type: 'multi_select',
+			multi_select: [],
+		},
+		Name: {
+			id: 'title',
+			type: 'title',
+			title: [
+				{
+					type: 'text',
+					text: {
+						content: 'Updated Name',
+						link: null,
+					},
+					annotations: {
+						bold: false,
+						italic: false,
+						strikethrough: false,
+						underline: false,
+						code: false,
+						color: 'default',
+					},
+					plain_text: 'Updated Name',
+					href: null,
+				},
+			],
+		},
+	},
+	url: 'https://www.notion.so/Updated-Name-15bfb9cb4cf081c7aab4c5855b8cb6c3',
+	public_url: null,
+	request_id: 'a4683091-f165-4f10-92b4-a629b8b1266e',
+};
+
+jest.mock('../../../../shared/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../shared/GenericFunctions');
+	return {
+		...originalModule,
+		notionApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'PATCH') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test NotionV2, databasePage => update', () => {
+	const workflows = ['nodes/Notion/test/node/v2/databasePage/update.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../shared/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/update.workflow.json b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/update.workflow.json
new file mode 100644
index 0000000000000..0d9705dc226ac
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/update.workflow.json
@@ -0,0 +1,100 @@
+{
+	"name": "tests notion",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "4260fdbd-e92f-4712-8114-38b85f8289ea",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "databasePage",
+				"operation": "update",
+				"pageId": {
+					"__rl": true,
+					"value": "https://www.notion.so/new-name-1-15bfb9cb4cf081c7aab4c5855b8cb6c3",
+					"mode": "url"
+				},
+				"propertiesUi": {
+					"propertyValues": [
+						{
+							"key": "Name|title",
+							"title": "Updated Name"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "5ab80e6a-c9c4-4cc5-9332-2fc7a3f8ae24",
+			"name": "Notion",
+			"type": "n8n-nodes-base.notion",
+			"typeVersion": 2.2,
+			"position": [1040, 360],
+			"credentials": {
+				"notionApi": {
+					"id": "CiZXWkDmjiZzpcL1",
+					"name": "Notion account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "a664f506-72a5-4e50-80b4-97ed2e6eb334",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": "15bfb9cb-4cf0-81c7-aab4-c5855b8cb6c3",
+					"name": "Updated Name",
+					"url": "https://www.notion.so/Updated-Name-15bfb9cb4cf081c7aab4c5855b8cb6c3",
+					"property_tags": [],
+					"property_name": "Updated Name"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Notion",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Notion": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "ab4a62f2-5d45-456a-ac7a-97cf84e78815",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "Ucav6QC99JNMCkd3",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/page/archive.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/page/archive.test.ts
new file mode 100644
index 0000000000000..72ae18ae017ed
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/page/archive.test.ts
@@ -0,0 +1,95 @@
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+const API_RESPONSE = {
+	object: 'page',
+	id: '15bfb9cb-4cf0-81c7-aab4-c5855b8cb6c3',
+	created_time: '2024-12-13T04:45:00.000Z',
+	last_edited_time: '2024-12-13T05:52:00.000Z',
+	created_by: {
+		object: 'user',
+		id: 'f215e49c-4677-40c0-9adc-87440d341324',
+	},
+	last_edited_by: {
+		object: 'user',
+		id: 'f215e49c-4677-40c0-9adc-87440d341324',
+	},
+	cover: null,
+	icon: {
+		type: 'emoji',
+		emoji: '😗',
+	},
+	parent: {
+		type: 'database_id',
+		database_id: '138fb9cb-4cf0-804c-8663-d8ecdd5e692f',
+	},
+	archived: true,
+	in_trash: true,
+	properties: {
+		Tags: {
+			id: '%40~Tp',
+			type: 'multi_select',
+			multi_select: [],
+		},
+		Name: {
+			id: 'title',
+			type: 'title',
+			title: [
+				{
+					type: 'text',
+					text: {
+						content: 'Updated Name',
+						link: null,
+					},
+					annotations: {
+						bold: false,
+						italic: false,
+						strikethrough: false,
+						underline: false,
+						code: false,
+						color: 'default',
+					},
+					plain_text: 'Updated Name',
+					href: null,
+				},
+			],
+		},
+	},
+	url: 'https://www.notion.so/Updated-Name-15bfb9cb4cf081c7aab4c5855b8cb6c3',
+	public_url: null,
+	request_id: 'ce91abaa-261f-43c3-9237-57c0f28af682',
+};
+
+jest.mock('../../../../shared/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../shared/GenericFunctions');
+	return {
+		...originalModule,
+		notionApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'PATCH') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test NotionV2, page => archive', () => {
+	const workflows = ['nodes/Notion/test/node/v2/page/archive.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../shared/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/page/archive.workflow.json b/packages/nodes-base/nodes/Notion/test/node/v2/page/archive.workflow.json
new file mode 100644
index 0000000000000..1aeb758f5ede2
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/page/archive.workflow.json
@@ -0,0 +1,90 @@
+{
+	"name": "tests notion",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "4260fdbd-e92f-4712-8114-38b85f8289ea",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"operation": "archive",
+				"pageId": {
+					"__rl": true,
+					"value": "15bfb9cb4cf081c7aab4c5855b8cb6c3",
+					"mode": "id"
+				}
+			},
+			"id": "5ab80e6a-c9c4-4cc5-9332-2fc7a3f8ae24",
+			"name": "Notion",
+			"type": "n8n-nodes-base.notion",
+			"typeVersion": 2.2,
+			"position": [1040, 360],
+			"credentials": {
+				"notionApi": {
+					"id": "CiZXWkDmjiZzpcL1",
+					"name": "Notion account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "a664f506-72a5-4e50-80b4-97ed2e6eb334",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": "15bfb9cb-4cf0-81c7-aab4-c5855b8cb6c3",
+					"name": "Updated Name",
+					"url": "https://www.notion.so/Updated-Name-15bfb9cb4cf081c7aab4c5855b8cb6c3",
+					"property_tags": [],
+					"property_name": "Updated Name"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Notion",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Notion": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "aae2fbb6-0277-449a-9f26-d8d3cf53d2c4",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "Ucav6QC99JNMCkd3",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/page/create.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/page/create.test.ts
new file mode 100644
index 0000000000000..85090c7938e94
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/page/create.test.ts
@@ -0,0 +1,90 @@
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+const API_RESPONSE = {
+	object: 'page',
+	id: '15bfb9cb-4cf0-812b-b4bc-c85cd00727f8',
+	created_time: '2024-12-13T06:01:00.000Z',
+	last_edited_time: '2024-12-13T06:01:00.000Z',
+	created_by: {
+		object: 'user',
+		id: 'f215e49c-4677-40c0-9adc-87440d341324',
+	},
+	last_edited_by: {
+		object: 'user',
+		id: 'f215e49c-4677-40c0-9adc-87440d341324',
+	},
+	cover: null,
+	icon: {
+		type: 'emoji',
+		emoji: '😊',
+	},
+	parent: {
+		type: 'page_id',
+		page_id: '15bfb9cb-4cf0-81c7-aab4-c5855b8cb6c3',
+	},
+	archived: false,
+	in_trash: false,
+	properties: {
+		title: {
+			id: 'title',
+			type: 'title',
+			title: [
+				{
+					type: 'text',
+					text: {
+						content: 'Child page',
+						link: null,
+					},
+					annotations: {
+						bold: false,
+						italic: false,
+						strikethrough: false,
+						underline: false,
+						code: false,
+						color: 'default',
+					},
+					plain_text: 'Child page',
+					href: null,
+				},
+			],
+		},
+	},
+	url: 'https://www.notion.so/Child-page-15bfb9cb4cf0812bb4bcc85cd00727f8',
+	public_url: null,
+	request_id: 'df28ec00-4361-46af-a3b6-add18c8d1295',
+};
+
+jest.mock('../../../../shared/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../shared/GenericFunctions');
+	return {
+		...originalModule,
+		notionApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'POST') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test NotionV2, page => create', () => {
+	const workflows = ['nodes/Notion/test/node/v2/page/create.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../shared/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/page/create.workflow.json b/packages/nodes-base/nodes/Notion/test/node/v2/page/create.workflow.json
new file mode 100644
index 0000000000000..ab2c6b8f623ec
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/page/create.workflow.json
@@ -0,0 +1,111 @@
+{
+	"name": "tests notion",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "4260fdbd-e92f-4712-8114-38b85f8289ea",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"pageId": {
+					"__rl": true,
+					"value": "15bfb9cb4cf081c7aab4c5855b8cb6c3",
+					"mode": "id",
+					"__regex": "^([0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12})"
+				},
+				"title": "Child page",
+				"blockUi": {
+					"blockValues": [
+						{
+							"type": "heading_1",
+							"richText": true,
+							"text": {
+								"text": [
+									{
+										"text": "Title",
+										"annotationUi": {}
+									}
+								]
+							}
+						},
+						{
+							"textContent": "text"
+						}
+					]
+				},
+				"options": {
+					"icon": "😊"
+				}
+			},
+			"id": "5ab80e6a-c9c4-4cc5-9332-2fc7a3f8ae24",
+			"name": "Notion",
+			"type": "n8n-nodes-base.notion",
+			"typeVersion": 2.2,
+			"position": [1040, 360],
+			"credentials": {
+				"notionApi": {
+					"id": "CiZXWkDmjiZzpcL1",
+					"name": "Notion account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "a664f506-72a5-4e50-80b4-97ed2e6eb334",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": "15bfb9cb-4cf0-812b-b4bc-c85cd00727f8",
+					"name": "Child page",
+					"url": "https://www.notion.so/Child-page-15bfb9cb4cf0812bb4bcc85cd00727f8"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Notion",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Notion": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "f8f473ad-4d37-49c4-95f3-187b3a70a6f1",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "Ucav6QC99JNMCkd3",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/page/search.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/page/search.test.ts
new file mode 100644
index 0000000000000..bc4c2d7a92fae
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/page/search.test.ts
@@ -0,0 +1,91 @@
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+const API_RESPONSE = [
+	{
+		object: 'page',
+		id: '15bfb9cb-4cf0-812b-b4bc-c85cd00727f8',
+		created_time: '2024-12-13T06:01:00.000Z',
+		last_edited_time: '2024-12-13T06:01:00.000Z',
+		created_by: {
+			object: 'user',
+			id: 'f215e49c-4677-40c0-9adc-87440d341324',
+		},
+		last_edited_by: {
+			object: 'user',
+			id: 'f215e49c-4677-40c0-9adc-87440d341324',
+		},
+		cover: null,
+		icon: {
+			type: 'emoji',
+			emoji: '😊',
+		},
+		parent: {
+			type: 'page_id',
+			page_id: '15bfb9cb-4cf0-81c7-aab4-c5855b8cb6c3',
+		},
+		archived: false,
+		in_trash: false,
+		properties: {
+			title: {
+				id: 'title',
+				type: 'title',
+				title: [
+					{
+						type: 'text',
+						text: {
+							content: 'Child page',
+							link: null,
+						},
+						annotations: {
+							bold: false,
+							italic: false,
+							strikethrough: false,
+							underline: false,
+							code: false,
+							color: 'default',
+						},
+						plain_text: 'Child page',
+						href: null,
+					},
+				],
+			},
+		},
+		url: 'https://www.notion.so/Child-page-15bfb9cb4cf0812bb4bcc85cd00727f8',
+		public_url: null,
+	},
+];
+
+jest.mock('../../../../shared/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../shared/GenericFunctions');
+	return {
+		...originalModule,
+		notionApiRequestAllItems: jest.fn(async function (_: string, method: IHttpRequestMethods) {
+			if (method === 'POST') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test NotionV2, page => search', () => {
+	const workflows = ['nodes/Notion/test/node/v2/page/search.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../shared/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/page/search.workflow.json b/packages/nodes-base/nodes/Notion/test/node/v2/page/search.workflow.json
new file mode 100644
index 0000000000000..84a14c1f8515e
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/page/search.workflow.json
@@ -0,0 +1,97 @@
+{
+	"name": "tests notion",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "4260fdbd-e92f-4712-8114-38b85f8289ea",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"operation": "search",
+				"text": "child",
+				"returnAll": true,
+				"options": {
+					"filter": {
+						"filters": {
+							"value": "page"
+						}
+					},
+					"sort": {
+						"sortValue": {
+							"direction": "ascending"
+						}
+					}
+				}
+			},
+			"id": "5ab80e6a-c9c4-4cc5-9332-2fc7a3f8ae24",
+			"name": "Notion",
+			"type": "n8n-nodes-base.notion",
+			"typeVersion": 2.2,
+			"position": [1040, 360],
+			"credentials": {
+				"notionApi": {
+					"id": "CiZXWkDmjiZzpcL1",
+					"name": "Notion account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "a664f506-72a5-4e50-80b4-97ed2e6eb334",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": "15bfb9cb-4cf0-812b-b4bc-c85cd00727f8",
+					"name": "Child page",
+					"url": "https://www.notion.so/Child-page-15bfb9cb4cf0812bb4bcc85cd00727f8"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Notion",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Notion": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "75e271ec-4d76-4094-b283-9a3f61a0c111",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "Ucav6QC99JNMCkd3",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/user/get.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/user/get.test.ts
new file mode 100644
index 0000000000000..62ed0ef6e223a
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/user/get.test.ts
@@ -0,0 +1,46 @@
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+const API_RESPONSE = {
+	object: 'user',
+	id: '34a945c6-de97-4efc-90d6-6d7cc14a6583',
+	name: 'second',
+	avatar_url: null,
+	type: 'bot',
+	bot: {},
+	request_id: 'ad2a00c0-fa6a-4a14-bf9a-68e1715b51a1',
+};
+
+jest.mock('../../../../shared/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../shared/GenericFunctions');
+	return {
+		...originalModule,
+		notionApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'GET') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test NotionV2, user => get', () => {
+	const workflows = ['nodes/Notion/test/node/v2/user/get.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../shared/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/user/get.workflow.json b/packages/nodes-base/nodes/Notion/test/node/v2/user/get.workflow.json
new file mode 100644
index 0000000000000..208927f05e262
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/user/get.workflow.json
@@ -0,0 +1,88 @@
+{
+	"name": "tests notion",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "4260fdbd-e92f-4712-8114-38b85f8289ea",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "user",
+				"userId": "34a945c6-de97-4efc-90d6-6d7cc14a6583"
+			},
+			"id": "5ab80e6a-c9c4-4cc5-9332-2fc7a3f8ae24",
+			"name": "Notion",
+			"type": "n8n-nodes-base.notion",
+			"typeVersion": 2.2,
+			"position": [1040, 360],
+			"credentials": {
+				"notionApi": {
+					"id": "CiZXWkDmjiZzpcL1",
+					"name": "Notion account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "a664f506-72a5-4e50-80b4-97ed2e6eb334",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"object": "user",
+					"id": "34a945c6-de97-4efc-90d6-6d7cc14a6583",
+					"name": "second",
+					"avatar_url": null,
+					"type": "bot",
+					"bot": {},
+					"request_id": "ad2a00c0-fa6a-4a14-bf9a-68e1715b51a1"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Notion",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Notion": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "d654cac7-21b8-4d6e-99ce-c5c980d9f49d",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "Ucav6QC99JNMCkd3",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/user/getAll.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/user/getAll.test.ts
new file mode 100644
index 0000000000000..46816dfea2330
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/user/getAll.test.ts
@@ -0,0 +1,70 @@
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+const API_RESPONSE = [
+	{
+		object: 'user',
+		id: 'f215e49c-4677-40c0-9adc-87440d341324',
+		name: 'n8n-test',
+		avatar_url: null,
+		type: 'bot',
+		bot: {
+			owner: {
+				type: 'workspace',
+				workspace: true,
+			},
+			workspace_name: "Michael Kret's Notion",
+		},
+	},
+	{
+		object: 'user',
+		id: '34a945c6-de97-4efc-90d6-6d7cc14a6583',
+		name: 'second',
+		avatar_url: null,
+		type: 'bot',
+		bot: {},
+	},
+	{
+		object: 'user',
+		id: '2598a5de-49b3-4acd-adad-20f6b18c9fbe',
+		name: 'DryMerge',
+		avatar_url:
+			'https://s3-us-west-2.amazonaws.com/public.notion-static.com/e67863a3-a867-4355-a602-c9830dbb1828/Primary_(recommended).jpg',
+		type: 'bot',
+		bot: {},
+	},
+];
+
+jest.mock('../../../../shared/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../shared/GenericFunctions');
+	return {
+		...originalModule,
+		notionApiRequestAllItems: jest.fn(async function (_: string, method: IHttpRequestMethods) {
+			if (method === 'GET') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test NotionV2, user => getAll', () => {
+	const workflows = ['nodes/Notion/test/node/v2/user/getAll.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../shared/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/user/getAll.workflow.json b/packages/nodes-base/nodes/Notion/test/node/v2/user/getAll.workflow.json
new file mode 100644
index 0000000000000..97ce5d332f9fb
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/user/getAll.workflow.json
@@ -0,0 +1,104 @@
+{
+	"name": "tests notion",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "4260fdbd-e92f-4712-8114-38b85f8289ea",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "user",
+				"operation": "getAll",
+				"limit": 2
+			},
+			"id": "5ab80e6a-c9c4-4cc5-9332-2fc7a3f8ae24",
+			"name": "Notion",
+			"type": "n8n-nodes-base.notion",
+			"typeVersion": 2.2,
+			"position": [1040, 360],
+			"credentials": {
+				"notionApi": {
+					"id": "CiZXWkDmjiZzpcL1",
+					"name": "Notion account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "a664f506-72a5-4e50-80b4-97ed2e6eb334",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"object": "user",
+					"id": "f215e49c-4677-40c0-9adc-87440d341324",
+					"name": "n8n-test",
+					"avatar_url": null,
+					"type": "bot",
+					"bot": {
+						"owner": {
+							"type": "workspace",
+							"workspace": true
+						},
+						"workspace_name": "Michael Kret's Notion"
+					}
+				}
+			},
+			{
+				"json": {
+					"object": "user",
+					"id": "34a945c6-de97-4efc-90d6-6d7cc14a6583",
+					"name": "second",
+					"avatar_url": null,
+					"type": "bot",
+					"bot": {}
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Notion",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Notion": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "702bd2aa-53d0-4c82-bbc2-a95a153953b0",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "Ucav6QC99JNMCkd3",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Notion/v1/NotionV1.node.ts b/packages/nodes-base/nodes/Notion/v1/NotionV1.node.ts
index 587094b91bfba..1cc7a817345b6 100644
--- a/packages/nodes-base/nodes/Notion/v1/NotionV1.node.ts
+++ b/packages/nodes-base/nodes/Notion/v1/NotionV1.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,7 +10,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
+import { versionDescription } from './VersionDescription';
 import type { SortData } from '../shared/GenericFunctions';
 import {
 	extractDatabaseId,
@@ -25,9 +26,7 @@ import {
 	notionApiRequestAllItems,
 	simplifyObjects,
 } from '../shared/GenericFunctions';
-
 import { listSearch } from '../shared/methods';
-import { versionDescription } from './VersionDescription';
 
 export class NotionV1 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/Notion/v1/VersionDescription.ts b/packages/nodes-base/nodes/Notion/v1/VersionDescription.ts
index 3d0334a04fb27..f8f9fe5f4a5d6 100644
--- a/packages/nodes-base/nodes/Notion/v1/VersionDescription.ts
+++ b/packages/nodes-base/nodes/Notion/v1/VersionDescription.ts
@@ -1,17 +1,14 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import { NodeConnectionType, type INodeTypeDescription } from 'n8n-workflow';
-import { databaseFields, databaseOperations } from '../shared/descriptions/DatabaseDescription';
-
-import { userFields, userOperations } from '../shared/descriptions/UserDescription';
-
-import { pageFields, pageOperations } from '../shared/descriptions/PageDescription';
 
 import { blockFields, blockOperations } from '../shared/descriptions/BlockDescription';
-
+import { databaseFields, databaseOperations } from '../shared/descriptions/DatabaseDescription';
 import {
 	databasePageFields,
 	databasePageOperations,
 } from '../shared/descriptions/DatabasePageDescription';
+import { pageFields, pageOperations } from '../shared/descriptions/PageDescription';
+import { userFields, userOperations } from '../shared/descriptions/UserDescription';
 
 export const versionDescription: INodeTypeDescription = {
 	displayName: 'Notion',
diff --git a/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts b/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts
index 198dd325cbe96..a5b08b3fe3e4d 100644
--- a/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts
+++ b/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts
@@ -8,6 +8,8 @@ import type {
 } from 'n8n-workflow';
 import { jsonParse, NodeApiError } from 'n8n-workflow';
 
+import { loadOptions } from './methods';
+import { versionDescription } from './VersionDescription';
 import type { SortData, FileRecord } from '../shared/GenericFunctions';
 import {
 	downloadFiles,
@@ -28,10 +30,7 @@ import {
 	simplifyObjects,
 	validateJSON,
 } from '../shared/GenericFunctions';
-
 import { listSearch } from '../shared/methods';
-import { loadOptions } from './methods';
-import { versionDescription } from './VersionDescription';
 
 export class NotionV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/Notion/v2/VersionDescription.ts b/packages/nodes-base/nodes/Notion/v2/VersionDescription.ts
index 4114d681dbc31..d109920c89fbf 100644
--- a/packages/nodes-base/nodes/Notion/v2/VersionDescription.ts
+++ b/packages/nodes-base/nodes/Notion/v2/VersionDescription.ts
@@ -1,17 +1,14 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import { NodeConnectionType, type INodeTypeDescription } from 'n8n-workflow';
-import { databaseFields, databaseOperations } from '../shared/descriptions/DatabaseDescription';
-
-import { userFields, userOperations } from '../shared/descriptions/UserDescription';
-
-import { pageFields, pageOperations } from '../shared/descriptions/PageDescription';
 
 import { blockFields, blockOperations } from '../shared/descriptions/BlockDescription';
-
+import { databaseFields, databaseOperations } from '../shared/descriptions/DatabaseDescription';
 import {
 	databasePageFields,
 	databasePageOperations,
 } from '../shared/descriptions/DatabasePageDescription';
+import { pageFields, pageOperations } from '../shared/descriptions/PageDescription';
+import { userFields, userOperations } from '../shared/descriptions/UserDescription';
 
 export const versionDescription: INodeTypeDescription = {
 	displayName: 'Notion',
diff --git a/packages/nodes-base/nodes/Notion/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/Notion/v2/methods/loadOptions.ts
index 1e0de238361a2..0410032a29c4a 100644
--- a/packages/nodes-base/nodes/Notion/v2/methods/loadOptions.ts
+++ b/packages/nodes-base/nodes/Notion/v2/methods/loadOptions.ts
@@ -1,6 +1,5 @@
-import type { IDataObject, ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
-
 import moment from 'moment-timezone';
+import type { IDataObject, ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
 
 import {
 	extractPageId,
diff --git a/packages/nodes-base/nodes/Npm/Npm.node.ts b/packages/nodes-base/nodes/Npm/Npm.node.ts
index d86c82fe0dac8..2eeca1ec302f5 100644
--- a/packages/nodes-base/nodes/Npm/Npm.node.ts
+++ b/packages/nodes-base/nodes/Npm/Npm.node.ts
@@ -1,7 +1,8 @@
 import type { INodeType, INodeTypeDescription } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
-import { packageFields, packageOperations } from './PackageDescription';
+
 import { distTagFields, distTagOperations } from './DistTagDescription';
+import { packageFields, packageOperations } from './PackageDescription';
 
 export class Npm implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Npm/PackageDescription.ts b/packages/nodes-base/nodes/Npm/PackageDescription.ts
index 75ebf7ed75567..d5b673522a708 100644
--- a/packages/nodes-base/nodes/Npm/PackageDescription.ts
+++ b/packages/nodes-base/nodes/Npm/PackageDescription.ts
@@ -1,5 +1,5 @@
-import { valid as isValidSemver } from 'semver';
 import type { INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import { valid as isValidSemver } from 'semver';
 
 interface PackageJson {
 	name: string;
diff --git a/packages/nodes-base/nodes/Npm/test/Npm.node.test.ts b/packages/nodes-base/nodes/Npm/test/Npm.node.test.ts
index 95d621240be06..2ae6f93a2b04d 100644
--- a/packages/nodes-base/nodes/Npm/test/Npm.node.test.ts
+++ b/packages/nodes-base/nodes/Npm/test/Npm.node.test.ts
@@ -1,6 +1,7 @@
 import nock from 'nock';
-import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
+
 import { FAKE_CREDENTIALS_DATA } from '@test/nodes/FakeCredentialsMap';
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
 
 describe('Test npm Node', () => {
 	beforeAll(() => {
diff --git a/packages/nodes-base/nodes/Odoo/Odoo.node.ts b/packages/nodes-base/nodes/Odoo/Odoo.node.ts
index 58472d9340551..54ca0621cb92e 100644
--- a/packages/nodes-base/nodes/Odoo/Odoo.node.ts
+++ b/packages/nodes-base/nodes/Odoo/Odoo.node.ts
@@ -1,3 +1,4 @@
+import { capitalCase } from 'change-case';
 import type {
 	IExecuteFunctions,
 	ICredentialsDecrypted,
@@ -13,7 +14,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, deepCopy, randomInt } from 'n8n-workflow';
 
-import { capitalCase } from 'change-case';
 import {
 	contactDescription,
 	contactOperations,
@@ -24,7 +24,6 @@ import {
 	opportunityDescription,
 	opportunityOperations,
 } from './descriptions';
-
 import type { IOdooFilterOperations } from './GenericFunctions';
 import {
 	odooCreate,
diff --git a/packages/nodes-base/nodes/Odoo/descriptions/index.ts b/packages/nodes-base/nodes/Odoo/descriptions/index.ts
index 12094d57ee424..d1af6f920170c 100644
--- a/packages/nodes-base/nodes/Odoo/descriptions/index.ts
+++ b/packages/nodes-base/nodes/Odoo/descriptions/index.ts
@@ -1,6 +1,6 @@
+import { contactDescription, contactOperations } from './ContactDescription';
 import { customResourceDescription, customResourceOperations } from './CustomResourceDescription';
 import { noteDescription, noteOperations } from './NoteDescription';
-import { contactDescription, contactOperations } from './ContactDescription';
 import { opportunityDescription, opportunityOperations } from './OpportunityDescription';
 
 export {
diff --git a/packages/nodes-base/nodes/Okta/Okta.node.ts b/packages/nodes-base/nodes/Okta/Okta.node.ts
index 550cffcd672e2..18ec90fb22a93 100644
--- a/packages/nodes-base/nodes/Okta/Okta.node.ts
+++ b/packages/nodes-base/nodes/Okta/Okta.node.ts
@@ -1,5 +1,6 @@
 import type { INodeType, INodeTypeDescription } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
+
 import { userFields, userOperations } from './UserDescription';
 import { getUsers } from './UserFunctions';
 
diff --git a/packages/nodes-base/nodes/Okta/UserDescription.ts b/packages/nodes-base/nodes/Okta/UserDescription.ts
index b10d580339a99..0990e86d7c450 100644
--- a/packages/nodes-base/nodes/Okta/UserDescription.ts
+++ b/packages/nodes-base/nodes/Okta/UserDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { getCursorPaginator, simplifyGetAllResponse, simplifyGetResponse } from './UserFunctions';
 const BASE_API_URL = '/api/v1/users/';
 export const userOperations: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/Okta/test/UserFunctions.test.ts b/packages/nodes-base/nodes/Okta/test/UserFunctions.test.ts
index 9e5262db67a51..1695f8e35edfb 100644
--- a/packages/nodes-base/nodes/Okta/test/UserFunctions.test.ts
+++ b/packages/nodes-base/nodes/Okta/test/UserFunctions.test.ts
@@ -8,6 +8,7 @@ import type {
 	IN8nHttpFullResponse,
 	INodeExecutionData,
 } from 'n8n-workflow';
+
 import {
 	getCursorPaginator,
 	getUsers,
diff --git a/packages/nodes-base/nodes/Onfleet/GenericFunctions.ts b/packages/nodes-base/nodes/Onfleet/GenericFunctions.ts
index 87c1b0be28fd3..a70d12879a52f 100644
--- a/packages/nodes-base/nodes/Onfleet/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Onfleet/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -11,8 +12,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
 export async function onfleetApiRequest(
 	this: IWebhookFunctions | IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	method: IHttpRequestMethods,
diff --git a/packages/nodes-base/nodes/Onfleet/Onfleet.node.ts b/packages/nodes-base/nodes/Onfleet/Onfleet.node.ts
index fa6848da69402..e6c18b9026ec1 100644
--- a/packages/nodes-base/nodes/Onfleet/Onfleet.node.ts
+++ b/packages/nodes-base/nodes/Onfleet/Onfleet.node.ts
@@ -11,31 +11,16 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { taskFields, taskOperations } from './descriptions/TaskDescription';
-
-import { destinationFields, destinationOperations } from './descriptions/DestinationDescription';
-
-import { resourceLoaders } from './GenericFunctions';
-
-import { recipientFields, recipientOperations } from './descriptions/RecipientDescription';
-
-import { organizationFields, organizationOperations } from './descriptions/OrganizationDescription';
-
 import { adminFields, adminOperations } from './descriptions/AdministratorDescription';
-
-import { hubFields, hubOperations } from './descriptions/HubDescription';
-
-import { workerFields, workerOperations } from './descriptions/WorkerDescription';
-
-// import {
-// 	webhookFields,
-// 	webhookOperations,
-// } from './descriptions/WebhookDescription';
-
 import { containerFields, containerOperations } from './descriptions/ContainerDescription';
-
+import { destinationFields, destinationOperations } from './descriptions/DestinationDescription';
+import { hubFields, hubOperations } from './descriptions/HubDescription';
+import { organizationFields, organizationOperations } from './descriptions/OrganizationDescription';
+import { recipientFields, recipientOperations } from './descriptions/RecipientDescription';
+import { taskFields, taskOperations } from './descriptions/TaskDescription';
 import { teamFields, teamOperations } from './descriptions/TeamDescription';
-
+import { workerFields, workerOperations } from './descriptions/WorkerDescription';
+import { resourceLoaders } from './GenericFunctions';
 import { Onfleet as OnfleetMethods } from './Onfleet';
 export class Onfleet implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Onfleet/Onfleet.ts b/packages/nodes-base/nodes/Onfleet/Onfleet.ts
index b5c17186c5c6b..9fc02b2c46a9e 100644
--- a/packages/nodes-base/nodes/Onfleet/Onfleet.ts
+++ b/packages/nodes-base/nodes/Onfleet/Onfleet.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -8,7 +9,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
+import { onfleetApiRequest, onfleetApiRequestAllItems } from './GenericFunctions';
 import type {
 	OnfleetAdmins,
 	OnfleetCloneOverrideTaskOptions,
@@ -31,8 +32,6 @@ import type {
 	OnfleetWorkerScheduleEntry,
 } from './interfaces';
 
-import { onfleetApiRequest, onfleetApiRequestAllItems } from './GenericFunctions';
-
 const formatAddress = (
 	unparsed: boolean,
 	address: string | undefined,
@@ -789,7 +788,6 @@ export class Onfleet {
 			const tasksData = {
 				tasks: items.map((_item, index) => Onfleet.getTaskFields.call(this, index, operation)),
 			};
-			//@ts-ignore
 			const { tasks: tasksCreated } = await onfleetApiRequest.call(this, 'POST', path, tasksData);
 			return tasksCreated;
 		}
diff --git a/packages/nodes-base/nodes/Onfleet/OnfleetTrigger.node.ts b/packages/nodes-base/nodes/Onfleet/OnfleetTrigger.node.ts
index 24a1079cb40c4..3309734562649 100644
--- a/packages/nodes-base/nodes/Onfleet/OnfleetTrigger.node.ts
+++ b/packages/nodes-base/nodes/Onfleet/OnfleetTrigger.node.ts
@@ -10,9 +10,7 @@ import type {
 import { NodeApiError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
 import { eventDisplay, eventNameField } from './descriptions/OnfleetWebhookDescription';
-
 import { onfleetApiRequest } from './GenericFunctions';
-
 import { webhookMapping } from './WebhookMapping';
 
 export class OnfleetTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Onfleet/descriptions/TaskDescription.ts b/packages/nodes-base/nodes/Onfleet/descriptions/TaskDescription.ts
index a967ed000757b..bbb3affc79d7f 100644
--- a/packages/nodes-base/nodes/Onfleet/descriptions/TaskDescription.ts
+++ b/packages/nodes-base/nodes/Onfleet/descriptions/TaskDescription.ts
@@ -1,7 +1,6 @@
 import type { INodeProperties } from 'n8n-workflow';
 
 import { destinationExternalField } from './DestinationDescription';
-
 import { recipientExternalField } from './RecipientDescription';
 
 export const taskOperations: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/OpenAi/ChatDescription.ts b/packages/nodes-base/nodes/OpenAi/ChatDescription.ts
index 2b0ef3e8df4f3..35db57f4bdf22 100644
--- a/packages/nodes-base/nodes/OpenAi/ChatDescription.ts
+++ b/packages/nodes-base/nodes/OpenAi/ChatDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeExecutionData, INodeProperties } from 'n8n-workflow';
+
 import { sendErrorPostReceive } from './GenericFunctions';
 
 export const chatOperations: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/OpenAi/ImageDescription.ts b/packages/nodes-base/nodes/OpenAi/ImageDescription.ts
index 1cb5ceb89d2b8..1b66be886c5d0 100644
--- a/packages/nodes-base/nodes/OpenAi/ImageDescription.ts
+++ b/packages/nodes-base/nodes/OpenAi/ImageDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeExecutionData, INodeProperties } from 'n8n-workflow';
+
 import { sendErrorPostReceive } from './GenericFunctions';
 
 export const imageOperations: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/OpenAi/OpenAi.node.ts b/packages/nodes-base/nodes/OpenAi/OpenAi.node.ts
index dd2d221868c65..0594353d04e99 100644
--- a/packages/nodes-base/nodes/OpenAi/OpenAi.node.ts
+++ b/packages/nodes-base/nodes/OpenAi/OpenAi.node.ts
@@ -1,9 +1,10 @@
 import type { INodeType, INodeTypeDescription } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
-import { oldVersionNotice } from '../../utils/descriptions';
+
+import { chatFields, chatOperations } from './ChatDescription';
 import { imageFields, imageOperations } from './ImageDescription';
 import { textFields, textOperations } from './TextDescription';
-import { chatFields, chatOperations } from './ChatDescription';
+import { oldVersionNotice } from '../../utils/descriptions';
 
 export class OpenAi implements INodeType {
 	description: INodeTypeDescription = {
@@ -28,7 +29,8 @@ export class OpenAi implements INodeType {
 		],
 		requestDefaults: {
 			ignoreHttpStatusErrors: true,
-			baseURL: 'https://api.openai.com',
+			baseURL:
+				'={{ $credentials.url?.split("/").slice(0,-1).join("/") ?? "https://api.openai.com" }}',
 		},
 		properties: [
 			oldVersionNotice,
diff --git a/packages/nodes-base/nodes/OpenAi/TextDescription.ts b/packages/nodes-base/nodes/OpenAi/TextDescription.ts
index 30b533e90e206..e22eb0d72a414 100644
--- a/packages/nodes-base/nodes/OpenAi/TextDescription.ts
+++ b/packages/nodes-base/nodes/OpenAi/TextDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeExecutionData, INodeProperties } from 'n8n-workflow';
+
 import { sendErrorPostReceive } from './GenericFunctions';
 
 export const textOperations: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/Orbit/Orbit.node.ts b/packages/nodes-base/nodes/Orbit/Orbit.node.ts
index 81141b3be41d0..1f938b9456e37 100644
--- a/packages/nodes-base/nodes/Orbit/Orbit.node.ts
+++ b/packages/nodes-base/nodes/Orbit/Orbit.node.ts
@@ -6,15 +6,11 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-
 import { NodeApiError, NodeConnectionType } from 'n8n-workflow';
 
 import { activityFields, activityOperations } from './ActivityDescription';
-
 import { memberFields, memberOperations } from './MemberDescription';
-
 import { noteFields, noteOperations } from './NoteDescription';
-
 import { postFields, postOperations } from './PostDescription';
 
 export class Orbit implements INodeType {
diff --git a/packages/nodes-base/nodes/Oura/Oura.node.ts b/packages/nodes-base/nodes/Oura/Oura.node.ts
index e96b2c57cb6dc..ce522996d7090 100644
--- a/packages/nodes-base/nodes/Oura/Oura.node.ts
+++ b/packages/nodes-base/nodes/Oura/Oura.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -7,11 +8,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import { ouraApiRequest } from './GenericFunctions';
-
 import { profileOperations } from './ProfileDescription';
-
 import { summaryFields, summaryOperations } from './SummaryDescription';
 
 export class Oura implements INodeType {
diff --git a/packages/nodes-base/nodes/Paddle/Paddle.node.ts b/packages/nodes-base/nodes/Paddle/Paddle.node.ts
index cb9ce4b76a943..1bdedf23387e5 100644
--- a/packages/nodes-base/nodes/Paddle/Paddle.node.ts
+++ b/packages/nodes-base/nodes/Paddle/Paddle.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -10,17 +11,11 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import { couponFields, couponOperations } from './CouponDescription';
-
 import { paddleApiRequest, paddleApiRequestAllItems, validateJSON } from './GenericFunctions';
-
 import { paymentFields, paymentOperations } from './PaymentDescription';
-
 import { planFields, planOperations } from './PlanDescription';
-
 import { productFields, productOperations } from './ProductDescription';
-
 import { userFields, userOperations } from './UserDescription';
 
 // import {
diff --git a/packages/nodes-base/nodes/PagerDuty/GenericFunctions.ts b/packages/nodes-base/nodes/PagerDuty/GenericFunctions.ts
index 3206e205871d0..3f21331d71c8c 100644
--- a/packages/nodes-base/nodes/PagerDuty/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/PagerDuty/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import { snakeCase } from 'change-case';
 import type {
 	JsonObject,
 	IDataObject,
@@ -10,8 +11,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
-
 export async function pagerDutyApiRequest(
 	this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions,
 	method: IHttpRequestMethods,
diff --git a/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts b/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts
index 4a1cfbbe6707a..d00742dec10b4 100644
--- a/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts
+++ b/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts
@@ -1,3 +1,5 @@
+import { snakeCase } from 'change-case';
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,24 +11,17 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
-import moment from 'moment-timezone';
 import {
 	keysToSnakeCase,
 	pagerDutyApiRequest,
 	pagerDutyApiRequestAllItems,
 } from './GenericFunctions';
-
 import { incidentFields, incidentOperations } from './IncidentDescription';
-
+import type { IIncident } from './IncidentInterface';
 import { incidentNoteFields, incidentNoteOperations } from './IncidentNoteDescription';
-
 import { logEntryFields, logEntryOperations } from './LogEntryDescription';
-
 import { userFields, userOperations } from './UserDescription';
 
-import type { IIncident } from './IncidentInterface';
-
 export class PagerDuty implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'PagerDuty',
diff --git a/packages/nodes-base/nodes/PayPal/PayPal.node.ts b/packages/nodes-base/nodes/PayPal/PayPal.node.ts
index c046226a3e828..a10001b652c81 100644
--- a/packages/nodes-base/nodes/PayPal/PayPal.node.ts
+++ b/packages/nodes-base/nodes/PayPal/PayPal.node.ts
@@ -10,6 +10,8 @@ import type {
 	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+
+import { payPalApiRequest, payPalApiRequestAllItems, validateJSON } from './GenericFunctions';
 import {
 	payoutFields,
 	payoutItemFields,
@@ -24,7 +26,6 @@ import type {
 	RecipientType,
 	RecipientWallet,
 } from './PaymentInteface';
-import { payPalApiRequest, payPalApiRequestAllItems, validateJSON } from './GenericFunctions';
 
 export class PayPal implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts b/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts
index 6d409202d4e6e..7fb8987ef5d06 100644
--- a/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts
+++ b/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts
@@ -10,6 +10,7 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeConnectionType } from 'n8n-workflow';
+
 import { payPalApiRequest, upperFist } from './GenericFunctions';
 
 export class PayPalTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Peekalink/test/Peekalink.node.test.ts b/packages/nodes-base/nodes/Peekalink/test/Peekalink.node.test.ts
index 1bfa540ee20bf..4c06cf620fb70 100644
--- a/packages/nodes-base/nodes/Peekalink/test/Peekalink.node.test.ts
+++ b/packages/nodes-base/nodes/Peekalink/test/Peekalink.node.test.ts
@@ -1,8 +1,10 @@
 import { NodeConnectionType } from 'n8n-workflow';
-import { apiUrl } from '../Peekalink.node';
-import type { WorkflowTestData } from '@test/nodes/types';
+
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import * as Helpers from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+
+import { apiUrl } from '../Peekalink.node';
 
 describe('Peekalink Node', () => {
 	const exampleComPreview = {
diff --git a/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts b/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts
index 33a323830d983..facb21aa464c0 100644
--- a/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts
+++ b/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts
@@ -9,9 +9,8 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { phantombusterApiRequest, validateJSON } from './GenericFunctions';
-
 import { agentFields, agentOperations } from './AgentDescription';
+import { phantombusterApiRequest, validateJSON } from './GenericFunctions';
 
 // import {
 // 	sentenceCase,
diff --git a/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts b/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts
index 63634980b66d6..83c90c3068621 100644
--- a/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts
+++ b/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts
@@ -10,7 +10,6 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { getUser, philipsHueApiRequest } from './GenericFunctions';
-
 import { lightFields, lightOperations } from './LightDescription';
 
 export class PhilipsHue implements INodeType {
diff --git a/packages/nodes-base/nodes/PhilipsHue/test/apiResponses.ts b/packages/nodes-base/nodes/PhilipsHue/test/apiResponses.ts
new file mode 100644
index 0000000000000..9edfbbc332046
--- /dev/null
+++ b/packages/nodes-base/nodes/PhilipsHue/test/apiResponses.ts
@@ -0,0 +1,108 @@
+export const getLightsResponse = {
+	'1': {
+		state: {
+			on: false,
+			bri: 1,
+			hue: 33761,
+			sat: 254,
+			effect: 'none',
+			xy: [0.3171, 0.3366],
+			ct: 159,
+			alert: 'none',
+			colormode: 'xy',
+			mode: 'homeautomation',
+			reachable: true,
+		},
+		swupdate: {
+			state: 'noupdates',
+			lastinstall: '2018-01-02T19:24:20',
+		},
+		type: 'Extended color light',
+		name: 'Hue color lamp 7',
+		modelid: 'LCT007',
+		manufacturername: 'Philips',
+		productname: 'Hue color lamp',
+		capabilities: {
+			certified: true,
+			control: {
+				mindimlevel: 5000,
+				maxlumen: 600,
+				colorgamuttype: 'B',
+				colorgamut: [
+					[0.675, 0.322],
+					[0.409, 0.518],
+					[0.167, 0.04],
+				],
+				ct: {
+					min: 153,
+					max: 500,
+				},
+			},
+			streaming: {
+				renderer: true,
+				proxy: false,
+			},
+		},
+		config: {
+			archetype: 'sultanbulb',
+			function: 'mixed',
+			direction: 'omnidirectional',
+		},
+		uniqueid: '00:17:88:01:00:bd:c7:b9-0b',
+		swversion: '5.105.0.21169',
+	},
+};
+
+export const getConfigResponse = {
+	name: 'Philips hue',
+	zigbeechannel: 15,
+	mac: '00:17:88:00:00:00',
+	dhcp: true,
+	ipaddress: '192.168.1.7',
+	netmask: '255.255.255.0',
+	gateway: '192.168.1.1',
+	proxyaddress: 'none',
+	proxyport: 0,
+	UTC: '2014-07-17T09:27:35',
+	localtime: '2014-07-17T11:27:35',
+	timezone: 'Europe/Madrid',
+	whitelist: {
+		ffffffffe0341b1b376a2389376a2389: {
+			'last use date': '2014-07-17T07:21:38',
+			'create date': '2014-04-08T08:55:10',
+			name: 'PhilipsHueAndroidApp#TCT ALCATEL ONE TOU',
+		},
+		pAtwdCV8NZId25Gk: {
+			'last use date': '2014-05-07T18:28:29',
+			'create date': '2014-04-09T17:29:16',
+			name: 'n8n',
+		},
+	},
+	swversion: '01012917',
+	apiversion: '1.3.0',
+	swupdate: {
+		updatestate: 0,
+		url: '',
+		text: '',
+		notify: false,
+	},
+	linkbutton: false,
+	portalservices: false,
+	portalconnection: 'connected',
+	portalstate: {
+		signedon: true,
+		incoming: false,
+		outgoing: true,
+		communication: 'disconnected',
+	},
+};
+
+export const updateLightResponse = [
+	{ success: { '/lights/1/state/bri': 200 } },
+	{ success: { '/lights/1/state/on': true } },
+	{ success: { '/lights/1/state/hue': 50000 } },
+];
+
+export const deleteLightResponse = {
+	success: '/lights/1 deleted.',
+};
diff --git a/packages/nodes-base/nodes/PhilipsHue/test/workflow.json b/packages/nodes-base/nodes/PhilipsHue/test/workflow.json
new file mode 100644
index 0000000000000..39df6bd1aad22
--- /dev/null
+++ b/packages/nodes-base/nodes/PhilipsHue/test/workflow.json
@@ -0,0 +1,227 @@
+{
+	"name": "[TEST] Hue",
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [0, 0],
+			"id": "9e687c5d-e3a5-436d-a96d-7bfde1110f40",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"operation": "getAll",
+				"returnAll": true
+			},
+			"type": "n8n-nodes-base.philipsHue",
+			"typeVersion": 1,
+			"position": [260, 0],
+			"id": "063bcf31-3055-42f1-904f-d517f85db182",
+			"name": "Philips Hue",
+			"credentials": {
+				"philipsHueOAuth2Api": {
+					"id": "s6tRicNTKQoa9TDq",
+					"name": "PhilipHue account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [480, 0],
+			"id": "d6c4f99a-d660-4113-aa08-a7bcc9391236",
+			"name": "No Operation, do nothing"
+		},
+		{
+			"parameters": {
+				"lightId": "=1",
+				"additionalFields": {
+					"bri": 200,
+					"hue": 50000
+				}
+			},
+			"type": "n8n-nodes-base.philipsHue",
+			"typeVersion": 1,
+			"position": [260, 200],
+			"id": "c8311112-d24e-4787-80b1-cc5397aea98e",
+			"name": "Philips Hue1",
+			"credentials": {
+				"philipsHueOAuth2Api": {
+					"id": "s6tRicNTKQoa9TDq",
+					"name": "PhilipHue account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [480, 200],
+			"id": "c438bf28-0cf8-459a-bd3a-28f6c30b3f2f",
+			"name": "No Operation, do nothing1"
+		},
+		{
+			"parameters": {
+				"operation": "delete",
+				"lightId": "=1"
+			},
+			"type": "n8n-nodes-base.philipsHue",
+			"typeVersion": 1,
+			"position": [280, 400],
+			"id": "fd197627-9221-4e6d-ab51-53d262004db8",
+			"name": "Philips Hue2",
+			"credentials": {
+				"philipsHueOAuth2Api": {
+					"id": "s6tRicNTKQoa9TDq",
+					"name": "PhilipHue account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [500, 400],
+			"id": "19796164-8527-462b-b01b-71d7f60c94af",
+			"name": "No Operation, do nothing2"
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"state": {
+						"on": false,
+						"bri": 1,
+						"hue": 33761,
+						"sat": 254,
+						"effect": "none",
+						"xy": [0.3171, 0.3366],
+						"ct": 159,
+						"alert": "none",
+						"colormode": "xy",
+						"mode": "homeautomation",
+						"reachable": true
+					},
+					"swupdate": {
+						"state": "noupdates",
+						"lastinstall": "2018-01-02T19:24:20"
+					},
+					"type": "Extended color light",
+					"name": "Hue color lamp 7",
+					"modelid": "LCT007",
+					"manufacturername": "Philips",
+					"productname": "Hue color lamp",
+					"capabilities": {
+						"certified": true,
+						"control": {
+							"mindimlevel": 5000,
+							"maxlumen": 600,
+							"colorgamuttype": "B",
+							"colorgamut": [[0.675, 0.322], [0.409, 0.518], [0.167, 0.04]],
+							"ct": {
+								"min": 153,
+								"max": 500
+							}
+						},
+						"streaming": {
+							"renderer": true,
+							"proxy": false
+						}
+					},
+					"config": {
+						"archetype": "sultanbulb",
+						"function": "mixed",
+						"direction": "omnidirectional"
+					},
+					"uniqueid": "00:17:88:01:00:bd:c7:b9-0b",
+					"swversion": "5.105.0.21169"
+				}
+			}
+		],
+		"No Operation, do nothing1": [
+			{
+				"json": {
+					"/lights/1/state/bri": 200,
+					"/lights/1/state/on": true,
+					"/lights/1/state/hue": 50000
+				}
+			}
+		],
+		"No Operation, do nothing2": [
+			{
+				"json": {
+					"success": "/lights/1 deleted."
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Philips Hue",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Philips Hue1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Philips Hue2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Philips Hue": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Philips Hue1": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Philips Hue2": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "2c19891b-ba8e-4026-b8c2-b5f3f508b54a",
+	"meta": {
+		"instanceId": "0fa937d34dcabeff4bd6480d3b42cc95edf3bc20e6810819086ef1ce2623639d"
+	},
+	"id": "LAngRPRzm3OGrfh0",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/PhilipsHue/test/workflow.test.ts b/packages/nodes-base/nodes/PhilipsHue/test/workflow.test.ts
new file mode 100644
index 0000000000000..26f67966327cd
--- /dev/null
+++ b/packages/nodes-base/nodes/PhilipsHue/test/workflow.test.ts
@@ -0,0 +1,41 @@
+import nock from 'nock';
+
+import {
+	deleteLightResponse,
+	getLightsResponse,
+	getConfigResponse,
+	updateLightResponse,
+} from './apiResponses';
+import {
+	setup,
+	equalityTest,
+	workflowToTests,
+	getWorkflowFilenames,
+} from '../../../test/nodes/Helpers';
+
+describe('PhilipsHue', () => {
+	describe('Run workflow', () => {
+		const workflows = getWorkflowFilenames(__dirname);
+		const tests = workflowToTests(workflows);
+
+		beforeAll(() => {
+			nock.disableNetConnect();
+
+			const mock = nock('https://api.meethue.com/route');
+			mock.persist().get('/api/0/config').reply(200, getConfigResponse);
+			mock.get('/api/pAtwdCV8NZId25Gk/lights').reply(200, getLightsResponse);
+			mock.put('/api/pAtwdCV8NZId25Gk/lights/1/state').reply(200, updateLightResponse);
+			mock.delete('/api/pAtwdCV8NZId25Gk/lights/1').reply(200, deleteLightResponse);
+		});
+
+		afterAll(() => {
+			nock.restore();
+		});
+
+		const nodeTypes = setup(tests);
+
+		for (const testData of tests) {
+			test(testData.description, async () => await equalityTest(testData, nodeTypes));
+		}
+	});
+});
diff --git a/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts b/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
index a92578a4d1811..bdca4a33f4c46 100644
--- a/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
+++ b/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
@@ -19,7 +19,6 @@ import {
 	pipedriveResolveCustomProperties,
 	sortOptionParameters,
 } from './GenericFunctions';
-
 import { currencies } from './utils';
 
 interface CustomProperty {
diff --git a/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts b/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
index 0ebe6792cb506..aba0297bd76a3 100644
--- a/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
+++ b/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
@@ -1,3 +1,5 @@
+import basicAuth from 'basic-auth';
+import type { Response } from 'express';
 import {
 	type IHookFunctions,
 	type IWebhookFunctions,
@@ -9,9 +11,6 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import basicAuth from 'basic-auth';
-
-import type { Response } from 'express';
 import { pipedriveApiRequest } from './GenericFunctions';
 
 function authorizationError(resp: Response, realm: string, responseCode: number, message?: string) {
diff --git a/packages/nodes-base/nodes/Plivo/Plivo.node.ts b/packages/nodes-base/nodes/Plivo/Plivo.node.ts
index d6ce65de0e9ab..53f651a31cefa 100644
--- a/packages/nodes-base/nodes/Plivo/Plivo.node.ts
+++ b/packages/nodes-base/nodes/Plivo/Plivo.node.ts
@@ -7,13 +7,10 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { smsFields, smsOperations } from './SmsDescription';
-
-import { mmsFields, mmsOperations } from './MmsDescription';
-
 import { callFields, callOperations } from './CallDescription';
-
 import { plivoApiRequest } from './GenericFunctions';
+import { mmsFields, mmsOperations } from './MmsDescription';
+import { smsFields, smsOperations } from './SmsDescription';
 
 export class Plivo implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/PostBin/PostBin.node.ts b/packages/nodes-base/nodes/PostBin/PostBin.node.ts
index ccad7205dc9e2..4547ca1fc5185 100644
--- a/packages/nodes-base/nodes/PostBin/PostBin.node.ts
+++ b/packages/nodes-base/nodes/PostBin/PostBin.node.ts
@@ -2,7 +2,6 @@ import type { INodeType, INodeTypeDescription } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { binFields, binOperations } from './BinDescription';
-
 import { requestFields, requestOperations } from './RequestDescription';
 
 export class PostBin implements INodeType {
diff --git a/packages/nodes-base/nodes/PostHog/PostHog.node.ts b/packages/nodes-base/nodes/PostHog/PostHog.node.ts
index 603bddcc025dc..3a894815a8d53 100644
--- a/packages/nodes-base/nodes/PostHog/PostHog.node.ts
+++ b/packages/nodes-base/nodes/PostHog/PostHog.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -7,17 +8,12 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-import type { IAlias, IEvent, IIdentity, ITrack } from './GenericFunctions';
-import { posthogApiRequest } from './GenericFunctions';
-
 import { aliasFields, aliasOperations } from './AliasDescription';
-
 import { eventFields, eventOperations } from './EventDescription';
-
-import { trackFields, trackOperations } from './TrackDescription';
-
+import type { IAlias, IEvent, IIdentity, ITrack } from './GenericFunctions';
+import { posthogApiRequest } from './GenericFunctions';
 import { identityFields, identityOperations } from './IdentityDescription';
+import { trackFields, trackOperations } from './TrackDescription';
 
 export class PostHog implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Postgres/PostgresTrigger.node.ts b/packages/nodes-base/nodes/Postgres/PostgresTrigger.node.ts
index 1bf2334071b22..31b37751a58ea 100644
--- a/packages/nodes-base/nodes/Postgres/PostgresTrigger.node.ts
+++ b/packages/nodes-base/nodes/Postgres/PostgresTrigger.node.ts
@@ -7,6 +7,7 @@ import {
 	type ITriggerResponse,
 	NodeConnectionType,
 } from 'n8n-workflow';
+
 import {
 	pgTriggerFunction,
 	initDB,
diff --git a/packages/nodes-base/nodes/Postgres/test/v2/operations.test.ts b/packages/nodes-base/nodes/Postgres/test/v2/operations.test.ts
index 0f979667697c2..a65c2d8de9d3e 100644
--- a/packages/nodes-base/nodes/Postgres/test/v2/operations.test.ts
+++ b/packages/nodes-base/nodes/Postgres/test/v2/operations.test.ts
@@ -1,3 +1,4 @@
+import { get } from 'lodash';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -6,15 +7,14 @@ import type {
 	INodeParameters,
 } from 'n8n-workflow';
 
-import { get } from 'lodash';
-import type { ColumnInfo, PgpDatabase, QueriesRunner } from '../../v2/helpers/interfaces';
-
 import * as deleteTable from '../../v2/actions/database/deleteTable.operation';
 import * as executeQuery from '../../v2/actions/database/executeQuery.operation';
 import * as insert from '../../v2/actions/database/insert.operation';
 import * as select from '../../v2/actions/database/select.operation';
 import * as update from '../../v2/actions/database/update.operation';
 import * as upsert from '../../v2/actions/database/upsert.operation';
+import type { ColumnInfo, PgpDatabase, QueriesRunner } from '../../v2/helpers/interfaces';
+import * as utils from '../../v2/helpers/utils';
 
 const runQueries: QueriesRunner = jest.fn();
 
@@ -217,7 +217,7 @@ describe('Test PostgresV2, executeQuery operation', () => {
 		);
 
 		expect(runQueries).toHaveBeenCalledWith(
-			[{ query: 'select * from $1:name;', values: ['my_table'] }],
+			[{ query: 'select * from $1:name;', values: ['my_table'], options: { partial: true } }],
 			items,
 			nodeOptions,
 		);
@@ -239,7 +239,7 @@ describe('Test PostgresV2, executeQuery operation', () => {
 		);
 
 		expect(runQueries).toHaveBeenCalledWith(
-			[{ query: 'select $1;', values: ['$1'] }],
+			[{ query: 'select $1;', values: ['$1'], options: { partial: true } }],
 			items,
 			nodeOptions,
 		);
@@ -263,7 +263,7 @@ describe('Test PostgresV2, executeQuery operation', () => {
 		);
 
 		expect(runQueries).toHaveBeenCalledWith(
-			[{ query: "select '$1';", values: ['my_table'] }],
+			[{ query: "select '$1';", values: ['my_table'], options: { partial: true } }],
 			items,
 			nodeOptions,
 		);
@@ -288,7 +288,7 @@ describe('Test PostgresV2, executeQuery operation', () => {
 		);
 
 		expect(runQueries).toHaveBeenCalledWith(
-			[{ query: 'select $2;', values: ['my_table', '$1'] }],
+			[{ query: 'select $2;', values: ['my_table', '$1'], options: { partial: true } }],
 			items,
 			nodeOptions,
 		);
@@ -313,6 +313,147 @@ describe('Test PostgresV2, executeQuery operation', () => {
 			);
 		}).not.toThrow();
 	});
+
+	it('should allow users to use $$ instead of strings', async () => {
+		const nodeParameters: IDataObject = {
+			operation: 'executeQuery',
+			query: 'INSERT INTO dollar_bug (description) VALUES ($$34test$$);',
+			options: {},
+		};
+		const nodeOptions = nodeParameters.options as IDataObject;
+
+		expect(async () => {
+			await executeQuery.execute.call(
+				createMockExecuteFunction(nodeParameters),
+				runQueries,
+				items,
+				nodeOptions,
+			);
+		}).not.toThrow();
+	});
+
+	it('should allow users to use $$ instead of strings while using query parameters', async () => {
+		const nodeParameters: IDataObject = {
+			operation: 'executeQuery',
+			query: 'INSERT INTO dollar_bug (description) VALUES ($1 || $$4more text$$)',
+			options: {
+				queryReplacement: '={{ $3This is a test }}',
+			},
+		};
+		const nodeOptions = nodeParameters.options as IDataObject;
+
+		await executeQuery.execute.call(
+			createMockExecuteFunction(nodeParameters),
+			runQueries,
+			items,
+			nodeOptions,
+		);
+
+		expect(runQueries).toHaveBeenCalledWith(
+			[
+				{
+					query: 'INSERT INTO dollar_bug (description) VALUES ($1 || $$4more text$$)',
+					values: [' $3This is a test '],
+					options: { partial: true },
+				},
+			],
+			items,
+			nodeOptions,
+		);
+	});
+
+	it('should execute queries with multiple json key/value pairs', async () => {
+		const nodeParameters: IDataObject = {
+			operation: 'executeQuery',
+			query: 'SELECT *\nFROM users\nWHERE username IN ($1, $2, $3)',
+			options: {
+				queryReplacement:
+					'={{ JSON.stringify({id: "7",id2: "848da11d-e72e-44c5-yyyy-c6fb9f17d366"}) }}',
+			},
+		};
+		const nodeOptions = nodeParameters.options as IDataObject;
+
+		expect(async () => {
+			await executeQuery.execute.call(
+				createMockExecuteFunction(nodeParameters),
+				runQueries,
+				items,
+				nodeOptions,
+			);
+		}).not.toThrow();
+	});
+
+	it('should execute queries with single json key/value pair', async () => {
+		const nodeParameters: IDataObject = {
+			operation: 'executeQuery',
+			query: 'SELECT *\nFROM users\nWHERE username IN ($1, $2, $3)',
+			options: {
+				queryReplacement: '={{ {"id": "7"} }}',
+			},
+		};
+		const nodeOptions = nodeParameters.options as IDataObject;
+
+		expect(async () => {
+			await executeQuery.execute.call(
+				createMockExecuteFunction(nodeParameters),
+				runQueries,
+				items,
+				nodeOptions,
+			);
+		}).not.toThrow();
+	});
+
+	it('should not parse out expressions if there are valid JSON query parameters', async () => {
+		const query = 'SELECT *\nFROM users\nWHERE username IN ($1, $2, $3)';
+		const nodeParameters: IDataObject = {
+			operation: 'executeQuery',
+			query,
+			options: {
+				queryReplacement: '={{ {"id": "7"} }}',
+				nodeVersion: 2.6,
+			},
+		};
+		const nodeOptions = nodeParameters.options as IDataObject;
+
+		jest.spyOn(utils, 'isJSON');
+		jest.spyOn(utils, 'stringToArray');
+
+		await executeQuery.execute.call(
+			createMockExecuteFunction(nodeParameters),
+			runQueries,
+			items,
+			nodeOptions,
+		);
+
+		expect(utils.isJSON).toHaveBeenCalledTimes(1);
+		expect(utils.stringToArray).toHaveBeenCalledTimes(0);
+	});
+
+	it('should parse out expressions if is invalid JSON in query parameters', async () => {
+		const query = 'SELECT *\nFROM users\nWHERE username IN ($1, $2, $3)';
+		const nodeParameters: IDataObject = {
+			operation: 'executeQuery',
+			query,
+			options: {
+				queryReplacement: '={{ JSON.stringify({"id": "7"}}) }}',
+				nodeVersion: 2.6,
+			},
+		};
+		const nodeOptions = nodeParameters.options as IDataObject;
+
+		jest.spyOn(utils, 'isJSON');
+		jest.spyOn(utils, 'stringToArray');
+
+		await executeQuery.execute.call(
+			createMockExecuteFunction(nodeParameters),
+			runQueries,
+			items,
+			nodeOptions,
+		);
+
+		expect(utils.isJSON).toHaveBeenCalledTimes(1);
+		expect(utils.stringToArray).toHaveBeenCalledTimes(1);
+	});
 });
 
 describe('Test PostgresV2, insert operation', () => {
diff --git a/packages/nodes-base/nodes/Postgres/test/v2/runQueries.test.ts b/packages/nodes-base/nodes/Postgres/test/v2/runQueries.test.ts
index d8dc12b01f7b2..86689890f279e 100644
--- a/packages/nodes-base/nodes/Postgres/test/v2/runQueries.test.ts
+++ b/packages/nodes-base/nodes/Postgres/test/v2/runQueries.test.ts
@@ -1,7 +1,7 @@
+import { mock } from 'jest-mock-extended';
 import type { IDataObject, IExecuteFunctions, INode } from 'n8n-workflow';
-
 import pgPromise from 'pg-promise';
-import { mock } from 'jest-mock-extended';
+
 import type { PgpDatabase } from '../../v2/helpers/interfaces';
 import { configureQueryRunner } from '../../v2/helpers/utils';
 
diff --git a/packages/nodes-base/nodes/Postgres/test/v2/utils.test.ts b/packages/nodes-base/nodes/Postgres/test/v2/utils.test.ts
index 39cdaf16ec005..25840b33bd3f6 100644
--- a/packages/nodes-base/nodes/Postgres/test/v2/utils.test.ts
+++ b/packages/nodes-base/nodes/Postgres/test/v2/utils.test.ts
@@ -1,5 +1,7 @@
 import type { IDataObject, INode } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
+import type { ColumnInfo } from '../../v2/helpers/interfaces';
 import {
 	addSortRules,
 	addReturning,
@@ -11,8 +13,8 @@ import {
 	replaceEmptyStringsByNulls,
 	wrapData,
 	convertArraysToPostgresFormat,
+	isJSON,
 } from '../../v2/helpers/utils';
-import type { ColumnInfo } from '../../v2/helpers/interfaces';
 
 const node: INode = {
 	id: '1',
@@ -25,6 +27,15 @@ const node: INode = {
 	},
 };
 
+describe('Test PostgresV2, isJSON', () => {
+	it('should return true for valid JSON', () => {
+		expect(isJSON('{"key": "value"}')).toEqual(true);
+	});
+	it('should return false for invalid JSON', () => {
+		expect(isJSON('{"key": "value"')).toEqual(false);
+	});
+});
+
 describe('Test PostgresV2, wrapData', () => {
 	it('should wrap object in json', () => {
 		const data = {
diff --git a/packages/nodes-base/nodes/Postgres/v1/PostgresV1.node.ts b/packages/nodes-base/nodes/Postgres/v1/PostgresV1.node.ts
index e45f5232c9299..b58aca9701591 100644
--- a/packages/nodes-base/nodes/Postgres/v1/PostgresV1.node.ts
+++ b/packages/nodes-base/nodes/Postgres/v1/PostgresV1.node.ts
@@ -10,13 +10,12 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-
 import pgPromise from 'pg-promise';
 
-import { pgInsertV2, pgQueryV2, pgUpdate, wrapData } from './genericFunctions';
-
 import { oldVersionNotice } from '@utils/descriptions';
 
+import { pgInsertV2, pgQueryV2, pgUpdate, wrapData } from './genericFunctions';
+
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Postgres',
 	name: 'postgres',
diff --git a/packages/nodes-base/nodes/Postgres/v1/genericFunctions.ts b/packages/nodes-base/nodes/Postgres/v1/genericFunctions.ts
index 834779d1a0df1..3fb2982a6ab32 100644
--- a/packages/nodes-base/nodes/Postgres/v1/genericFunctions.ts
+++ b/packages/nodes-base/nodes/Postgres/v1/genericFunctions.ts
@@ -2,6 +2,7 @@ import { ApplicationError } from 'n8n-workflow';
 import type { IExecuteFunctions, IDataObject, INodeExecutionData, JsonObject } from 'n8n-workflow';
 import type pgPromise from 'pg-promise';
 import type pg from 'pg-promise/typescript/pg-subset';
+
 import { getResolvables } from '@utils/utilities';
 
 /**
diff --git a/packages/nodes-base/nodes/Postgres/v2/PostgresV2.node.ts b/packages/nodes-base/nodes/Postgres/v2/PostgresV2.node.ts
index a8f5c03965c32..ff18184d5c35d 100644
--- a/packages/nodes-base/nodes/Postgres/v2/PostgresV2.node.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/PostgresV2.node.ts
@@ -5,8 +5,8 @@ import type {
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { router } from './actions/router';
 
+import { router } from './actions/router';
 import { versionDescription } from './actions/versionDescription';
 import { credentialTest, listSearch, loadOptions, resourceMapping } from './methods';
 
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/database/Database.resource.ts b/packages/nodes-base/nodes/Postgres/v2/actions/database/Database.resource.ts
index 125ebaa1d77ec..36b935293d9f7 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/database/Database.resource.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/database/Database.resource.ts
@@ -1,5 +1,4 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { schemaRLC, tableRLC } from '../common.descriptions';
 
 import * as deleteTable from './deleteTable.operation';
 import * as executeQuery from './executeQuery.operation';
@@ -7,6 +6,7 @@ import * as insert from './insert.operation';
 import * as select from './select.operation';
 import * as update from './update.operation';
 import * as upsert from './upsert.operation';
+import { schemaRLC, tableRLC } from '../common.descriptions';
 
 export { deleteTable, executeQuery, insert, select, update, upsert };
 
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/database/deleteTable.operation.ts b/packages/nodes-base/nodes/Postgres/v2/actions/database/deleteTable.operation.ts
index badede9f5312e..a2bfc9329d30d 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/database/deleteTable.operation.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/database/deleteTable.operation.ts
@@ -6,6 +6,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import type {
 	PgpDatabase,
 	PostgresNodeOptions,
@@ -14,15 +16,12 @@ import type {
 	QueryWithValues,
 	WhereClause,
 } from '../../helpers/interfaces';
-
 import { addWhereClauses } from '../../helpers/utils';
-
 import {
 	combineConditionsCollection,
 	optionsCollection,
 	whereFixedCollection,
 } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/database/executeQuery.operation.ts b/packages/nodes-base/nodes/Postgres/v2/actions/database/executeQuery.operation.ts
index d103abd399000..75e0c78587773 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/database/executeQuery.operation.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/database/executeQuery.operation.ts
@@ -3,21 +3,19 @@ import type {
 	IExecuteFunctions,
 	INodeExecutionData,
 	INodeProperties,
-	NodeParameterValueType,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import { getResolvables, updateDisplayOptions } from '@utils/utilities';
+
 import type {
 	PgpDatabase,
 	PostgresNodeOptions,
 	QueriesRunner,
 	QueryWithValues,
 } from '../../helpers/interfaces';
-
-import { replaceEmptyStringsByNulls } from '../../helpers/utils';
-
+import { isJSON, replaceEmptyStringsByNulls, stringToArray } from '../../helpers/utils';
 import { optionsCollection } from '../common.descriptions';
-import { getResolvables, updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
@@ -55,20 +53,19 @@ export async function execute(
 	nodeOptions: PostgresNodeOptions,
 	_db?: PgpDatabase,
 ): Promise<INodeExecutionData[]> {
-	items = replaceEmptyStringsByNulls(items, nodeOptions.replaceEmptyStrings as boolean);
-
-	const queries: QueryWithValues[] = [];
-
-	for (let i = 0; i < items.length; i++) {
-		let query = this.getNodeParameter('query', i) as string;
+	const queries: QueryWithValues[] = replaceEmptyStringsByNulls(
+		items,
+		nodeOptions.replaceEmptyStrings as boolean,
+	).map((_, index) => {
+		let query = this.getNodeParameter('query', index) as string;
 
 		for (const resolvable of getResolvables(query)) {
-			query = query.replace(resolvable, this.evaluateExpression(resolvable, i) as string);
+			query = query.replace(resolvable, this.evaluateExpression(resolvable, index) as string);
 		}
 
 		let values: Array<IDataObject | string> = [];
 
-		let queryReplacement = this.getNodeParameter('options.queryReplacement', i, '');
+		let queryReplacement = this.getNodeParameter('options.queryReplacement', index, '');
 
 		if (typeof queryReplacement === 'number') {
 			queryReplacement = String(queryReplacement);
@@ -79,14 +76,6 @@ export async function execute(
 
 			const rawReplacements = (node.parameters.options as IDataObject)?.queryReplacement as string;
 
-			const stringToArray = (str: NodeParameterValueType | undefined) => {
-				if (str === undefined) return [];
-				return String(str)
-					.split(',')
-					.filter((entry) => entry)
-					.map((entry) => entry.trim());
-			};
-
 			if (rawReplacements) {
 				const nodeVersion = nodeOptions.nodeVersion as number;
 
@@ -95,7 +84,12 @@ export async function execute(
 					const resolvables = getResolvables(rawValues);
 					if (resolvables.length) {
 						for (const resolvable of resolvables) {
-							const evaluatedValues = stringToArray(this.evaluateExpression(`${resolvable}`, i));
+							const evaluatedExpression =
+								this.evaluateExpression(`${resolvable}`, index)?.toString() ?? '';
+							const evaluatedValues = isJSON(evaluatedExpression)
+								? [evaluatedExpression]
+								: stringToArray(evaluatedExpression);
+
 							if (evaluatedValues.length) values.push(...evaluatedValues);
 						}
 					} else {
@@ -113,7 +107,7 @@ export async function execute(
 
 						if (resolvables.length) {
 							for (const resolvable of resolvables) {
-								values.push(this.evaluateExpression(`${resolvable}`, i) as IDataObject);
+								values.push(this.evaluateExpression(`${resolvable}`, index) as IDataObject);
 							}
 						} else {
 							values.push(rawValue);
@@ -128,7 +122,7 @@ export async function execute(
 				throw new NodeOperationError(
 					this.getNode(),
 					'Query Parameters must be a string of comma-separated values or an array of values',
-					{ itemIndex: i },
+					{ itemIndex: index },
 				);
 			}
 		}
@@ -143,8 +137,8 @@ export async function execute(
 			}
 		}
 
-		queries.push({ query, values });
-	}
+		return { query, values, options: { partial: true } };
+	});
 
 	return await runQueries(queries, items, nodeOptions);
 }
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/database/insert.operation.ts b/packages/nodes-base/nodes/Postgres/v2/actions/database/insert.operation.ts
index e76c4f95cbf90..9e0b72f9533f4 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/database/insert.operation.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/database/insert.operation.ts
@@ -5,6 +5,8 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import type {
 	PgpDatabase,
 	PostgresNodeOptions,
@@ -12,7 +14,6 @@ import type {
 	QueryValues,
 	QueryWithValues,
 } from '../../helpers/interfaces';
-
 import {
 	addReturning,
 	checkItemAgainstSchema,
@@ -22,9 +23,7 @@ import {
 	convertArraysToPostgresFormat,
 	replaceEmptyStringsByNulls,
 } from '../../helpers/utils';
-
 import { optionsCollection } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/database/select.operation.ts b/packages/nodes-base/nodes/Postgres/v2/actions/database/select.operation.ts
index b0848f2a6b59a..b41f0c98c595b 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/database/select.operation.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/database/select.operation.ts
@@ -5,6 +5,8 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import type {
 	PgpDatabase,
 	PostgresNodeOptions,
@@ -14,16 +16,13 @@ import type {
 	SortRule,
 	WhereClause,
 } from '../../helpers/interfaces';
-
 import { addSortRules, addWhereClauses, replaceEmptyStringsByNulls } from '../../helpers/utils';
-
 import {
 	combineConditionsCollection,
 	optionsCollection,
 	sortFixedCollection,
 	whereFixedCollection,
 } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/database/update.operation.ts b/packages/nodes-base/nodes/Postgres/v2/actions/database/update.operation.ts
index e04b845e2f2b7..e15169b0d24cf 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/database/update.operation.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/database/update.operation.ts
@@ -6,6 +6,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import type {
 	PgpDatabase,
 	PostgresNodeOptions,
@@ -13,7 +15,6 @@ import type {
 	QueryValues,
 	QueryWithValues,
 } from '../../helpers/interfaces';
-
 import {
 	addReturning,
 	checkItemAgainstSchema,
@@ -24,9 +25,7 @@ import {
 	convertArraysToPostgresFormat,
 	replaceEmptyStringsByNulls,
 } from '../../helpers/utils';
-
 import { optionsCollection } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/database/upsert.operation.ts b/packages/nodes-base/nodes/Postgres/v2/actions/database/upsert.operation.ts
index 5ccc01a9e329e..7a43605d56209 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/database/upsert.operation.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/database/upsert.operation.ts
@@ -6,6 +6,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import type {
 	PgpDatabase,
 	PostgresNodeOptions,
@@ -13,7 +15,6 @@ import type {
 	QueryValues,
 	QueryWithValues,
 } from '../../helpers/interfaces';
-
 import {
 	addReturning,
 	checkItemAgainstSchema,
@@ -23,9 +24,7 @@ import {
 	configureTableSchemaUpdater,
 	convertArraysToPostgresFormat,
 } from '../../helpers/utils';
-
 import { optionsCollection } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/router.ts b/packages/nodes-base/nodes/Postgres/v2/actions/router.ts
index f48060ec3b668..9082d9413f58e 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/router.ts
@@ -1,12 +1,11 @@
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeExecutionOutput, NodeOperationError } from 'n8n-workflow';
 
-import { configurePostgres } from '../transport';
-import { configureQueryRunner } from '../helpers/utils';
-import type { PostgresNodeCredentials, PostgresNodeOptions } from '../helpers/interfaces';
-import type { PostgresType } from './node.type';
-
 import * as database from './database/Database.resource';
+import type { PostgresType } from './node.type';
+import type { PostgresNodeCredentials, PostgresNodeOptions } from '../helpers/interfaces';
+import { configureQueryRunner } from '../helpers/utils';
+import { configurePostgres } from '../transport';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	let returnData: INodeExecutionData[] = [];
diff --git a/packages/nodes-base/nodes/Postgres/v2/helpers/interfaces.ts b/packages/nodes-base/nodes/Postgres/v2/helpers/interfaces.ts
index 8aadf14ddc86c..7ca5a93b2fec2 100644
--- a/packages/nodes-base/nodes/Postgres/v2/helpers/interfaces.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/helpers/interfaces.ts
@@ -1,12 +1,13 @@
 import type { IDataObject, INodeExecutionData, SSHCredentials } from 'n8n-workflow';
 import type pgPromise from 'pg-promise';
+import { type IFormattingOptions } from 'pg-promise';
 import type pg from 'pg-promise/typescript/pg-subset';
 
 export type QueryMode = 'single' | 'transaction' | 'independently';
 
 export type QueryValue = string | number | IDataObject | string[];
 export type QueryValues = QueryValue[];
-export type QueryWithValues = { query: string; values?: QueryValues };
+export type QueryWithValues = { query: string; values?: QueryValues; options?: IFormattingOptions };
 
 export type WhereClause = { column: string; condition: string; value: string | number };
 export type SortRule = { column: string; direction: string };
diff --git a/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts b/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts
index 5f01e6b6a6690..69e0ff90467ef 100644
--- a/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts
@@ -4,10 +4,10 @@ import type {
 	INode,
 	INodeExecutionData,
 	INodePropertyOptions,
+	NodeParameterValueType,
 } from 'n8n-workflow';
 import { NodeOperationError, jsonParse } from 'n8n-workflow';
 
-import { generatePairedItemData } from '../../../../utils/utilities';
 import type {
 	ColumnInfo,
 	EnumInfo,
@@ -19,6 +19,24 @@ import type {
 	SortRule,
 	WhereClause,
 } from './interfaces';
+import { generatePairedItemData } from '../../../../utils/utilities';
+
+export function isJSON(str: string) {
+	try {
+		JSON.parse(str.trim());
+		return true;
+	} catch {
+		return false;
+	}
+}
+
+export function stringToArray(str: NodeParameterValueType | undefined) {
+	if (str === undefined) return [];
+	return String(str)
+		.split(',')
+		.filter((entry) => entry)
+		.map((entry) => entry.trim());
+}
 
 export function wrapData(data: IDataObject | IDataObject[]): INodeExecutionData[] {
 	if (!Array.isArray(data)) {
diff --git a/packages/nodes-base/nodes/Postgres/v2/methods/credentialTest.ts b/packages/nodes-base/nodes/Postgres/v2/methods/credentialTest.ts
index 59cb83b5da85e..a9adf70a3e9ce 100644
--- a/packages/nodes-base/nodes/Postgres/v2/methods/credentialTest.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/methods/credentialTest.ts
@@ -4,9 +4,8 @@ import type {
 	INodeCredentialTestResult,
 } from 'n8n-workflow';
 
-import { configurePostgres } from '../transport';
-
 import type { PgpClient, PostgresNodeCredentials } from '../helpers/interfaces';
+import { configurePostgres } from '../transport';
 
 export async function postgresConnectionTest(
 	this: ICredentialTestFunctions,
diff --git a/packages/nodes-base/nodes/Postgres/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Postgres/v2/methods/listSearch.ts
index f81a66700f0c0..c20319d5ac769 100644
--- a/packages/nodes-base/nodes/Postgres/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/methods/listSearch.ts
@@ -1,7 +1,7 @@
 import type { ILoadOptionsFunctions, INodeListSearchResult } from 'n8n-workflow';
 
-import { configurePostgres } from '../transport';
 import type { PostgresNodeCredentials } from '../helpers/interfaces';
+import { configurePostgres } from '../transport';
 
 export async function schemaSearch(this: ILoadOptionsFunctions): Promise<INodeListSearchResult> {
 	const credentials = await this.getCredentials<PostgresNodeCredentials>('postgres');
diff --git a/packages/nodes-base/nodes/Postgres/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/Postgres/v2/methods/loadOptions.ts
index ac4f783541dba..d906c7e0bd099 100644
--- a/packages/nodes-base/nodes/Postgres/v2/methods/loadOptions.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/methods/loadOptions.ts
@@ -1,8 +1,8 @@
 import type { ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
 
+import type { PostgresNodeCredentials } from '../helpers/interfaces';
 import { getTableSchema } from '../helpers/utils';
 import { configurePostgres } from '../transport';
-import type { PostgresNodeCredentials } from '../helpers/interfaces';
 
 export async function getColumns(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 	const credentials = await this.getCredentials<PostgresNodeCredentials>('postgres');
diff --git a/packages/nodes-base/nodes/Postgres/v2/methods/resourceMapping.ts b/packages/nodes-base/nodes/Postgres/v2/methods/resourceMapping.ts
index dac7dc678dc0d..99f40cb1da54c 100644
--- a/packages/nodes-base/nodes/Postgres/v2/methods/resourceMapping.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/methods/resourceMapping.ts
@@ -1,7 +1,8 @@
 import type { ILoadOptionsFunctions, ResourceMapperFields, FieldType } from 'n8n-workflow';
+
+import type { PostgresNodeCredentials } from '../helpers/interfaces';
 import { getEnumValues, getEnums, getTableSchema, uniqueColumns } from '../helpers/utils';
 import { configurePostgres } from '../transport';
-import type { PostgresNodeCredentials } from '../helpers/interfaces';
 
 const fieldTypeMapping: Partial<Record<FieldType, string[]>> = {
 	string: ['text', 'varchar', 'character varying', 'character', 'char'],
diff --git a/packages/nodes-base/nodes/Postgres/v2/transport/index.ts b/packages/nodes-base/nodes/Postgres/v2/transport/index.ts
index 895c5738abc20..07362be3dca85 100644
--- a/packages/nodes-base/nodes/Postgres/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/transport/index.ts
@@ -1,11 +1,14 @@
-import { createServer, type AddressInfo } from 'node:net';
-import pgPromise from 'pg-promise';
 import type {
 	IExecuteFunctions,
 	ICredentialTestFunctions,
 	ILoadOptionsFunctions,
 	ITriggerFunctions,
 } from 'n8n-workflow';
+import { createServer, type AddressInfo } from 'node:net';
+import pgPromise from 'pg-promise';
+
+import { LOCALHOST } from '@utils/constants';
+import { formatPrivateKey } from '@utils/utilities';
 
 import type {
 	ConnectionsData,
@@ -13,8 +16,6 @@ import type {
 	PostgresNodeCredentials,
 	PostgresNodeOptions,
 } from '../helpers/interfaces';
-import { formatPrivateKey } from '@utils/utilities';
-import { LOCALHOST } from '@utils/constants';
 
 const getPostgresConfig = (
 	credentials: PostgresNodeCredentials,
diff --git a/packages/nodes-base/nodes/ProfitWell/ProfitWell.node.ts b/packages/nodes-base/nodes/ProfitWell/ProfitWell.node.ts
index 8298e68340b0c..d12b74076ae74 100644
--- a/packages/nodes-base/nodes/ProfitWell/ProfitWell.node.ts
+++ b/packages/nodes-base/nodes/ProfitWell/ProfitWell.node.ts
@@ -9,15 +9,13 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
+import { companyOperations } from './CompanyDescription';
 import type { Metrics } from './GenericFunctions';
 import {
 	profitWellApiRequest,
 	simplifyDailyMetrics,
 	simplifyMontlyMetrics,
 } from './GenericFunctions';
-
-import { companyOperations } from './CompanyDescription';
-
 import { metricFields, metricOperations } from './MetricDescription';
 
 export class ProfitWell implements INodeType {
diff --git a/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts b/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
index 1393d07ccd610..3217524e86fbe 100644
--- a/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
+++ b/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -9,7 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import { pushbulletApiRequest, pushbulletApiRequestAllItems } from './GenericFunctions';
 
 export class Pushbullet implements INodeType {
diff --git a/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts b/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
index 5a26bfcfa77e2..677fe785e90d6 100644
--- a/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
+++ b/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
@@ -5,7 +5,6 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-
 import pgPromise from 'pg-promise';
 
 import { pgInsert, pgQueryV2 } from '../Postgres/v1/genericFunctions';
diff --git a/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts b/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
index fcd71125ce64f..4e4b7d29ba5fd 100644
--- a/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
+++ b/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
@@ -10,20 +10,16 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { generatePairedItemData } from '../../utils/utilities';
+import { fieldFields, fieldOperations } from './FieldDescription';
+import { fileFields, fileOperations } from './FileDescription';
 import {
 	getFieldsObject,
 	quickbaseApiRequest,
 	quickbaseApiRequestAllItems,
 } from './GenericFunctions';
-
-import { fieldFields, fieldOperations } from './FieldDescription';
-
-import { fileFields, fileOperations } from './FileDescription';
-
 import { recordFields, recordOperations } from './RecordDescription';
-
 import { reportFields, reportOperations } from './ReportDescription';
+import { generatePairedItemData } from '../../utils/utilities';
 
 export class QuickBase implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts b/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts
index 16ef41b80e2e1..a92b24b8ea43d 100644
--- a/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts
@@ -1,3 +1,7 @@
+import { capitalCase } from 'change-case';
+import omit from 'lodash/omit';
+import pickBy from 'lodash/pickBy';
+import { NodeApiError } from 'n8n-workflow';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -9,15 +13,8 @@ import type {
 	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
-import { NodeApiError } from 'n8n-workflow';
-
-import { capitalCase } from 'change-case';
-
-import omit from 'lodash/omit';
-import pickBy from 'lodash/pickBy';
 
 import type { CustomField, GeneralAddress, Ref } from './descriptions/Shared.interface';
-
 import type { DateFieldsUi, Option, QuickBooksOAuth2Credentials, TransactionReport } from './types';
 
 /**
@@ -43,9 +40,7 @@ export async function quickBooksApiRequest(
 	const productionUrl = 'https://quickbooks.api.intuit.com';
 	const sandboxUrl = 'https://sandbox-quickbooks.api.intuit.com';
 
-	const credentials = (await this.getCredentials(
-		'quickBooksOAuth2Api',
-	)) as QuickBooksOAuth2Credentials;
+	const credentials = await this.getCredentials<QuickBooksOAuth2Credentials>('quickBooksOAuth2Api');
 
 	const options: IRequestOptions = {
 		headers: {
@@ -236,9 +231,9 @@ export async function handleBinaryData(
 	const data = await quickBooksApiRequest.call(this, 'GET', endpoint, {}, {}, { encoding: null });
 
 	items[i].binary = items[i].binary ?? {};
-	items[i].binary![binaryProperty] = await this.helpers.prepareBinaryData(data as Buffer);
-	items[i].binary![binaryProperty].fileName = fileName;
-	items[i].binary![binaryProperty].fileExtension = 'pdf';
+	items[i].binary[binaryProperty] = await this.helpers.prepareBinaryData(data as Buffer);
+	items[i].binary[binaryProperty].fileName = fileName;
+	items[i].binary[binaryProperty].fileExtension = 'pdf';
 
 	return items;
 }
@@ -254,9 +249,7 @@ export async function loadResource(this: ILoadOptionsFunctions, resource: string
 		oauthTokenData: {
 			callbackQueryString: { realmId },
 		},
-	} = await this.getCredentials<{
-		oauthTokenData: { callbackQueryString: { realmId: string } };
-	}>('quickBooksOAuth2Api');
+	} = await this.getCredentials<QuickBooksOAuth2Credentials>('quickBooksOAuth2Api');
 	const endpoint = `/v3/company/${realmId}/query`;
 
 	const resourceItems = await quickBooksApiRequestAllItems.call(
diff --git a/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts b/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts
index 17e1e01e9d89f..2f73fe28e7e21 100644
--- a/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts
+++ b/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts
@@ -1,4 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import { capitalCase } from 'change-case';
+import isEmpty from 'lodash/isEmpty';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,8 +11,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { capitalCase } from 'change-case';
-import isEmpty from 'lodash/isEmpty';
 import {
 	billFields,
 	billOperations,
@@ -33,7 +33,6 @@ import {
 	vendorFields,
 	vendorOperations,
 } from './descriptions';
-
 import {
 	adjustTransactionDates,
 	getRefAndSyncToken,
@@ -46,7 +45,6 @@ import {
 	quickBooksApiRequest,
 	simplifyTransactionReport,
 } from './GenericFunctions';
-
 import type { QuickBooksOAuth2Credentials, TransactionFields, TransactionReport } from './types';
 
 export class QuickBooks implements INodeType {
@@ -191,9 +189,8 @@ export class QuickBooks implements INodeType {
 		let responseData;
 		const returnData: INodeExecutionData[] = [];
 
-		const { oauthTokenData } = (await this.getCredentials(
-			'quickBooksOAuth2Api',
-		)) as QuickBooksOAuth2Credentials;
+		const { oauthTokenData } =
+			await this.getCredentials<QuickBooksOAuth2Credentials>('quickBooksOAuth2Api');
 		const companyId = oauthTokenData.callbackQueryString.realmId;
 
 		for (let i = 0; i < items.length; i++) {
diff --git a/packages/nodes-base/nodes/QuickBooks/descriptions/Transaction/TransactionDescription.ts b/packages/nodes-base/nodes/QuickBooks/descriptions/Transaction/TransactionDescription.ts
index 18c46098cac62..f93132a33d83f 100644
--- a/packages/nodes-base/nodes/QuickBooks/descriptions/Transaction/TransactionDescription.ts
+++ b/packages/nodes-base/nodes/QuickBooks/descriptions/Transaction/TransactionDescription.ts
@@ -1,7 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
 
-import { toDisplayName, toOptions } from '../../GenericFunctions';
-
 import {
 	GROUP_BY_OPTIONS,
 	PAYMENT_METHODS,
@@ -10,6 +8,7 @@ import {
 	TRANSACTION_REPORT_COLUMNS,
 	TRANSACTION_TYPES,
 } from './constants';
+import { toDisplayName, toOptions } from '../../GenericFunctions';
 
 export const transactionOperations: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/QuickChart/test/QuickChart.node.test.ts b/packages/nodes-base/nodes/QuickChart/test/QuickChart.node.test.ts
index b46bc920c05f8..1305611046c04 100644
--- a/packages/nodes-base/nodes/QuickChart/test/QuickChart.node.test.ts
+++ b/packages/nodes-base/nodes/QuickChart/test/QuickChart.node.test.ts
@@ -1,8 +1,9 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
 import nock from 'nock';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import * as Helpers from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 
 describe('Test QuickChart Node', () => {
 	beforeEach(async () => {
diff --git a/packages/nodes-base/nodes/RabbitMQ/GenericFunctions.ts b/packages/nodes-base/nodes/RabbitMQ/GenericFunctions.ts
index c551e61863b32..cca2cd9e6f235 100644
--- a/packages/nodes-base/nodes/RabbitMQ/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/RabbitMQ/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import * as amqplib from 'amqplib';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -5,8 +6,9 @@ import type {
 	ITriggerFunctions,
 } from 'n8n-workflow';
 import { jsonParse, sleep } from 'n8n-workflow';
-import * as amqplib from 'amqplib';
+
 import { formatPrivateKey } from '@utils/utilities';
+
 import type { ExchangeType, Options, RabbitMQCredentials, TriggerOptions } from './types';
 
 const credentialKeys = ['hostname', 'port', 'username', 'password', 'vhost'] as const;
diff --git a/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts b/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts
index 29475c1ace77d..28e802214fec7 100644
--- a/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts
+++ b/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts
@@ -436,7 +436,6 @@ export class RabbitMQ implements INodeType {
 					);
 				}
 
-				// @ts-ignore
 				const promisesResponses = await Promise.allSettled(queuePromises);
 
 				// @ts-ignore
@@ -507,7 +506,6 @@ export class RabbitMQ implements INodeType {
 					);
 				}
 
-				// @ts-ignore
 				const promisesResponses = await Promise.allSettled(exchangePromises);
 
 				// @ts-ignore
diff --git a/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts b/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts
index c57659b2c7740..3257833cdfa9b 100644
--- a/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts
+++ b/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts
@@ -13,7 +13,6 @@ import type {
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
 import { rabbitDefaultOptions } from './DefaultOptions';
-
 import { MessageTracker, rabbitmqConnectQueue, parseMessage } from './GenericFunctions';
 import type { TriggerOptions } from './types';
 
diff --git a/packages/nodes-base/nodes/RabbitMQ/test/GenericFunctions.test.ts b/packages/nodes-base/nodes/RabbitMQ/test/GenericFunctions.test.ts
index 0532e67ae4e72..62fb7d8f6c78f 100644
--- a/packages/nodes-base/nodes/RabbitMQ/test/GenericFunctions.test.ts
+++ b/packages/nodes-base/nodes/RabbitMQ/test/GenericFunctions.test.ts
@@ -8,7 +8,6 @@ mockChannel.connection = mockConnection;
 const connect = jest.fn().mockReturnValue(mockConnection);
 jest.mock('amqplib', () => ({ connect }));
 
-import type { TriggerOptions } from '../types';
 import {
 	parseMessage,
 	rabbitmqConnect,
@@ -17,6 +16,7 @@ import {
 	rabbitmqCreateChannel,
 	MessageTracker,
 } from '../GenericFunctions';
+import type { TriggerOptions } from '../types';
 
 describe('RabbitMQ GenericFunctions', () => {
 	const credentials = {
diff --git a/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts b/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts
index 9a14e77854325..8d6a96cd69e95 100644
--- a/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts
+++ b/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts
@@ -1,3 +1,5 @@
+import isEmpty from 'lodash/isEmpty';
+import omit from 'lodash/omit';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -8,11 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import isEmpty from 'lodash/isEmpty';
-import omit from 'lodash/omit';
-
-import { raindropApiRequest } from './GenericFunctions';
-
 import {
 	bookmarkFields,
 	bookmarkOperations,
@@ -23,6 +20,7 @@ import {
 	userFields,
 	userOperations,
 } from './descriptions';
+import { raindropApiRequest } from './GenericFunctions';
 
 export class Raindrop implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/ReadBinaryFile/test/ReadBinaryFile.test.ts b/packages/nodes-base/nodes/ReadBinaryFile/test/ReadBinaryFile.test.ts
index c94feb97cf425..4f7a8e7846686 100644
--- a/packages/nodes-base/nodes/ReadBinaryFile/test/ReadBinaryFile.test.ts
+++ b/packages/nodes-base/nodes/ReadBinaryFile/test/ReadBinaryFile.test.ts
@@ -1,8 +1,9 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
 import path from 'path';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import * as Helpers from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 
 describe('Test Read Binary File Node', () => {
 	beforeEach(async () => {
diff --git a/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.ts b/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.ts
index b81530f62a40d..d3687a65579e9 100644
--- a/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.ts
+++ b/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.ts
@@ -1,3 +1,4 @@
+import glob from 'fast-glob';
 import {
 	NodeConnectionType,
 	type IExecuteFunctions,
@@ -6,7 +7,6 @@ import {
 	type INodeTypeDescription,
 } from 'n8n-workflow';
 
-import glob from 'fast-glob';
 import { generatePairedItemData } from '../../utils/utilities';
 
 export class ReadBinaryFiles implements INodeType {
diff --git a/packages/nodes-base/nodes/ReadBinaryFiles/test/ReadBinaryFiles.test.ts b/packages/nodes-base/nodes/ReadBinaryFiles/test/ReadBinaryFiles.test.ts
index 76235ae1e2fd1..ae76d88185c25 100644
--- a/packages/nodes-base/nodes/ReadBinaryFiles/test/ReadBinaryFiles.test.ts
+++ b/packages/nodes-base/nodes/ReadBinaryFiles/test/ReadBinaryFiles.test.ts
@@ -1,8 +1,9 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
 import path from 'path';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import * as Helpers from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 
 describe('Test Read Binary Files Node', () => {
 	beforeEach(async () => {
diff --git a/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.ts b/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.ts
index c7a1485cb1bc1..fbc6e7753f655 100644
--- a/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.ts
+++ b/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.ts
@@ -6,6 +6,7 @@ import {
 	type INodeType,
 	type INodeTypeDescription,
 } from 'n8n-workflow';
+
 import { extractDataFromPDF } from '@utils/binary';
 
 export class ReadPDF implements INodeType {
diff --git a/packages/nodes-base/nodes/Reddit/Reddit.node.ts b/packages/nodes-base/nodes/Reddit/Reddit.node.ts
index d04e6406aa1c1..d160daedfa97f 100644
--- a/packages/nodes-base/nodes/Reddit/Reddit.node.ts
+++ b/packages/nodes-base/nodes/Reddit/Reddit.node.ts
@@ -9,15 +9,10 @@ import type {
 import { NodeApiError, NodeConnectionType } from 'n8n-workflow';
 
 import { handleListing, redditApiRequest } from './GenericFunctions';
-
 import { postCommentFields, postCommentOperations } from './PostCommentDescription';
-
 import { postFields, postOperations } from './PostDescription';
-
 import { profileFields, profileOperations } from './ProfileDescription';
-
 import { subredditFields, subredditOperations } from './SubredditDescription';
-
 import { userFields, userOperations } from './UserDescription';
 
 export class Reddit implements INodeType {
diff --git a/packages/nodes-base/nodes/Redis/Redis.node.ts b/packages/nodes-base/nodes/Redis/Redis.node.ts
index 59d1582fdb309..baa0aeceb1875 100644
--- a/packages/nodes-base/nodes/Redis/Redis.node.ts
+++ b/packages/nodes-base/nodes/Redis/Redis.node.ts
@@ -1,13 +1,13 @@
+import set from 'lodash/set';
 import type {
 	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeConnectionType } from 'n8n-workflow';
-
-import set from 'lodash/set';
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
+import type { RedisCredential } from './types';
 import {
 	setupRedisClient,
 	redisConnectionTest,
@@ -512,7 +512,7 @@ export class Redis implements INodeType {
 		//       have a parameter field for a path. Because it is not possible to set
 		//       array, object via parameter directly (should maybe be possible?!?!)
 		//       Should maybe have a parameter which is JSON.
-		const credentials = await this.getCredentials('redis');
+		const credentials = await this.getCredentials<RedisCredential>('redis');
 
 		const client = setupRedisClient(credentials);
 		await client.connect();
@@ -521,17 +521,30 @@ export class Redis implements INodeType {
 		const operation = this.getNodeParameter('operation', 0);
 		const returnItems: INodeExecutionData[] = [];
 
-		try {
-			if (operation === 'info') {
+		if (operation === 'info') {
+			try {
 				const result = await client.info();
 				returnItems.push({ json: convertInfoToObject(result) });
-			} else if (
-				['delete', 'get', 'keys', 'set', 'incr', 'publish', 'push', 'pop'].includes(operation)
-			) {
-				const items = this.getInputData();
+			} catch (error) {
+				if (this.continueOnFail()) {
+					returnItems.push({
+						json: {
+							error: error.message,
+						},
+					});
+				} else {
+					await client.quit();
+					throw new NodeOperationError(this.getNode(), error);
+				}
+			}
+		} else if (
+			['delete', 'get', 'keys', 'set', 'incr', 'publish', 'push', 'pop'].includes(operation)
+		) {
+			const items = this.getInputData();
 
-				let item: INodeExecutionData;
-				for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+			let item: INodeExecutionData;
+			for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+				try {
 					item = { json: {}, pairedItem: { item: itemIndex } };
 
 					if (operation === 'delete') {
@@ -625,14 +638,24 @@ export class Redis implements INodeType {
 						}
 						returnItems.push(item);
 					}
+				} catch (error) {
+					if (this.continueOnFail()) {
+						returnItems.push({
+							json: {
+								error: error.message,
+							},
+							pairedItem: {
+								item: itemIndex,
+							},
+						});
+						continue;
+					}
+					await client.quit();
+					throw new NodeOperationError(this.getNode(), error, { itemIndex });
 				}
 			}
-		} catch (error) {
-			throw error;
-		} finally {
-			await client.quit();
 		}
-
+		await client.quit();
 		return [returnItems];
 	}
 }
diff --git a/packages/nodes-base/nodes/Redis/RedisTrigger.node.ts b/packages/nodes-base/nodes/Redis/RedisTrigger.node.ts
index 34b4bb8d62c3b..d39444059aebd 100644
--- a/packages/nodes-base/nodes/Redis/RedisTrigger.node.ts
+++ b/packages/nodes-base/nodes/Redis/RedisTrigger.node.ts
@@ -6,6 +6,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
+import type { RedisCredential } from './types';
 import { redisConnectionTest, setupRedisClient } from './utils';
 
 interface Options {
@@ -74,7 +75,7 @@ export class RedisTrigger implements INodeType {
 	};
 
 	async trigger(this: ITriggerFunctions): Promise<ITriggerResponse> {
-		const credentials = await this.getCredentials('redis');
+		const credentials = await this.getCredentials<RedisCredential>('redis');
 
 		const channels = (this.getNodeParameter('channels') as string).split(',');
 		const options = this.getNodeParameter('options') as Options;
diff --git a/packages/nodes-base/nodes/Redis/__tests__/Redis.node.test.ts b/packages/nodes-base/nodes/Redis/__tests__/Redis.node.test.ts
new file mode 100644
index 0000000000000..c676c27c120e3
--- /dev/null
+++ b/packages/nodes-base/nodes/Redis/__tests__/Redis.node.test.ts
@@ -0,0 +1,390 @@
+import { mock } from 'jest-mock-extended';
+import type {
+	ICredentialsDecrypted,
+	ICredentialTestFunctions,
+	IExecuteFunctions,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
+const mockClient = mock<RedisClient>();
+const createClient = jest.fn().mockReturnValue(mockClient);
+jest.mock('redis', () => ({ createClient }));
+
+import { Redis } from '../Redis.node';
+import type { RedisClient } from '../types';
+import { redisConnectionTest, setupRedisClient } from '../utils';
+
+describe('Redis Node', () => {
+	const node = new Redis();
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		createClient.mockReturnValue(mockClient);
+	});
+
+	afterEach(() => jest.resetAllMocks());
+
+	describe('setupRedisClient', () => {
+		it('should not configure TLS by default', () => {
+			setupRedisClient({
+				host: 'redis.domain',
+				port: 1234,
+				database: 0,
+			});
+			expect(createClient).toHaveBeenCalledWith({
+				database: 0,
+				socket: {
+					host: 'redis.domain',
+					port: 1234,
+					tls: false,
+				},
+			});
+		});
+
+		it('should configure TLS', () => {
+			setupRedisClient({
+				host: 'redis.domain',
+				port: 1234,
+				database: 0,
+				ssl: true,
+			});
+			expect(createClient).toHaveBeenCalledWith({
+				database: 0,
+				socket: {
+					host: 'redis.domain',
+					port: 1234,
+					tls: true,
+				},
+			});
+		});
+
+		it('should set user on auth', () => {
+			setupRedisClient({
+				host: 'redis.domain',
+				port: 1234,
+				database: 0,
+				user: 'test_user',
+				password: 'test_password',
+			});
+			expect(createClient).toHaveBeenCalledWith({
+				database: 0,
+				username: 'test_user',
+				password: 'test_password',
+				socket: {
+					host: 'redis.domain',
+					port: 1234,
+					tls: false,
+				},
+			});
+		});
+	});
+
+	describe('redisConnectionTest', () => {
+		const thisArg = mock<ICredentialTestFunctions>({});
+		const credentials = mock<ICredentialsDecrypted>({
+			data: {
+				host: 'localhost',
+				port: 6379,
+				user: 'username',
+				password: 'password',
+				database: 0,
+			},
+		});
+		const redisOptions = {
+			socket: {
+				host: 'localhost',
+				port: 6379,
+				tls: false,
+			},
+			database: 0,
+			username: 'username',
+			password: 'password',
+		};
+
+		it('should return success when connection is established', async () => {
+			const result = await redisConnectionTest.call(thisArg, credentials);
+
+			expect(result).toEqual({
+				status: 'OK',
+				message: 'Connection successful!',
+			});
+			expect(createClient).toHaveBeenCalledWith(redisOptions);
+			expect(mockClient.connect).toHaveBeenCalled();
+			expect(mockClient.ping).toHaveBeenCalled();
+		});
+
+		it('should return error when connection fails', async () => {
+			mockClient.connect.mockRejectedValue(new Error('Connection failed'));
+
+			const result = await redisConnectionTest.call(thisArg, credentials);
+
+			expect(result).toEqual({
+				status: 'Error',
+				message: 'Connection failed',
+			});
+			expect(createClient).toHaveBeenCalledWith(redisOptions);
+			expect(mockClient.connect).toHaveBeenCalled();
+			expect(mockClient.ping).not.toHaveBeenCalled();
+		});
+	});
+
+	describe('operations', () => {
+		const thisArg = mock<IExecuteFunctions>({});
+
+		beforeEach(() => {
+			setupRedisClient({
+				host: 'redis.domain',
+				port: 1234,
+				database: 0,
+				ssl: true,
+			});
+
+			const mockCredential = {
+				host: 'redis',
+				port: 1234,
+				database: 0,
+				password: 'random',
+			};
+
+			thisArg.getCredentials.calledWith('redis').mockResolvedValue(mockCredential);
+		});
+
+		afterEach(() => {
+			expect(createClient).toHaveBeenCalled();
+			expect(mockClient.connect).toHaveBeenCalled();
+			expect(mockClient.ping).toHaveBeenCalled();
+			expect(mockClient.quit).toHaveBeenCalled();
+		});
+
+		describe('info operation', () => {
+			it('should return info', async () => {
+				thisArg.getNodeParameter.calledWith('operation', 0).mockReturnValue('info');
+				mockClient.info.mockResolvedValue(`
+# Server
+redis_version:6.2.14
+redis_git_sha1:00000000
+redis_git_dirty:0
+redis_mode:standalone
+arch_bits:64
+tcp_port:6379
+uptime_in_seconds:429905
+uptime_in_days:4
+
+# Clients
+connected_clients:1
+cluster_connections:0
+max_clients:10000
+
+# Memory
+used_memory:876648
+
+# Replication
+role:master
+connected_slaves:0
+master_failover_state:no-failover
+	`);
+
+				const output = await node.execute.call(thisArg);
+
+				expect(mockClient.info).toHaveBeenCalled();
+				expect(output[0][0].json).toEqual({
+					redis_version: 6.2,
+					redis_git_sha1: 0,
+					redis_git_dirty: 0,
+					redis_mode: 'standalone',
+					arch_bits: 64,
+					tcp_port: 6379,
+					uptime_in_seconds: 429905,
+					uptime_in_days: 4,
+					connected_clients: 1,
+					cluster_connections: 0,
+					max_clients: 10000,
+					used_memory: 876648,
+					role: 'master',
+					connected_slaves: 0,
+					master_failover_state: 'no-failover',
+				});
+			});
+
+			it('should continue and return an error when continue on fail is enabled and an error is thrown', async () => {
+				thisArg.getNodeParameter.calledWith('operation', 0).mockReturnValue('info');
+				thisArg.continueOnFail.mockReturnValue(true);
+				mockClient.info.mockRejectedValue(new Error('Redis error'));
+
+				const output = await node.execute.call(thisArg);
+
+				expect(mockClient.info).toHaveBeenCalled();
+				expect(output[0][0].json).toEqual({ error: 'Redis error' });
+			});
+
+			it('should throw an error when continue on fail is disabled and an error is thrown', async () => {
+				thisArg.getNodeParameter.calledWith('operation', 0).mockReturnValue('info');
+				thisArg.continueOnFail.mockReturnValue(false);
+				mockClient.info.mockRejectedValue(new Error('Redis error'));
+
+				await expect(node.execute.call(thisArg)).rejects.toThrow(NodeOperationError);
+
+				expect(mockClient.info).toHaveBeenCalled();
+				expect(mockClient.quit).toHaveBeenCalled();
+			});
+		});
+
+		describe('delete operation', () => {
+			it('should delete', async () => {
+				thisArg.getInputData.mockReturnValue([{ json: { x: 1 } }]);
+				thisArg.getNodeParameter.calledWith('operation', 0).mockReturnValue('delete');
+				thisArg.getNodeParameter.calledWith('key', 0).mockReturnValue('key1');
+				mockClient.del.calledWith('key1').mockResolvedValue(1);
+
+				const output = await node.execute.call(thisArg);
+				expect(mockClient.del).toHaveBeenCalledWith('key1');
+				expect(output[0][0].json).toEqual({ x: 1 });
+			});
+
+			it('should continue and return an error when continue on fail is enabled and an error is thrown', async () => {
+				thisArg.getInputData.mockReturnValue([{ json: { x: 1 } }]);
+				thisArg.getNodeParameter.calledWith('operation', 0).mockReturnValue('delete');
+				thisArg.getNodeParameter.calledWith('key', 0).mockReturnValue('key1');
+				thisArg.continueOnFail.mockReturnValue(true);
+
+				mockClient.del.mockRejectedValue(new Error('Redis error'));
+
+				const output = await node.execute.call(thisArg);
+
+				expect(mockClient.del).toHaveBeenCalled();
+				expect(output[0][0].json).toEqual({ error: 'Redis error' });
+			});
+
+			it('should throw an error when continue on fail is disabled and an error is thrown', async () => {
+				thisArg.getInputData.mockReturnValue([{ json: { x: 1 } }]);
+				thisArg.getNodeParameter.calledWith('operation', 0).mockReturnValue('delete');
+				thisArg.getNodeParameter.calledWith('key', 0).mockReturnValue('key1');
+
+				mockClient.del.mockRejectedValue(new Error('Redis error'));
+
+				await expect(node.execute.call(thisArg)).rejects.toThrow(NodeOperationError);
+
+				expect(mockClient.del).toHaveBeenCalled();
+				expect(mockClient.quit).toHaveBeenCalled();
+			});
+		});
+
+		describe('get operation', () => {
+			beforeEach(() => {
+				thisArg.getInputData.mockReturnValue([{ json: { x: 1 } }]);
+				thisArg.getNodeParameter.calledWith('operation', 0).mockReturnValue('get');
+				thisArg.getNodeParameter.calledWith('options', 0).mockReturnValue({ dotNotation: true });
+				thisArg.getNodeParameter.calledWith('key', 0).mockReturnValue('key1');
+				thisArg.getNodeParameter.calledWith('propertyName', 0).mockReturnValue('x.y');
+			});
+
+			it('keyType = automatic', async () => {
+				thisArg.getNodeParameter.calledWith('keyType', 0).mockReturnValue('automatic');
+				mockClient.type.calledWith('key1').mockResolvedValue('string');
+				mockClient.get.calledWith('key1').mockResolvedValue('value');
+
+				const output = await node.execute.call(thisArg);
+				expect(mockClient.type).toHaveBeenCalledWith('key1');
+				expect(mockClient.get).toHaveBeenCalledWith('key1');
+				expect(output[0][0].json).toEqual({ x: { y: 'value' } });
+			});
+
+			it('keyType = hash', async () => {
+				thisArg.getNodeParameter.calledWith('keyType', 0).mockReturnValue('hash');
+				mockClient.hGetAll.calledWith('key1').mockResolvedValue({
+					field1: '1',
+					field2: '2',
+				});
+
+				const output = await node.execute.call(thisArg);
+				expect(mockClient.hGetAll).toHaveBeenCalledWith('key1');
+				expect(output[0][0].json).toEqual({
+					x: {
+						y: {
+							field1: '1',
+							field2: '2',
+						},
+					},
+				});
+			});
+
+			it('should continue and return an error when continue on fail is enabled and an error is thrown', async () => {
+				thisArg.getNodeParameter.calledWith('keyType', 0).mockReturnValue('automatic');
+				thisArg.continueOnFail.mockReturnValue(true);
+
+				mockClient.type.calledWith('key1').mockResolvedValue('string');
+				mockClient.get.mockRejectedValue(new Error('Redis error'));
+
+				const output = await node.execute.call(thisArg);
+				expect(mockClient.get).toHaveBeenCalled();
+
+				expect(output[0][0].json).toEqual({ error: 'Redis error' });
+			});
+
+			it('should throw an error when continue on fail is disabled and an error is thrown', async () => {
+				thisArg.getNodeParameter.calledWith('keyType', 0).mockReturnValue('automatic');
+
+				mockClient.type.calledWith('key1').mockResolvedValue('string');
+				mockClient.get.mockRejectedValue(new Error('Redis error'));
+
+				await expect(node.execute.call(thisArg)).rejects.toThrow(NodeOperationError);
+
+				expect(mockClient.get).toHaveBeenCalled();
+				expect(mockClient.quit).toHaveBeenCalled();
+			});
+		});
+
+		describe('keys operation', () => {
+			beforeEach(() => {
+				thisArg.getInputData.mockReturnValue([{ json: { x: 1 } }]);
+				thisArg.getNodeParameter.calledWith('operation', 0).mockReturnValue('keys');
+				thisArg.getNodeParameter.calledWith('keyPattern', 0).mockReturnValue('key*');
+				mockClient.keys.calledWith('key*').mockResolvedValue(['key1', 'key2']);
+			});
+
+			it('getValues = false', async () => {
+				thisArg.getNodeParameter.calledWith('getValues', 0).mockReturnValue(false);
+
+				const output = await node.execute.call(thisArg);
+				expect(mockClient.keys).toHaveBeenCalledWith('key*');
+				expect(output[0][0].json).toEqual({ keys: ['key1', 'key2'] });
+			});
+
+			it('getValues = true', async () => {
+				thisArg.getNodeParameter.calledWith('getValues', 0).mockReturnValue(true);
+				mockClient.type.mockResolvedValue('string');
+				mockClient.get.calledWith('key1').mockResolvedValue('value1');
+				mockClient.get.calledWith('key2').mockResolvedValue('value2');
+
+				const output = await node.execute.call(thisArg);
+				expect(mockClient.keys).toHaveBeenCalledWith('key*');
+				expect(output[0][0].json).toEqual({ key1: 'value1', key2: 'value2' });
+			});
+
+			it('should continue and return an error when continue on fail is enabled and an error is thrown', async () => {
+				thisArg.continueOnFail.mockReturnValue(true);
+				thisArg.getNodeParameter.calledWith('getValues', 0).mockReturnValue(true);
+
+				mockClient.type.mockResolvedValue('string');
+				mockClient.get.mockRejectedValue(new Error('Redis error'));
+
+				const output = await node.execute.call(thisArg);
+				expect(mockClient.get).toHaveBeenCalled();
+
+				expect(output[0][0].json).toEqual({ error: 'Redis error' });
+			});
+
+			it('should throw an error when continue on fail is disabled and an error is thrown', async () => {
+				thisArg.getNodeParameter.calledWith('getValues', 0).mockReturnValue(true);
+
+				mockClient.type.mockResolvedValue('string');
+				mockClient.get.mockRejectedValue(new Error('Redis error'));
+
+				await expect(node.execute.call(thisArg)).rejects.toThrow(NodeOperationError);
+
+				expect(mockClient.get).toHaveBeenCalled();
+				expect(mockClient.quit).toHaveBeenCalled();
+			});
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Redis/test/RedisTrigger.node.test.ts b/packages/nodes-base/nodes/Redis/__tests__/RedisTrigger.node.test.ts
similarity index 97%
rename from packages/nodes-base/nodes/Redis/test/RedisTrigger.node.test.ts
rename to packages/nodes-base/nodes/Redis/__tests__/RedisTrigger.node.test.ts
index eadad5fe9042a..c2287d675da6f 100644
--- a/packages/nodes-base/nodes/Redis/test/RedisTrigger.node.test.ts
+++ b/packages/nodes-base/nodes/Redis/__tests__/RedisTrigger.node.test.ts
@@ -1,12 +1,13 @@
-import { returnJsonArray } from 'n8n-core';
 import { captor, mock } from 'jest-mock-extended';
+import { returnJsonArray } from 'n8n-core';
 import type { ICredentialDataDecryptedObject, ITriggerFunctions } from 'n8n-workflow';
 
 import { RedisTrigger } from '../RedisTrigger.node';
-import { type RedisClientType, setupRedisClient } from '../utils';
+import type { RedisClient } from '../types';
+import { setupRedisClient } from '../utils';
 
 jest.mock('../utils', () => {
-	const mockRedisClient = mock<RedisClientType>();
+	const mockRedisClient = mock<RedisClient>();
 	return {
 		setupRedisClient: jest.fn().mockReturnValue(mockRedisClient),
 	};
diff --git a/packages/nodes-base/nodes/Redis/test/Redis.node.test.ts b/packages/nodes-base/nodes/Redis/test/Redis.node.test.ts
deleted file mode 100644
index 029b85f4d49df..0000000000000
--- a/packages/nodes-base/nodes/Redis/test/Redis.node.test.ts
+++ /dev/null
@@ -1,205 +0,0 @@
-import { mock } from 'jest-mock-extended';
-import type { RedisClientType } from '@redis/client';
-import type { IExecuteFunctions } from 'n8n-workflow';
-
-const mockClient = mock<RedisClientType>();
-const createClient = jest.fn().mockReturnValue(mockClient);
-jest.mock('redis', () => ({ createClient }));
-
-import { Redis } from '../Redis.node';
-import { setupRedisClient } from '../utils';
-
-describe('Redis Node', () => {
-	const node = new Redis();
-
-	beforeEach(() => jest.clearAllMocks());
-
-	describe('setupRedisClient', () => {
-		it('should not configure TLS by default', () => {
-			setupRedisClient({
-				host: 'redis.domain',
-				port: 1234,
-				database: 0,
-			});
-			expect(createClient).toHaveBeenCalledWith({
-				database: 0,
-				password: undefined,
-				socket: {
-					host: 'redis.domain',
-					port: 1234,
-					tls: false,
-				},
-			});
-		});
-
-		it('should configure TLS', () => {
-			setupRedisClient({
-				host: 'redis.domain',
-				port: 1234,
-				database: 0,
-				ssl: true,
-			});
-			expect(createClient).toHaveBeenCalledWith({
-				database: 0,
-				password: undefined,
-				socket: {
-					host: 'redis.domain',
-					port: 1234,
-					tls: true,
-				},
-			});
-		});
-	});
-
-	describe('operations', () => {
-		const thisArg = mock<IExecuteFunctions>({});
-
-		const mockCredential = {
-			host: 'redis',
-			port: 1234,
-			database: 0,
-			password: 'random',
-		};
-
-		thisArg.getCredentials.calledWith('redis').mockResolvedValue(mockCredential);
-
-		afterEach(() => {
-			expect(createClient).toHaveBeenCalled();
-			expect(mockClient.connect).toHaveBeenCalled();
-			expect(mockClient.ping).toHaveBeenCalled();
-			expect(mockClient.quit).toHaveBeenCalled();
-		});
-
-		describe('info operation', () => {
-			it('should return info', async () => {
-				thisArg.getNodeParameter.calledWith('operation', 0).mockReturnValue('info');
-				mockClient.info.mockResolvedValue(`
-# Server
-redis_version:6.2.14
-redis_git_sha1:00000000
-redis_git_dirty:0
-redis_mode:standalone
-arch_bits:64
-tcp_port:6379
-uptime_in_seconds:429905
-uptime_in_days:4
-
-# Clients
-connected_clients:1
-cluster_connections:0
-max_clients:10000
-
-# Memory
-used_memory:876648
-
-# Replication
-role:master
-connected_slaves:0
-master_failover_state:no-failover
-	`);
-
-				const output = await node.execute.call(thisArg);
-
-				expect(mockClient.info).toHaveBeenCalled();
-				expect(output[0][0].json).toEqual({
-					redis_version: 6.2,
-					redis_git_sha1: 0,
-					redis_git_dirty: 0,
-					redis_mode: 'standalone',
-					arch_bits: 64,
-					tcp_port: 6379,
-					uptime_in_seconds: 429905,
-					uptime_in_days: 4,
-					connected_clients: 1,
-					cluster_connections: 0,
-					max_clients: 10000,
-					used_memory: 876648,
-					role: 'master',
-					connected_slaves: 0,
-					master_failover_state: 'no-failover',
-				});
-			});
-		});
-
-		describe('delete operation', () => {
-			it('should delete', async () => {
-				thisArg.getInputData.mockReturnValue([{ json: { x: 1 } }]);
-				thisArg.getNodeParameter.calledWith('operation', 0).mockReturnValue('delete');
-				thisArg.getNodeParameter.calledWith('key', 0).mockReturnValue('key1');
-				mockClient.del.calledWith('key1').mockResolvedValue(1);
-
-				const output = await node.execute.call(thisArg);
-				expect(mockClient.del).toHaveBeenCalledWith('key1');
-				expect(output[0][0].json).toEqual({ x: 1 });
-			});
-		});
-
-		describe('get operation', () => {
-			beforeEach(() => {
-				thisArg.getInputData.mockReturnValue([{ json: { x: 1 } }]);
-				thisArg.getNodeParameter.calledWith('operation', 0).mockReturnValue('get');
-				thisArg.getNodeParameter.calledWith('options', 0).mockReturnValue({ dotNotation: true });
-				thisArg.getNodeParameter.calledWith('key', 0).mockReturnValue('key1');
-				thisArg.getNodeParameter.calledWith('propertyName', 0).mockReturnValue('x.y');
-			});
-
-			it('keyType = automatic', async () => {
-				thisArg.getNodeParameter.calledWith('keyType', 0).mockReturnValue('automatic');
-				mockClient.type.calledWith('key1').mockResolvedValue('string');
-				mockClient.get.calledWith('key1').mockResolvedValue('value');
-
-				const output = await node.execute.call(thisArg);
-				expect(mockClient.type).toHaveBeenCalledWith('key1');
-				expect(mockClient.get).toHaveBeenCalledWith('key1');
-				expect(output[0][0].json).toEqual({ x: { y: 'value' } });
-			});
-
-			it('keyType = hash', async () => {
-				thisArg.getNodeParameter.calledWith('keyType', 0).mockReturnValue('hash');
-				mockClient.hGetAll.calledWith('key1').mockResolvedValue({
-					field1: '1',
-					field2: '2',
-				});
-
-				const output = await node.execute.call(thisArg);
-				expect(mockClient.hGetAll).toHaveBeenCalledWith('key1');
-				expect(output[0][0].json).toEqual({
-					x: {
-						y: {
-							field1: '1',
-							field2: '2',
-						},
-					},
-				});
-			});
-		});
-
-		describe('keys operation', () => {
-			beforeEach(() => {
-				thisArg.getInputData.mockReturnValue([{ json: { x: 1 } }]);
-				thisArg.getNodeParameter.calledWith('operation', 0).mockReturnValue('keys');
-				thisArg.getNodeParameter.calledWith('keyPattern', 0).mockReturnValue('key*');
-				mockClient.keys.calledWith('key*').mockResolvedValue(['key1', 'key2']);
-			});
-
-			it('getValues = false', async () => {
-				thisArg.getNodeParameter.calledWith('getValues', 0).mockReturnValue(false);
-
-				const output = await node.execute.call(thisArg);
-				expect(mockClient.keys).toHaveBeenCalledWith('key*');
-				expect(output[0][0].json).toEqual({ keys: ['key1', 'key2'] });
-			});
-
-			it('getValues = true', async () => {
-				thisArg.getNodeParameter.calledWith('getValues', 0).mockReturnValue(true);
-				mockClient.type.mockResolvedValue('string');
-				mockClient.get.calledWith('key1').mockResolvedValue('value1');
-				mockClient.get.calledWith('key2').mockResolvedValue('value2');
-
-				const output = await node.execute.call(thisArg);
-				expect(mockClient.keys).toHaveBeenCalledWith('key*');
-				expect(output[0][0].json).toEqual({ key1: 'value1', key2: 'value2' });
-			});
-		});
-	});
-});
diff --git a/packages/nodes-base/nodes/Redis/types.ts b/packages/nodes-base/nodes/Redis/types.ts
new file mode 100644
index 0000000000000..63e873acce6b2
--- /dev/null
+++ b/packages/nodes-base/nodes/Redis/types.ts
@@ -0,0 +1,12 @@
+import type { createClient } from 'redis';
+
+export type RedisClient = ReturnType<typeof createClient>;
+
+export type RedisCredential = {
+	host: string;
+	port: number;
+	ssl?: boolean;
+	database: number;
+	user?: string;
+	password?: string;
+};
diff --git a/packages/nodes-base/nodes/Redis/utils.ts b/packages/nodes-base/nodes/Redis/utils.ts
index effdd99778600..4364bab892438 100644
--- a/packages/nodes-base/nodes/Redis/utils.ts
+++ b/packages/nodes-base/nodes/Redis/utils.ts
@@ -1,5 +1,4 @@
 import type {
-	ICredentialDataDecryptedObject,
 	ICredentialTestFunctions,
 	ICredentialsDecrypted,
 	IDataObject,
@@ -7,29 +6,28 @@ import type {
 	INodeCredentialTestResult,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+import { createClient } from 'redis';
 
-import { type RedisClientOptions, createClient } from 'redis';
-export type RedisClientType = ReturnType<typeof createClient>;
+import type { RedisCredential, RedisClient } from './types';
 
-export function setupRedisClient(credentials: ICredentialDataDecryptedObject): RedisClientType {
-	const redisOptions: RedisClientOptions = {
+export function setupRedisClient(credentials: RedisCredential): RedisClient {
+	return createClient({
 		socket: {
-			host: credentials.host as string,
-			port: credentials.port as number,
+			host: credentials.host,
+			port: credentials.port,
 			tls: credentials.ssl === true,
 		},
-		database: credentials.database as number,
-		password: (credentials.password as string) || undefined,
-	};
-
-	return createClient(redisOptions);
+		database: credentials.database,
+		username: credentials.user || undefined,
+		password: credentials.password || undefined,
+	});
 }
 
 export async function redisConnectionTest(
 	this: ICredentialTestFunctions,
 	credential: ICredentialsDecrypted,
 ): Promise<INodeCredentialTestResult> {
-	const credentials = credential.data as ICredentialDataDecryptedObject;
+	const credentials = credential.data as RedisCredential;
 
 	try {
 		const client = setupRedisClient(credentials);
@@ -88,7 +86,7 @@ export function convertInfoToObject(stringData: string): IDataObject {
 	return returnData;
 }
 
-export async function getValue(client: RedisClientType, keyName: string, type?: string) {
+export async function getValue(client: RedisClient, keyName: string, type?: string) {
 	if (type === undefined || type === 'automatic') {
 		// Request the type first
 		type = await client.type(keyName);
@@ -107,7 +105,7 @@ export async function getValue(client: RedisClientType, keyName: string, type?:
 
 export async function setValue(
 	this: IExecuteFunctions,
-	client: RedisClientType,
+	client: RedisClient,
 	keyName: string,
 	value: string | number | object | string[] | number[],
 	expire: boolean,
diff --git a/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts b/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts
index 7e53e9b0cb27a..4f216945f7f46 100644
--- a/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts
+++ b/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts
@@ -1,3 +1,7 @@
+import get from 'lodash/get';
+import set from 'lodash/set';
+import unset from 'lodash/unset';
+import { NodeConnectionType, deepCopy } from 'n8n-workflow';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -5,11 +9,6 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeConnectionType, deepCopy } from 'n8n-workflow';
-
-import get from 'lodash/get';
-import set from 'lodash/set';
-import unset from 'lodash/unset';
 
 interface IRenameKey {
 	currentKey: string;
diff --git a/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts b/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts
index 0ad0dd85c3135..b8038d9163026 100644
--- a/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts
+++ b/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts
@@ -1,4 +1,5 @@
-import type { Readable } from 'stream';
+import jwt from 'jsonwebtoken';
+import set from 'lodash/set';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -18,8 +19,8 @@ import {
 	CHAT_TRIGGER_NODE_TYPE,
 	WAIT_NODE_TYPE,
 } from 'n8n-workflow';
-import set from 'lodash/set';
-import jwt from 'jsonwebtoken';
+import type { Readable } from 'stream';
+
 import { formatPrivateKey, generatePairedItemData } from '../../utils/utilities';
 
 export class RespondToWebhook implements INodeType {
@@ -355,14 +356,12 @@ export class RespondToWebhook implements INodeType {
 				}
 			} else if (respondWith === 'jwt') {
 				try {
-					const { keyType, secret, algorithm, privateKey } = (await this.getCredentials(
-						'jwtAuth',
-					)) as {
+					const { keyType, secret, algorithm, privateKey } = await this.getCredentials<{
 						keyType: 'passphrase' | 'pemKey';
 						privateKey: string;
 						secret: string;
 						algorithm: jwt.Algorithm;
-					};
+					}>('jwtAuth');
 
 					let secretOrPrivateKey;
 
diff --git a/packages/nodes-base/nodes/RespondToWebhook/test/RespondToWebhook.test.ts b/packages/nodes-base/nodes/RespondToWebhook/test/RespondToWebhook.test.ts
index c090511552ea1..797d1ea30465b 100644
--- a/packages/nodes-base/nodes/RespondToWebhook/test/RespondToWebhook.test.ts
+++ b/packages/nodes-base/nodes/RespondToWebhook/test/RespondToWebhook.test.ts
@@ -1,9 +1,12 @@
-import type { MockProxy } from 'jest-mock-extended';
-import { mock } from 'jest-mock-extended';
+import type { DeepMockProxy } from 'jest-mock-extended';
+import { mock, mockDeep } from 'jest-mock-extended';
+import { constructExecutionMetaData } from 'n8n-core';
 import {
+	BINARY_ENCODING,
 	WAIT_NODE_TYPE,
 	type IExecuteFunctions,
 	type INode,
+	type INodeExecutionData,
 	type NodeTypeAndVersion,
 } from 'n8n-workflow';
 
@@ -11,11 +14,13 @@ import { RespondToWebhook } from '../RespondToWebhook.node';
 
 describe('RespondToWebhook Node', () => {
 	let respondToWebhook: RespondToWebhook;
-	let mockExecuteFunctions: MockProxy<IExecuteFunctions>;
+	let mockExecuteFunctions: DeepMockProxy<IExecuteFunctions>;
 
 	beforeEach(() => {
 		respondToWebhook = new RespondToWebhook();
-		mockExecuteFunctions = mock<IExecuteFunctions>();
+		mockExecuteFunctions = mockDeep<IExecuteFunctions>({
+			helpers: { constructExecutionMetaData },
+		});
 	});
 
 	describe('execute method', () => {
@@ -30,6 +35,7 @@ describe('RespondToWebhook Node', () => {
 				'No Webhook node found in the workflow',
 			);
 		});
+
 		it('should not throw an error if WEBHOOK_NODE_TYPES is in parents', async () => {
 			mockExecuteFunctions.getInputData.mockReturnValue([]);
 			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.1 }));
@@ -43,5 +49,215 @@ describe('RespondToWebhook Node', () => {
 
 			await expect(respondToWebhook.execute.call(mockExecuteFunctions)).resolves.not.toThrow();
 		});
+
+		it('should correctly apply response options', async () => {
+			mockExecuteFunctions.getInputData.mockReturnValue([{ json: { input: true } }]);
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.1 }));
+			mockExecuteFunctions.getParentNodes.mockReturnValue([
+				mock<NodeTypeAndVersion>({ type: WAIT_NODE_TYPE }),
+			]);
+			mockExecuteFunctions.getNodeParameter.mockImplementation((paramName) => {
+				if (paramName === 'respondWith') return 'firstIncomingItem';
+				if (paramName === 'options')
+					return {
+						responseHeaders: { entries: [{ name: 'X-My-Header', value: 'X-My-Header' }] },
+						responseCode: 201,
+						responseKey: 'data',
+					};
+			});
+			mockExecuteFunctions.sendResponse.mockReturnValue();
+
+			await expect(respondToWebhook.execute.call(mockExecuteFunctions)).resolves.not.toThrow();
+			expect(mockExecuteFunctions.sendResponse).toHaveBeenCalledWith({
+				body: { data: { input: true } },
+				headers: { 'x-my-header': 'X-My-Header' },
+				statusCode: 201,
+			});
+		});
+
+		it('should correctly return a json response', async () => {
+			mockExecuteFunctions.getInputData.mockReturnValue([{ json: { input: true } }]);
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.1 }));
+			mockExecuteFunctions.getParentNodes.mockReturnValue([
+				mock<NodeTypeAndVersion>({ type: WAIT_NODE_TYPE }),
+			]);
+			mockExecuteFunctions.getNodeParameter.mockImplementation((paramName) => {
+				if (paramName === 'respondWith') return 'json';
+				if (paramName === 'options') return {};
+				if (paramName === 'responseBody') return { response: true };
+			});
+			mockExecuteFunctions.sendResponse.mockReturnValue();
+
+			await expect(respondToWebhook.execute.call(mockExecuteFunctions)).resolves.not.toThrow();
+			expect(mockExecuteFunctions.sendResponse).toHaveBeenCalledWith({
+				body: { response: true },
+				headers: {},
+				statusCode: 200,
+			});
+		});
+
+		it('should correctly return a stringified json response', async () => {
+			mockExecuteFunctions.getInputData.mockReturnValue([{ json: { input: true } }]);
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.1 }));
+			mockExecuteFunctions.getParentNodes.mockReturnValue([
+				mock<NodeTypeAndVersion>({ type: WAIT_NODE_TYPE }),
+			]);
+			mockExecuteFunctions.getNodeParameter.mockImplementation((paramName) => {
+				if (paramName === 'respondWith') return 'json';
+				if (paramName === 'options') return {};
+				if (paramName === 'responseBody') return JSON.stringify({ response: true });
+			});
+			mockExecuteFunctions.sendResponse.mockReturnValue();
+
+			await expect(respondToWebhook.execute.call(mockExecuteFunctions)).resolves.not.toThrow();
+			expect(mockExecuteFunctions.sendResponse).toHaveBeenCalledWith({
+				body: { response: true },
+				headers: {},
+				statusCode: 200,
+			});
+		});
+
+		it('should correctly return a jwt response', async () => {
+			mockExecuteFunctions.getInputData.mockReturnValue([{ json: { input: true } }]);
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.1 }));
+			mockExecuteFunctions.getCredentials.mockResolvedValue(
+				mock({
+					keyType: 'passphrase',
+					privateKey: 'privateKey',
+					secret: 'secret',
+					algorithm: 'HS256',
+				}),
+			);
+			mockExecuteFunctions.getParentNodes.mockReturnValue([
+				mock<NodeTypeAndVersion>({ type: WAIT_NODE_TYPE }),
+			]);
+			mockExecuteFunctions.getNodeParameter.mockImplementation((paramName) => {
+				if (paramName === 'respondWith') return 'jwt';
+				if (paramName === 'options') return {};
+				if (paramName === 'payload') return 'payload';
+			});
+			mockExecuteFunctions.sendResponse.mockReturnValue();
+
+			await expect(respondToWebhook.execute.call(mockExecuteFunctions)).resolves.not.toThrow();
+			expect(mockExecuteFunctions.sendResponse).toHaveBeenCalledWith({
+				body: {
+					token: 'eyJhbGciOiJIUzI1NiJ9.cGF5bG9hZA.4GMt2k_zZryxhKgC8_HvdSZtYxyEyDa0AFIL-n60a8M',
+				},
+				headers: {},
+				statusCode: 200,
+			});
+		});
+
+		it('should correctly return a text response', async () => {
+			mockExecuteFunctions.getInputData.mockReturnValue([{ json: { input: true } }]);
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.1 }));
+			mockExecuteFunctions.getParentNodes.mockReturnValue([
+				mock<NodeTypeAndVersion>({ type: WAIT_NODE_TYPE }),
+			]);
+			mockExecuteFunctions.getNodeParameter.mockImplementation((paramName) => {
+				if (paramName === 'respondWith') return 'text';
+				if (paramName === 'options') return {};
+				if (paramName === 'responseBody') return 'responseBody';
+			});
+			mockExecuteFunctions.sendResponse.mockReturnValue();
+
+			await expect(respondToWebhook.execute.call(mockExecuteFunctions)).resolves.not.toThrow();
+			expect(mockExecuteFunctions.sendResponse).toHaveBeenCalledWith({
+				body: 'responseBody',
+				headers: {},
+				statusCode: 200,
+			});
+		});
+
+		it('should correctly return a redirect', async () => {
+			mockExecuteFunctions.getInputData.mockReturnValue([{ json: { input: true } }]);
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.1 }));
+			mockExecuteFunctions.getParentNodes.mockReturnValue([
+				mock<NodeTypeAndVersion>({ type: WAIT_NODE_TYPE }),
+			]);
+			mockExecuteFunctions.getNodeParameter.mockImplementation((paramName) => {
+				if (paramName === 'respondWith') return 'redirect';
+				if (paramName === 'options') return {};
+				if (paramName === 'redirectURL') return 'https://n8n.io';
+			});
+			mockExecuteFunctions.sendResponse.mockReturnValue();
+
+			await expect(respondToWebhook.execute.call(mockExecuteFunctions)).resolves.not.toThrow();
+			expect(mockExecuteFunctions.sendResponse).toHaveBeenCalledWith({
+				headers: { location: 'https://n8n.io' },
+				statusCode: 307,
+			});
+		});
+
+		it('should correctly return incoming items', async () => {
+			const inputItems = [{ json: { index: 0, input: true } }, { json: { index: 1, input: true } }];
+			mockExecuteFunctions.getInputData.mockReturnValue(inputItems);
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.1 }));
+			mockExecuteFunctions.getParentNodes.mockReturnValue([
+				mock<NodeTypeAndVersion>({ type: WAIT_NODE_TYPE }),
+			]);
+			mockExecuteFunctions.getNodeParameter.mockImplementation((paramName) => {
+				if (paramName === 'respondWith') return 'allIncomingItems';
+				if (paramName === 'options') return {};
+			});
+			mockExecuteFunctions.sendResponse.mockReturnValue();
+
+			await expect(respondToWebhook.execute.call(mockExecuteFunctions)).resolves.not.toThrow();
+			expect(mockExecuteFunctions.sendResponse).toHaveBeenCalledWith({
+				body: inputItems.map((item) => item.json),
+				headers: {},
+				statusCode: 200,
+			});
+		});
+
+		it('should correctly return binary', async () => {
+			const binary = { data: 'text', mimeType: 'text/plain' };
+			const inputItems: INodeExecutionData[] = [{ binary: { data: binary }, json: {} }];
+			mockExecuteFunctions.getInputData.mockReturnValue(inputItems);
+			mockExecuteFunctions.helpers.assertBinaryData.mockReturnValue(binary);
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.1 }));
+			mockExecuteFunctions.getParentNodes.mockReturnValue([
+				mock<NodeTypeAndVersion>({ type: WAIT_NODE_TYPE }),
+			]);
+			mockExecuteFunctions.getNodeParameter.mockImplementation((paramName) => {
+				if (paramName === 'respondWith') return 'binary';
+				if (paramName === 'options') return {};
+			});
+			mockExecuteFunctions.sendResponse.mockReturnValue();
+
+			await expect(respondToWebhook.execute.call(mockExecuteFunctions)).resolves.not.toThrow();
+			expect(mockExecuteFunctions.sendResponse).toHaveBeenCalledWith({
+				body: Buffer.from('text', BINARY_ENCODING),
+				headers: {
+					'content-length': 3,
+					'content-type': 'text/plain',
+				},
+				statusCode: 200,
+			});
+		});
+
+		it('should correctly handle continue on fail', async () => {
+			mockExecuteFunctions.getInputData.mockReturnValue([{ json: { input: true } }]);
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.1 }));
+			mockExecuteFunctions.continueOnFail.mockReturnValue(true);
+			mockExecuteFunctions.getParentNodes.mockReturnValue([
+				mock<NodeTypeAndVersion>({ type: WAIT_NODE_TYPE }),
+			]);
+			mockExecuteFunctions.getNodeParameter.mockImplementation((paramName) => {
+				if (paramName === 'respondWith') return 'notSupportedRespondWith';
+				if (paramName === 'options') return {};
+			});
+			mockExecuteFunctions.sendResponse.mockReturnValue();
+
+			await expect(respondToWebhook.execute.call(mockExecuteFunctions)).resolves.toEqual([
+				[
+					{
+						json: { error: 'The Response Data option "notSupportedRespondWith" is not supported!' },
+						pairedItem: [{ item: 0 }],
+					},
+				],
+			]);
+			expect(mockExecuteFunctions.sendResponse).not.toHaveBeenCalled();
+		});
 	});
 });
diff --git a/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts b/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts
index 3664b16aed3be..b29255d34a1e3 100644
--- a/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts
+++ b/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts
@@ -1,4 +1,3 @@
-import { URL } from 'url';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -7,8 +6,9 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-
 import Parser from 'rss-parser';
+import { URL } from 'url';
+
 import { generatePairedItemData } from '../../utils/utilities';
 
 // Utility function
diff --git a/packages/nodes-base/nodes/RssFeedRead/RssFeedReadTrigger.node.ts b/packages/nodes-base/nodes/RssFeedRead/RssFeedReadTrigger.node.ts
index 523860ddd180b..a3f7849e915ea 100644
--- a/packages/nodes-base/nodes/RssFeedRead/RssFeedReadTrigger.node.ts
+++ b/packages/nodes-base/nodes/RssFeedRead/RssFeedReadTrigger.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IDataObject,
 	INodeExecutionData,
@@ -7,7 +8,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import Parser from 'rss-parser';
-import moment from 'moment-timezone';
 
 interface PollData {
 	lastItemDate?: string;
diff --git a/packages/nodes-base/nodes/RssFeedRead/test/RssFeedRead.test.ts b/packages/nodes-base/nodes/RssFeedRead/test/RssFeedRead.test.ts
index d942859764588..7e10c21ce8d8a 100644
--- a/packages/nodes-base/nodes/RssFeedRead/test/RssFeedRead.test.ts
+++ b/packages/nodes-base/nodes/RssFeedRead/test/RssFeedRead.test.ts
@@ -1,7 +1,8 @@
 import { mock } from 'jest-mock-extended';
+import { returnJsonArray } from 'n8n-core';
 import type { IPollFunctions } from 'n8n-workflow';
 import Parser from 'rss-parser';
-import { returnJsonArray } from 'n8n-core';
+
 import { RssFeedReadTrigger } from '../RssFeedReadTrigger.node';
 
 jest.mock('rss-parser');
diff --git a/packages/nodes-base/nodes/RssFeedRead/test/node/RssFeedRead.test.ts b/packages/nodes-base/nodes/RssFeedRead/test/node/RssFeedRead.test.ts
index 7238dcfa0022b..f68c8db965a60 100644
--- a/packages/nodes-base/nodes/RssFeedRead/test/node/RssFeedRead.test.ts
+++ b/packages/nodes-base/nodes/RssFeedRead/test/node/RssFeedRead.test.ts
@@ -1,4 +1,5 @@
 import nock from 'nock';
+
 import { setup, equalityTest, workflowToTests, getWorkflowFilenames } from '@test/nodes/Helpers';
 
 // eslint-disable-next-line n8n-local-rules/no-unneeded-backticks
diff --git a/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts b/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts
index 631853a8ec459..bd36d74e166fe 100644
--- a/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts
+++ b/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts
@@ -6,6 +6,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+
 import { RundeckApi } from './RundeckApi';
 
 export class Rundeck implements INodeType {
diff --git a/packages/nodes-base/nodes/S3/GenericFunctions.ts b/packages/nodes-base/nodes/S3/GenericFunctions.ts
index a31eb6ddd5427..34fe6242e09c7 100644
--- a/packages/nodes-base/nodes/S3/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/S3/GenericFunctions.ts
@@ -1,11 +1,6 @@
-import { URL } from 'url';
 import type { Request } from 'aws4';
 import { sign } from 'aws4';
-
 import get from 'lodash/get';
-
-import { parseString } from 'xml2js';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -17,6 +12,8 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
+import { URL } from 'url';
+import { parseString } from 'xml2js';
 
 function queryToString(params: IDataObject) {
 	return Object.keys(params)
diff --git a/packages/nodes-base/nodes/S3/S3.node.ts b/packages/nodes-base/nodes/S3/S3.node.ts
index bfb581447c22a..d7e9d5d75c130 100644
--- a/packages/nodes-base/nodes/S3/S3.node.ts
+++ b/packages/nodes-base/nodes/S3/S3.node.ts
@@ -1,8 +1,5 @@
-import { createHash } from 'crypto';
 import { paramCase, snakeCase } from 'change-case';
-
-import { Builder } from 'xml2js';
-
+import { createHash } from 'crypto';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -12,14 +9,12 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import { Builder } from 'xml2js';
 
+import { s3ApiRequestREST, s3ApiRequestSOAP, s3ApiRequestSOAPAllItems } from './GenericFunctions';
 import { bucketFields, bucketOperations } from '../Aws/S3/V1/BucketDescription';
-
-import { folderFields, folderOperations } from '../Aws/S3/V1/FolderDescription';
-
 import { fileFields, fileOperations } from '../Aws/S3/V1/FileDescription';
-
-import { s3ApiRequestREST, s3ApiRequestSOAP, s3ApiRequestSOAPAllItems } from './GenericFunctions';
+import { folderFields, folderOperations } from '../Aws/S3/V1/FolderDescription';
 
 export class S3 implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts b/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts
index 78454e3519994..275f92b6f6fc5 100644
--- a/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts
@@ -1,3 +1,5 @@
+import jwt from 'jsonwebtoken';
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
@@ -10,10 +12,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
-import jwt from 'jsonwebtoken';
-
 function getOptions(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
 	method: IHttpRequestMethods,
@@ -114,14 +112,13 @@ export async function salesforceApiRequest(
 			);
 			options.headers!.Authorization = `Bearer ${access_token}`;
 			Object.assign(options, option);
-			//@ts-ignore
 			return await this.helpers.request(options);
 		} else {
 			// https://help.salesforce.com/articleView?id=remoteaccess_oauth_web_server_flow.htm&type=5
 			const credentialsType = 'salesforceOAuth2Api';
-			const credentials = (await this.getCredentials(credentialsType)) as {
+			const credentials = await this.getCredentials<{
 				oauthTokenData: { instance_url: string };
-			};
+			}>(credentialsType);
 			const options = getOptions.call(
 				this,
 				method,
diff --git a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
index 5bf2a3ce8e1dd..351c6f27a257c 100644
--- a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
+++ b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
@@ -12,54 +12,33 @@ import type {
 import { NodeApiError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
 import { accountFields, accountOperations } from './AccountDescription';
-
 import type { IAccount } from './AccountInterface';
-
 import { attachmentFields, attachmentOperations } from './AttachmentDescription';
-
 import type { IAttachment } from './AttachmentInterface';
-
 import type { ICampaignMember } from './CampaignMemberInterface';
-
 import { caseFields, caseOperations } from './CaseDescription';
-
 import type { ICase, ICaseComment } from './CaseInterface';
-
 import { contactFields, contactOperations } from './ContactDescription';
-
 import type { IContact } from './ContactInterface';
-
 import { customObjectFields, customObjectOperations } from './CustomObjectDescription';
-
+import { documentFields, documentOperations } from './DocumentDescription';
 import { flowFields, flowOperations } from './FlowDescription';
-
 import {
 	getQuery,
 	salesforceApiRequest,
 	salesforceApiRequestAllItems,
 	sortOptions,
 } from './GenericFunctions';
-
 import { leadFields, leadOperations } from './LeadDescription';
-
 import type { ILead } from './LeadInterface';
-
 import type { INote } from './NoteInterface';
-
 import { opportunityFields, opportunityOperations } from './OpportunityDescription';
-
 import type { IOpportunity } from './OpportunityInterface';
-
 import { searchFields, searchOperations } from './SearchDescription';
-
 import { taskFields, taskOperations } from './TaskDescription';
-
 import type { ITask } from './TaskInterface';
-
 import { userFields, userOperations } from './UserDescription';
 
-import { documentFields, documentOperations } from './DocumentDescription';
-
 export class Salesforce implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Salesforce',
diff --git a/packages/nodes-base/nodes/Salesforce/SalesforceTrigger.node.ts b/packages/nodes-base/nodes/Salesforce/SalesforceTrigger.node.ts
index 257a778ba3452..895c5cbc78dd6 100644
--- a/packages/nodes-base/nodes/Salesforce/SalesforceTrigger.node.ts
+++ b/packages/nodes-base/nodes/Salesforce/SalesforceTrigger.node.ts
@@ -1,5 +1,5 @@
+import { DateTime } from 'luxon';
 import { NodeApiError, NodeConnectionType } from 'n8n-workflow';
-
 import type {
 	IDataObject,
 	IPollFunctions,
@@ -11,7 +11,6 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 
-import { DateTime } from 'luxon';
 import {
 	getQuery,
 	salesforceApiRequest,
diff --git a/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts b/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts
index c0b8d00029ac9..f3f7f406db6d2 100644
--- a/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts
+++ b/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts
@@ -8,18 +8,19 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+
+import { activityFields, activityOperations } from './ActivityDescription';
+import type { IActivity } from './ActivityInterface';
+import { companyFields, companyOperations } from './CompanyDescription';
+import type { ICompany } from './CompanyInterface';
+import { dealFields, dealOperations } from './DealDescription';
+import type { IDeal } from './DealInterface';
 import {
 	salesmateApiRequest,
 	salesmateApiRequestAllItems,
 	simplifySalesmateData,
 	validateJSON,
 } from './GenericFunctions';
-import { companyFields, companyOperations } from './CompanyDescription';
-import { activityFields, activityOperations } from './ActivityDescription';
-import type { ICompany } from './CompanyInterface';
-import type { IActivity } from './ActivityInterface';
-import type { IDeal } from './DealInterface';
-import { dealFields, dealOperations } from './DealDescription';
 
 export class Salesmate implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Schedule/GenericFunctions.ts b/packages/nodes-base/nodes/Schedule/GenericFunctions.ts
index 42d31bd582652..4a6453985b95e 100644
--- a/packages/nodes-base/nodes/Schedule/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Schedule/GenericFunctions.ts
@@ -1,5 +1,6 @@
 import moment from 'moment-timezone';
 import { type CronExpression, randomInt } from 'n8n-workflow';
+
 import type { IRecurrenceRule, ScheduleInterval } from './SchedulerInterface';
 
 export function recurrenceCheck(
diff --git a/packages/nodes-base/nodes/Schedule/ScheduleTrigger.node.ts b/packages/nodes-base/nodes/Schedule/ScheduleTrigger.node.ts
index 904c5f656774f..34b0f462c71e4 100644
--- a/packages/nodes-base/nodes/Schedule/ScheduleTrigger.node.ts
+++ b/packages/nodes-base/nodes/Schedule/ScheduleTrigger.node.ts
@@ -1,3 +1,5 @@
+import { sendAt } from 'cron';
+import moment from 'moment-timezone';
 import type {
 	ITriggerFunctions,
 	INodeType,
@@ -5,11 +7,9 @@ import type {
 	ITriggerResponse,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-import moment from 'moment-timezone';
-import { sendAt } from 'cron';
 
-import type { IRecurrenceRule, Rule } from './SchedulerInterface';
 import { intervalToRecurrence, recurrenceCheck, toCronExpression } from './GenericFunctions';
+import type { IRecurrenceRule, Rule } from './SchedulerInterface';
 
 export class ScheduleTrigger implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Schedule/test/GenericFunctions.test.ts b/packages/nodes-base/nodes/Schedule/test/GenericFunctions.test.ts
index d6c124cc4c269..4c953b9e40de2 100644
--- a/packages/nodes-base/nodes/Schedule/test/GenericFunctions.test.ts
+++ b/packages/nodes-base/nodes/Schedule/test/GenericFunctions.test.ts
@@ -1,4 +1,5 @@
 import * as n8nWorkflow from 'n8n-workflow';
+
 import { intervalToRecurrence, recurrenceCheck, toCronExpression } from '../GenericFunctions';
 import type { IRecurrenceRule } from '../SchedulerInterface';
 
diff --git a/packages/nodes-base/nodes/SeaTable/GenericFunctions.ts b/packages/nodes-base/nodes/SeaTable/GenericFunctions.ts
index b8ffb713279f7..0318e0b73a448 100644
--- a/packages/nodes-base/nodes/SeaTable/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/SeaTable/GenericFunctions.ts
@@ -9,10 +9,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import type { TDtableMetadataColumns, TDtableViewColumns, TEndpointVariableName } from './types';
-
-import { schema } from './Schema';
-
 import type {
 	ICredential,
 	ICtx,
@@ -22,6 +18,8 @@ import type {
 	IRow,
 	IRowObject,
 } from './Interfaces';
+import { schema } from './Schema';
+import type { TDtableMetadataColumns, TDtableViewColumns, TEndpointVariableName } from './types';
 
 const userBaseUri = (uri?: string) => {
 	if (uri === undefined) {
diff --git a/packages/nodes-base/nodes/SeaTable/SeaTable.node.ts b/packages/nodes-base/nodes/SeaTable/SeaTable.node.ts
index 0b62dae6915d6..6e86475c66060 100644
--- a/packages/nodes-base/nodes/SeaTable/SeaTable.node.ts
+++ b/packages/nodes-base/nodes/SeaTable/SeaTable.node.ts
@@ -20,13 +20,10 @@ import {
 	split,
 	updateAble,
 } from './GenericFunctions';
-
+import type { ICtx, IRow, IRowObject } from './Interfaces';
 import { rowFields, rowOperations } from './RowDescription';
-
 import type { TColumnsUiValues, TColumnValue } from './types';
 
-import type { ICtx, IRow, IRowObject } from './Interfaces';
-
 export class SeaTable implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'SeaTable',
diff --git a/packages/nodes-base/nodes/SeaTable/SeaTableTrigger.node.ts b/packages/nodes-base/nodes/SeaTable/SeaTableTrigger.node.ts
index 9995ee01ae9a7..709367a6f507f 100644
--- a/packages/nodes-base/nodes/SeaTable/SeaTableTrigger.node.ts
+++ b/packages/nodes-base/nodes/SeaTable/SeaTableTrigger.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import {
 	type IPollFunctions,
 	type ILoadOptionsFunctions,
@@ -8,9 +9,7 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import { getColumns, rowFormatColumns, seaTableApiRequest, simplify } from './GenericFunctions';
-
 import type { ICtx, IRow, IRowResponse } from './Interfaces';
 
 export class SeaTableTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/SeaTable/types.ts b/packages/nodes-base/nodes/SeaTable/types.ts
index 876342b368cc3..a84e1ab208b06 100644
--- a/packages/nodes-base/nodes/SeaTable/types.ts
+++ b/packages/nodes-base/nodes/SeaTable/types.ts
@@ -10,6 +10,7 @@ export type TSeaTableServerEdition = 'enterprise edition';
 // ----------------------------------
 
 import type { ICredentialDataDecryptedObject } from 'n8n-workflow';
+
 import type { IDtableMetadataColumn, IDtableMetadataTable, TDtableViewColumn } from './Interfaces';
 
 export type TInheritColumnTypeTime = 'ctime' | 'mtime';
diff --git a/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.ts b/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.ts
index a1e533f6c9b21..520489b524c3d 100644
--- a/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.ts
+++ b/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -7,22 +8,15 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import { companyFields, companyOperations } from './descriptions/CompanyDescription';
-
 import { industryFields, industryOperations } from './descriptions/IndustryDescription';
-
 import { inviteFields, inviteOperations } from './descriptions/InviteDescription';
-
-import { portfolioFields, portfolioOperations } from './descriptions/PortfolioDescription';
-
 import {
 	portfolioCompanyFields,
 	portfolioCompanyOperations,
 } from './descriptions/PortfolioCompanyDescription';
-
+import { portfolioFields, portfolioOperations } from './descriptions/PortfolioDescription';
 import { reportFields, reportOperations } from './descriptions/ReportDescription';
-
 import { scorecardApiRequest, simplify } from './GenericFunctions';
 
 export class SecurityScorecard implements INodeType {
diff --git a/packages/nodes-base/nodes/Segment/Segment.node.ts b/packages/nodes-base/nodes/Segment/Segment.node.ts
index bfef2985a5d89..5699e22535179 100644
--- a/packages/nodes-base/nodes/Segment/Segment.node.ts
+++ b/packages/nodes-base/nodes/Segment/Segment.node.ts
@@ -6,18 +6,13 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
-
 import { v4 as uuid } from 'uuid';
-import { segmentApiRequest } from './GenericFunctions';
 
+import { segmentApiRequest } from './GenericFunctions';
 import { groupFields, groupOperations } from './GroupDescription';
-
 import { identifyFields, identifyOperations } from './IdentifyDescription';
-
 import type { IIdentify } from './IdentifyInterface';
-
 import { trackFields, trackOperations } from './TrackDescription';
-
 import type { IGroup, ITrack } from './TrackInterface';
 
 export class Segment implements INodeType {
diff --git a/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts b/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts
index c803521206756..560f1f36b3428 100644
--- a/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts
+++ b/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import {
 	NodeConnectionType,
 	type IDataObject,
@@ -10,16 +11,12 @@ import {
 	type INodeTypeDescription,
 } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-import { listFields, listOperations } from './ListDescription';
-
 import { contactFields, contactOperations } from './ContactDescription';
-
+import { sendGridApiRequest, sendGridApiRequestAllItems } from './GenericFunctions';
+import { listFields, listOperations } from './ListDescription';
 import type { SendMailBody } from './MailDescription';
 import { mailFields, mailOperations } from './MailDescription';
 
-import { sendGridApiRequest, sendGridApiRequestAllItems } from './GenericFunctions';
-
 export class SendGrid implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'SendGrid',
diff --git a/packages/nodes-base/nodes/Sendy/Sendy.node.ts b/packages/nodes-base/nodes/Sendy/Sendy.node.ts
index 9bf36b2e82e4d..6ca6b76bd3260 100644
--- a/packages/nodes-base/nodes/Sendy/Sendy.node.ts
+++ b/packages/nodes-base/nodes/Sendy/Sendy.node.ts
@@ -8,10 +8,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { sendyApiRequest } from './GenericFunctions';
-
 import { campaignFields, campaignOperations } from './CampaignDescription';
-
+import { sendyApiRequest } from './GenericFunctions';
 import { subscriberFields, subscriberOperations } from './SubscriberDescription';
 
 export class Sendy implements INodeType {
diff --git a/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts b/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts
index ad83f771b60cb..edd53b83ea04a 100644
--- a/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts
+++ b/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts
@@ -10,21 +10,14 @@ import {
 } from 'n8n-workflow';
 
 import { eventFields, eventOperations } from './EventDescription';
-
+import { sentryApiRequestAllItems, sentryIoApiRequest } from './GenericFunctions';
+import type { ICommit, IPatchSet, IRef } from './Interface';
 import { issueFields, issueOperations } from './IssueDescription';
-
 import { organizationFields, organizationOperations } from './OrganizationDescription';
-
 import { projectFields, projectOperations } from './ProjectDescription';
-
 import { releaseFields, releaseOperations } from './ReleaseDescription';
-
 import { teamFields, teamOperations } from './TeamDescription';
 
-import { sentryApiRequestAllItems, sentryIoApiRequest } from './GenericFunctions';
-
-import type { ICommit, IPatchSet, IRef } from './Interface';
-
 export class SentryIo implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Sentry.io',
diff --git a/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts b/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts
index 50d78a31f552b..15ef43649759e 100644
--- a/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts
+++ b/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts
@@ -9,35 +9,25 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import {
-	mapEndpoint,
-	serviceNowApiRequest,
-	serviceNowDownloadAttachment,
-	serviceNowRequestAllItems,
-	sortData,
-} from './GenericFunctions';
-
 import { attachmentFields, attachmentOperations } from './AttachmentDescription';
-
 import { businessServiceFields, businessServiceOperations } from './BusinessServiceDescription';
-
 import {
 	configurationItemsFields,
 	configurationItemsOperations,
 } from './ConfigurationItemsDescription';
-
 import { departmentFields, departmentOperations } from './DepartmentDescription';
-
 import { dictionaryFields, dictionaryOperations } from './DictionaryDescription';
-
+import {
+	mapEndpoint,
+	serviceNowApiRequest,
+	serviceNowDownloadAttachment,
+	serviceNowRequestAllItems,
+	sortData,
+} from './GenericFunctions';
 import { incidentFields, incidentOperations } from './IncidentDescription';
-
 import { tableRecordFields, tableRecordOperations } from './TableRecordDescription';
-
 import { userFields, userOperations } from './UserDescription';
-
 import { userGroupFields, userGroupOperations } from './UserGroupDescription';
-
 import { userRoleFields, userRoleOperations } from './UserRoleDescription';
 
 export class ServiceNow implements INodeType {
diff --git a/packages/nodes-base/nodes/Set/test/v2/raw.test.ts b/packages/nodes-base/nodes/Set/test/v2/raw.test.ts
new file mode 100644
index 0000000000000..5cebfbfcab143
--- /dev/null
+++ b/packages/nodes-base/nodes/Set/test/v2/raw.test.ts
@@ -0,0 +1,145 @@
+import { get } from 'lodash';
+import { constructExecutionMetaData } from 'n8n-core';
+import {
+	NodeOperationError,
+	type IDataObject,
+	type IExecuteFunctions,
+	type IGetNodeParameterOptions,
+	type INode,
+} from 'n8n-workflow';
+
+import { type SetNodeOptions } from '../../v2/helpers/interfaces';
+import * as utils from '../../v2/helpers/utils';
+import { execute } from '../../v2/raw.mode';
+
+const node: INode = {
+	id: '11',
+	name: 'Set Node',
+	type: 'n8n-nodes-base.set',
+	typeVersion: 3,
+	position: [42, 42],
+	parameters: {
+		mode: 'manual',
+		fields: {
+			values: [],
+		},
+		include: 'none',
+		options: {},
+	},
+};
+
+const createMockExecuteFunction = (
+	nodeParameters: IDataObject,
+	continueOnFail: boolean = false,
+) => {
+	const fakeExecuteFunction = {
+		getNodeParameter(
+			parameterName: string,
+			_itemIndex: number,
+			fallbackValue?: IDataObject | undefined,
+			options?: IGetNodeParameterOptions | undefined,
+		) {
+			const parameter = options?.extractValue ? `${parameterName}.value` : parameterName;
+			return get(nodeParameters, parameter, fallbackValue);
+		},
+		getNode() {
+			return node;
+		},
+		helpers: { constructExecutionMetaData },
+		continueOnFail: () => continueOnFail,
+	} as unknown as IExecuteFunctions;
+	return fakeExecuteFunction;
+};
+
+describe('test Set2, rawMode/json Mode', () => {
+	const item = {
+		json: {
+			input1: 'value1',
+			input2: 2,
+			input3: [1, 2, 3],
+		},
+		pairedItem: {
+			item: 0,
+			input: undefined,
+		},
+	};
+
+	const options: SetNodeOptions = {
+		include: 'none',
+	};
+
+	afterEach(() => jest.resetAllMocks());
+
+	describe('fixed mode', () => {
+		const jsonData = { jsonData: 1 };
+		const fakeExecuteFunction = createMockExecuteFunction({ jsonOutput: jsonData });
+		const rawData = {
+			num1: 55,
+			str1: '42',
+			arr1: ['foo', 'bar'],
+			obj: {
+				key: 'value',
+			},
+		};
+
+		it('should parse json with the jsonOutput in node parameter and compose a return item', async () => {
+			jest.spyOn(utils, 'parseJsonParameter');
+			jest.spyOn(utils, 'composeReturnItem');
+
+			const result = await execute.call(fakeExecuteFunction, item, 0, options, rawData, node);
+
+			expect(result).toEqual({ json: jsonData, pairedItem: { item: 0 } });
+			expect(utils.parseJsonParameter).toHaveBeenCalledWith(jsonData, node, 0);
+			expect(utils.composeReturnItem).toHaveBeenCalledWith(0, item, jsonData, options, 3);
+		});
+	});
+
+	describe('expression mode', () => {
+		const jsonData = { my_field_1: 'value' };
+		const jsonDataString = '{"my_field_1": "value"}';
+		const fakeExecuteFunction = createMockExecuteFunction({ jsonOutput: jsonDataString });
+		const rawData = {
+			num1: 55,
+			str1: '42',
+			arr1: ['foo', 'bar'],
+			obj: {
+				key: 'value',
+			},
+			jsonOutput: jsonDataString,
+		};
+
+		it('should parse json with resolved expression data and compose a return item', async () => {
+			jest.spyOn(utils, 'parseJsonParameter');
+			jest.spyOn(utils, 'composeReturnItem');
+			jest.spyOn(utils, 'resolveRawData');
+
+			const result = await execute.call(fakeExecuteFunction, item, 0, options, rawData, node);
+
+			expect(utils.parseJsonParameter).toHaveBeenCalledWith(jsonDataString, node, 0);
+			expect(utils.composeReturnItem).toHaveBeenCalledWith(0, item, jsonData, options, 3);
+			expect(utils.resolveRawData).toHaveBeenCalledWith(jsonDataString, 0);
+			expect(result).toEqual({ json: jsonData, pairedItem: { item: 0 } });
+		});
+	});
+
+	describe('error handling', () => {
+		it('should return an error object with pairedItem when continueOnFail is true', async () => {
+			const fakeExecuteFunction = createMockExecuteFunction({ jsonOutput: 'jsonData' }, true);
+
+			const output = await execute.call(fakeExecuteFunction, item, 0, options, {}, node);
+
+			expect(output).toEqual({
+				json: { error: "The 'JSON Output' in item 0 contains invalid JSON" },
+				pairedItem: { item: 0 },
+			});
+		});
+
+		it('should throw an error when continueOnFail is false', async () => {
+			const fakeExecuteFunction = createMockExecuteFunction({ jsonOutput: 'jsonData' }, false);
+
+			await expect(execute.call(fakeExecuteFunction, item, 0, options, {}, node)).rejects.toThrow(
+				NodeOperationError,
+			);
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Set/test/v2/utils.test.ts b/packages/nodes-base/nodes/Set/test/v2/utils.test.ts
index fc84d08129607..a982a6006b4e2 100644
--- a/packages/nodes-base/nodes/Set/test/v2/utils.test.ts
+++ b/packages/nodes-base/nodes/Set/test/v2/utils.test.ts
@@ -1,8 +1,9 @@
-import type { IDataObject, IExecuteFunctions, IGetNodeParameterOptions, INode } from 'n8n-workflow';
-import { constructExecutionMetaData } from 'n8n-core';
 import get from 'lodash/get';
-import { composeReturnItem, parseJsonParameter, validateEntry } from '../../v2/helpers/utils';
+import { constructExecutionMetaData } from 'n8n-core';
+import type { IDataObject, IExecuteFunctions, IGetNodeParameterOptions, INode } from 'n8n-workflow';
+
 import type { SetNodeOptions } from '../../v2/helpers/interfaces';
+import { composeReturnItem, parseJsonParameter, validateEntry } from '../../v2/helpers/utils';
 
 export const node: INode = {
 	id: '11',
diff --git a/packages/nodes-base/nodes/Set/v1/SetV1.node.ts b/packages/nodes-base/nodes/Set/v1/SetV1.node.ts
index 55e92a533726e..649218799fb71 100644
--- a/packages/nodes-base/nodes/Set/v1/SetV1.node.ts
+++ b/packages/nodes-base/nodes/Set/v1/SetV1.node.ts
@@ -1,3 +1,4 @@
+import set from 'lodash/set';
 import type {
 	IExecuteFunctions,
 	INodeExecutionData,
@@ -8,8 +9,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, deepCopy } from 'n8n-workflow';
 
-import set from 'lodash/set';
-
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Set',
 	name: 'set',
diff --git a/packages/nodes-base/nodes/Set/v2/SetV2.node.ts b/packages/nodes-base/nodes/Set/v2/SetV2.node.ts
index b1dd055590859..ac4083b3550d8 100644
--- a/packages/nodes-base/nodes/Set/v2/SetV2.node.ts
+++ b/packages/nodes-base/nodes/Set/v2/SetV2.node.ts
@@ -10,9 +10,8 @@ import { NodeConnectionType } from 'n8n-workflow';
 
 import type { IncludeMods, SetField, SetNodeOptions } from './helpers/interfaces';
 import { INCLUDE } from './helpers/interfaces';
-
-import * as raw from './raw.mode';
 import * as manual from './manual.mode';
+import * as raw from './raw.mode';
 
 type Mode = 'manual' | 'raw';
 
diff --git a/packages/nodes-base/nodes/Set/v2/helpers/utils.ts b/packages/nodes-base/nodes/Set/v2/helpers/utils.ts
index d6754914ced38..6ec6dd647b766 100644
--- a/packages/nodes-base/nodes/Set/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Set/v2/helpers/utils.ts
@@ -1,11 +1,6 @@
-import type {
-	FieldType,
-	IDataObject,
-	IExecuteFunctions,
-	INode,
-	INodeExecutionData,
-	ISupplyDataFunctions,
-} from 'n8n-workflow';
+import get from 'lodash/get';
+import set from 'lodash/set';
+import unset from 'lodash/unset';
 import {
 	ApplicationError,
 	NodeOperationError,
@@ -14,14 +9,18 @@ import {
 	jsonParse,
 	validateFieldType,
 } from 'n8n-workflow';
+import type {
+	FieldType,
+	IDataObject,
+	IExecuteFunctions,
+	INode,
+	INodeExecutionData,
+	ISupplyDataFunctions,
+} from 'n8n-workflow';
 
-import get from 'lodash/get';
-import set from 'lodash/set';
-import unset from 'lodash/unset';
-
-import { getResolvables, sanitizeDataPathKey } from '../../../../utils/utilities';
 import type { SetNodeOptions } from './interfaces';
 import { INCLUDE } from './interfaces';
+import { getResolvables, sanitizeDataPathKey } from '../../../../utils/utilities';
 
 const configureFieldHelper = (dotNotation?: boolean) => {
 	if (dotNotation !== false) {
diff --git a/packages/nodes-base/nodes/Set/v2/manual.mode.ts b/packages/nodes-base/nodes/Set/v2/manual.mode.ts
index 0865e2c4ee0d1..5ee7454e65990 100644
--- a/packages/nodes-base/nodes/Set/v2/manual.mode.ts
+++ b/packages/nodes-base/nodes/Set/v2/manual.mode.ts
@@ -10,14 +10,14 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '../../../utils/utilities';
+import type { SetField, SetNodeOptions } from './helpers/interfaces';
 import {
 	parseJsonParameter,
 	validateEntry,
 	composeReturnItem,
 	resolveRawData,
 } from './helpers/utils';
-import type { SetField, SetNodeOptions } from './helpers/interfaces';
+import { updateDisplayOptions } from '../../../utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Set/v2/raw.mode.ts b/packages/nodes-base/nodes/Set/v2/raw.mode.ts
index b24a5e2dd5f2d..bd00fa4c73e4e 100644
--- a/packages/nodes-base/nodes/Set/v2/raw.mode.ts
+++ b/packages/nodes-base/nodes/Set/v2/raw.mode.ts
@@ -7,9 +7,9 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '../../../utils/utilities';
-import { parseJsonParameter, composeReturnItem, resolveRawData } from './helpers/utils';
 import type { SetNodeOptions } from './helpers/interfaces';
+import { parseJsonParameter, composeReturnItem, resolveRawData } from './helpers/utils';
+import { updateDisplayOptions } from '../../../utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Shopify/GenericFunctions.ts b/packages/nodes-base/nodes/Shopify/GenericFunctions.ts
index ff515edfb119b..1993bbba807fc 100644
--- a/packages/nodes-base/nodes/Shopify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Shopify/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import { snakeCase } from 'change-case';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -8,8 +9,6 @@ import type {
 	IRequestOptions,
 } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
-
 export async function shopifyApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	method: IHttpRequestMethods,
diff --git a/packages/nodes-base/nodes/Shopify/Shopify.node.ts b/packages/nodes-base/nodes/Shopify/Shopify.node.ts
index f2c70184e61d2..830dc051c2241 100644
--- a/packages/nodes-base/nodes/Shopify/Shopify.node.ts
+++ b/packages/nodes-base/nodes/Shopify/Shopify.node.ts
@@ -10,13 +10,9 @@ import type {
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
 import { keysToSnakeCase, shopifyApiRequest, shopifyApiRequestAllItems } from './GenericFunctions';
-
 import { orderFields, orderOperations } from './OrderDescription';
-
-import { productFields, productOperations } from './ProductDescription';
-
 import type { IAddress, IDiscountCode, ILineItem, IOrder } from './OrderInterface';
-
+import { productFields, productOperations } from './ProductDescription';
 import type { IProduct } from './ProductInterface';
 
 export class Shopify implements INodeType {
diff --git a/packages/nodes-base/nodes/Simulate/Simulate.node.ts b/packages/nodes-base/nodes/Simulate/Simulate.node.ts
index a80924551ce1d..3dc2b6015cee5 100644
--- a/packages/nodes-base/nodes/Simulate/Simulate.node.ts
+++ b/packages/nodes-base/nodes/Simulate/Simulate.node.ts
@@ -7,13 +7,13 @@ import type {
 	IDataObject,
 } from 'n8n-workflow';
 
-import { loadOptions } from './methods';
 import {
 	executionDurationProperty,
 	iconSelector,
 	jsonOutputProperty,
 	subtitleProperty,
 } from './descriptions';
+import { loadOptions } from './methods';
 
 export class Simulate implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Simulate/SimulateTrigger.node.ts b/packages/nodes-base/nodes/Simulate/SimulateTrigger.node.ts
index d793434ee1d46..766c86417a3f9 100644
--- a/packages/nodes-base/nodes/Simulate/SimulateTrigger.node.ts
+++ b/packages/nodes-base/nodes/Simulate/SimulateTrigger.node.ts
@@ -7,6 +7,7 @@ import type {
 	INodeTypeDescription,
 	ITriggerResponse,
 } from 'n8n-workflow';
+
 import {
 	executionDurationProperty,
 	iconSelector,
diff --git a/packages/nodes-base/nodes/Slack/Slack.node.json b/packages/nodes-base/nodes/Slack/Slack.node.json
index a81eeef453026..3ac416b245353 100644
--- a/packages/nodes-base/nodes/Slack/Slack.node.json
+++ b/packages/nodes-base/nodes/Slack/Slack.node.json
@@ -3,6 +3,7 @@
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
 	"categories": ["Communication"],
+	"alias": ["human", "form", "wait"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Slack/Slack.node.ts b/packages/nodes-base/nodes/Slack/Slack.node.ts
index 6906b263958d6..fd33d2a9cc0a9 100644
--- a/packages/nodes-base/nodes/Slack/Slack.node.ts
+++ b/packages/nodes-base/nodes/Slack/Slack.node.ts
@@ -2,7 +2,6 @@ import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow'
 import { VersionedNodeType } from 'n8n-workflow';
 
 import { SlackV1 } from './V1/SlackV1.node';
-
 import { SlackV2 } from './V2/SlackV2.node';
 
 export class Slack extends VersionedNodeType {
diff --git a/packages/nodes-base/nodes/Slack/SlackTrigger.node.ts b/packages/nodes-base/nodes/Slack/SlackTrigger.node.ts
index 9dbe79d8d4477..c5efc880fdcd3 100644
--- a/packages/nodes-base/nodes/Slack/SlackTrigger.node.ts
+++ b/packages/nodes-base/nodes/Slack/SlackTrigger.node.ts
@@ -13,8 +13,8 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { slackApiRequestAllItems } from './V2/GenericFunctions';
 import { downloadFile, getChannelInfo, getUserInfo } from './SlackTriggerHelpers';
+import { slackApiRequestAllItems } from './V2/GenericFunctions';
 
 export class SlackTrigger implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Slack/SlackTriggerHelpers.ts b/packages/nodes-base/nodes/Slack/SlackTriggerHelpers.ts
index a7f565c3f39d3..f5281dd29d440 100644
--- a/packages/nodes-base/nodes/Slack/SlackTriggerHelpers.ts
+++ b/packages/nodes-base/nodes/Slack/SlackTriggerHelpers.ts
@@ -1,5 +1,6 @@
 import type { IHttpRequestOptions, IWebhookFunctions } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
 import { slackApiRequest } from './V2/GenericFunctions';
 
 export async function getUserInfo(this: IWebhookFunctions, userId: string): Promise<any> {
diff --git a/packages/nodes-base/nodes/Slack/V1/GenericFunctions.ts b/packages/nodes-base/nodes/Slack/V1/GenericFunctions.ts
index c31607dc0ce74..42f618eddf60f 100644
--- a/packages/nodes-base/nodes/Slack/V1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Slack/V1/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
@@ -9,8 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
 export async function slackApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	method: IHttpRequestMethods,
diff --git a/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts b/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts
index 585bde58e4596..60dfcf79d2c17 100644
--- a/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts
+++ b/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -11,19 +12,18 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
+import { oldVersionNotice } from '@utils/descriptions';
+
 import { channelFields, channelOperations } from './ChannelDescription';
-import { messageFields, messageOperations } from './MessageDescription';
-import { starFields, starOperations } from './StarDescription';
 import { fileFields, fileOperations } from './FileDescription';
+import { slackApiRequest, slackApiRequestAllItems, validateJSON } from './GenericFunctions';
+import { messageFields, messageOperations } from './MessageDescription';
+import type { IAttachment } from './MessageInterface';
 import { reactionFields, reactionOperations } from './ReactionDescription';
-import { userGroupFields, userGroupOperations } from './UserGroupDescription';
+import { starFields, starOperations } from './StarDescription';
 import { userFields, userOperations } from './UserDescription';
+import { userGroupFields, userGroupOperations } from './UserGroupDescription';
 import { userProfileFields, userProfileOperations } from './UserProfileDescription';
-import { slackApiRequest, slackApiRequestAllItems, validateJSON } from './GenericFunctions';
-import type { IAttachment } from './MessageInterface';
-
-import { oldVersionNotice } from '@utils/descriptions';
 
 interface Attachment {
 	fields: {
diff --git a/packages/nodes-base/nodes/Slack/V2/FileDescription.ts b/packages/nodes-base/nodes/Slack/V2/FileDescription.ts
index 44c555b9ab841..3260259ce7c80 100644
--- a/packages/nodes-base/nodes/Slack/V2/FileDescription.ts
+++ b/packages/nodes-base/nodes/Slack/V2/FileDescription.ts
@@ -94,7 +94,7 @@ export const fileFields: INodeProperties[] = [
 			show: {
 				operation: ['upload'],
 				resource: ['file'],
-				'@version': [2.2],
+				'@version': [{ _cnd: { gte: 2.2 } }],
 			},
 		},
 		placeholder: '',
@@ -139,7 +139,7 @@ export const fileFields: INodeProperties[] = [
 				},
 				displayOptions: {
 					show: {
-						'@version': [2.2],
+						'@version': [{ _cnd: { gte: 2.2 } }],
 					},
 				},
 				default: [],
diff --git a/packages/nodes-base/nodes/Slack/V2/MessageDescription.ts b/packages/nodes-base/nodes/Slack/V2/MessageDescription.ts
index de31614b44fda..93d1cfc4e2db7 100644
--- a/packages/nodes-base/nodes/Slack/V2/MessageDescription.ts
+++ b/packages/nodes-base/nodes/Slack/V2/MessageDescription.ts
@@ -33,9 +33,9 @@ export const messageOperations: INodeProperties[] = [
 				action: 'Send a message',
 			},
 			{
-				name: 'Send and Wait for Approval',
+				name: 'Send and Wait for Response',
 				value: SEND_AND_WAIT_OPERATION,
-				action: 'Send a message and wait for approval',
+				action: 'Send message and wait for response',
 			},
 			{
 				name: 'Update',
diff --git a/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts b/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
index 5966e7a7b457a..524a36d7b5820 100644
--- a/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
+++ b/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
@@ -1,5 +1,4 @@
-import type { Readable } from 'stream';
-
+import moment from 'moment-timezone';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -14,7 +13,6 @@ import type {
 	INodeTypeDescription,
 	JsonObject,
 } from 'n8n-workflow';
-
 import {
 	BINARY_ENCODING,
 	NodeConnectionType,
@@ -22,9 +20,17 @@ import {
 	SEND_AND_WAIT_OPERATION,
 	WAIT_INDEFINITELY,
 } from 'n8n-workflow';
+import type { Readable } from 'stream';
 
-import moment from 'moment-timezone';
 import { channelFields, channelOperations } from './ChannelDescription';
+import { fileFields, fileOperations } from './FileDescription';
+import {
+	slackApiRequest,
+	slackApiRequestAllItems,
+	getMessageContent,
+	getTarget,
+	createSendAndWaitMessageBody,
+} from './GenericFunctions';
 import {
 	channelRLC,
 	messageFields,
@@ -32,18 +38,10 @@ import {
 	sendToSelector,
 	userRLC,
 } from './MessageDescription';
-import { starFields, starOperations } from './StarDescription';
-import { fileFields, fileOperations } from './FileDescription';
 import { reactionFields, reactionOperations } from './ReactionDescription';
-import { userGroupFields, userGroupOperations } from './UserGroupDescription';
+import { starFields, starOperations } from './StarDescription';
 import { userFields, userOperations } from './UserDescription';
-import {
-	slackApiRequest,
-	slackApiRequestAllItems,
-	getMessageContent,
-	getTarget,
-	createSendAndWaitMessageBody,
-} from './GenericFunctions';
+import { userGroupFields, userGroupOperations } from './UserGroupDescription';
 import { getSendAndWaitProperties, sendAndWaitWebhook } from '../../../utils/sendAndWait/utils';
 
 export class SlackV2 implements INodeType {
@@ -89,6 +87,15 @@ export class SlackV2 implements INodeType {
 					restartWebhook: true,
 					isFullPath: true,
 				},
+				{
+					name: 'default',
+					httpMethod: 'POST',
+					responseMode: 'onReceived',
+					responseData: '',
+					path: '={{ $nodeId }}',
+					restartWebhook: true,
+					isFullPath: true,
+				},
 			],
 			properties: [
 				{
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/channel/archive.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/channel/archive.test.ts
new file mode 100644
index 0000000000000..f3eefc4bfa114
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/channel/archive.test.ts
@@ -0,0 +1,40 @@
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+const API_RESPONSE = {
+	ok: true,
+};
+
+jest.mock('../../../../V2/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../V2/GenericFunctions');
+	return {
+		...originalModule,
+		slackApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'POST') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test SlackV2, channel => append', () => {
+	const workflows = ['nodes/Slack/test/v2/node/channel/archive.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../V2/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/channel/archive.workflow.json b/packages/nodes-base/nodes/Slack/test/v2/node/channel/archive.workflow.json
new file mode 100644
index 0000000000000..af38bc5814838
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/channel/archive.workflow.json
@@ -0,0 +1,89 @@
+{
+	"name": "slack tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "e679c883-1839-47dc-9511-8f7dc370e6b0",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "channel",
+				"operation": "archive",
+				"channelId": {
+					"__rl": true,
+					"value": "C084ZURRQPL",
+					"mode": "list",
+					"cachedResultName": "test-001"
+				}
+			},
+			"id": "2e1937a6-4c8f-4cd1-ae42-11b2bd12cc4c",
+			"name": "Slack",
+			"type": "n8n-nodes-base.slack",
+			"typeVersion": 2.3,
+			"position": [1040, 360],
+			"webhookId": "04c5e584-45f4-48d0-bcd2-0ecacecb0f53",
+			"credentials": {
+				"slackApi": {
+					"id": "Bg0bWXf8apAimCqJ",
+					"name": "Slack account 2"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "06652908-6b8e-443a-9508-ab229b011b73",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"ok": true
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Slack",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Slack": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "13de7d28-7e93-4602-a4d1-5389e8ccc4dc",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "qJdEfiBgYLdfYOTs",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/channel/create.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/channel/create.test.ts
new file mode 100644
index 0000000000000..81f23e284fbad
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/channel/create.test.ts
@@ -0,0 +1,100 @@
+import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow';
+import nock from 'nock';
+
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+
+import { executeWorkflow } from '../../../../../../test/nodes/ExecuteWorkflow';
+import * as genericFunctions from '../../../../V2/GenericFunctions';
+
+const API_RESPONSE = {
+	ok: true,
+	channel: {
+		id: 'C085WNEHP4Y',
+		name: 'test-003',
+		is_channel: true,
+		is_group: false,
+		is_im: false,
+		is_mpim: false,
+		is_private: false,
+		created: 1734325731,
+		is_archived: false,
+		is_general: false,
+		unlinked: 0,
+		name_normalized: 'test-003',
+		is_shared: false,
+		is_org_shared: false,
+		is_pending_ext_shared: false,
+		pending_shared: [],
+		context_team_id: 'T0364MSFHV2',
+		updated: 1734325731240,
+		parent_conversation: null,
+		creator: 'U0362BXQYJW',
+		is_ext_shared: false,
+		shared_team_ids: ['T0364MSFHV2'],
+		pending_connected_team_ids: [],
+		is_member: true,
+		last_read: '0000000000.000000',
+		topic: {
+			value: '',
+			creator: '',
+			last_set: 0,
+		},
+		purpose: {
+			value: '',
+			creator: '',
+			last_set: 0,
+		},
+		previous_names: [],
+		priority: 0,
+	},
+};
+
+jest.mock('../../../../V2/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../V2/GenericFunctions');
+	return {
+		...originalModule,
+		slackApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'POST') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test SlackV2, channel => create', () => {
+	const workflows = ['nodes/Slack/test/v2/node/channel/create.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../V2/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
+		const { result } = await executeWorkflow(testData, types);
+
+		const resultNodeData = getResultNodeData(result, testData);
+
+		resultNodeData.forEach(({ nodeName, resultData }) => {
+			return expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+		});
+
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledTimes(1);
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/conversations.create',
+			{ is_private: false, name: 'test-003' },
+			{},
+		);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/channel/create.workflow.json b/packages/nodes-base/nodes/Slack/test/v2/node/channel/create.workflow.json
new file mode 100644
index 0000000000000..fcb12a7f89190
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/channel/create.workflow.json
@@ -0,0 +1,119 @@
+{
+	"name": "slack tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "e679c883-1839-47dc-9511-8f7dc370e6b0",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "channel",
+				"channelId": "test-003"
+			},
+			"id": "2e1937a6-4c8f-4cd1-ae42-11b2bd12cc4c",
+			"name": "Slack",
+			"type": "n8n-nodes-base.slack",
+			"typeVersion": 2.3,
+			"position": [1040, 360],
+			"webhookId": "04c5e584-45f4-48d0-bcd2-0ecacecb0f53",
+			"credentials": {
+				"slackApi": {
+					"id": "Bg0bWXf8apAimCqJ",
+					"name": "Slack account 2"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "06652908-6b8e-443a-9508-ab229b011b73",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": "C085WNEHP4Y",
+					"name": "test-003",
+					"is_channel": true,
+					"is_group": false,
+					"is_im": false,
+					"is_mpim": false,
+					"is_private": false,
+					"created": 1734325731,
+					"is_archived": false,
+					"is_general": false,
+					"unlinked": 0,
+					"name_normalized": "test-003",
+					"is_shared": false,
+					"is_org_shared": false,
+					"is_pending_ext_shared": false,
+					"pending_shared": [],
+					"context_team_id": "T0364MSFHV2",
+					"updated": 1734325731240,
+					"parent_conversation": null,
+					"creator": "U0362BXQYJW",
+					"is_ext_shared": false,
+					"shared_team_ids": ["T0364MSFHV2"],
+					"pending_connected_team_ids": [],
+					"is_member": true,
+					"last_read": "0000000000.000000",
+					"topic": {
+						"value": "",
+						"creator": "",
+						"last_set": 0
+					},
+					"purpose": {
+						"value": "",
+						"creator": "",
+						"last_set": 0
+					},
+					"previous_names": [],
+					"priority": 0
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Slack",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Slack": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "297d0c4b-32e6-4b08-8818-af5e64762521",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "qJdEfiBgYLdfYOTs",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/channel/get.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/channel/get.test.ts
new file mode 100644
index 0000000000000..9e53394c3368e
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/channel/get.test.ts
@@ -0,0 +1,99 @@
+import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow';
+import nock from 'nock';
+
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+
+import { executeWorkflow } from '../../../../../../test/nodes/ExecuteWorkflow';
+import * as genericFunctions from '../../../../V2/GenericFunctions';
+
+const API_RESPONSE = {
+	ok: true,
+	channel: {
+		id: 'C085WNEHP4Y',
+		name: 'test-003',
+		is_channel: true,
+		is_group: false,
+		is_im: false,
+		is_mpim: false,
+		is_private: false,
+		created: 1734325731,
+		is_archived: false,
+		is_general: false,
+		unlinked: 0,
+		name_normalized: 'test-003',
+		is_shared: false,
+		is_org_shared: false,
+		is_pending_ext_shared: false,
+		pending_shared: [],
+		context_team_id: 'T0364MSFHV2',
+		updated: 1734325731240,
+		parent_conversation: null,
+		creator: 'U0362BXQYJW',
+		is_ext_shared: false,
+		shared_team_ids: ['T0364MSFHV2'],
+		pending_connected_team_ids: [],
+		is_member: true,
+		last_read: '0000000000.000000',
+		topic: {
+			value: '',
+			creator: '',
+			last_set: 0,
+		},
+		purpose: {
+			value: '',
+			creator: '',
+			last_set: 0,
+		},
+		previous_names: [],
+	},
+};
+
+jest.mock('../../../../V2/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../V2/GenericFunctions');
+	return {
+		...originalModule,
+		slackApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'POST') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test SlackV2, channel => get', () => {
+	const workflows = ['nodes/Slack/test/v2/node/channel/get.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../V2/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
+		const { result } = await executeWorkflow(testData, types);
+
+		const resultNodeData = getResultNodeData(result, testData);
+
+		resultNodeData.forEach(({ nodeName, resultData }) => {
+			return expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+		});
+
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledTimes(1);
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/conversations.info',
+			{},
+			{ channel: 'C085WNEHP4Y' },
+		);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/channel/get.workflow.json b/packages/nodes-base/nodes/Slack/test/v2/node/channel/get.workflow.json
new file mode 100644
index 0000000000000..d0a64a9e0fef0
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/channel/get.workflow.json
@@ -0,0 +1,127 @@
+{
+	"name": "slack tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "e679c883-1839-47dc-9511-8f7dc370e6b0",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "channel",
+				"operation": "get",
+				"channelId": {
+					"__rl": true,
+					"value": "C085WNEHP4Y",
+					"mode": "list",
+					"cachedResultName": "test-003"
+				},
+				"options": {
+					"includeNumMembers": true
+				}
+			},
+			"id": "2e1937a6-4c8f-4cd1-ae42-11b2bd12cc4c",
+			"name": "Slack",
+			"type": "n8n-nodes-base.slack",
+			"typeVersion": 2.3,
+			"position": [1040, 360],
+			"webhookId": "04c5e584-45f4-48d0-bcd2-0ecacecb0f53",
+			"credentials": {
+				"slackApi": {
+					"id": "Bg0bWXf8apAimCqJ",
+					"name": "Slack account 2"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "06652908-6b8e-443a-9508-ab229b011b73",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": "C085WNEHP4Y",
+					"name": "test-003",
+					"is_channel": true,
+					"is_group": false,
+					"is_im": false,
+					"is_mpim": false,
+					"is_private": false,
+					"created": 1734325731,
+					"is_archived": false,
+					"is_general": false,
+					"unlinked": 0,
+					"name_normalized": "test-003",
+					"is_shared": false,
+					"is_org_shared": false,
+					"is_pending_ext_shared": false,
+					"pending_shared": [],
+					"context_team_id": "T0364MSFHV2",
+					"updated": 1734325731240,
+					"parent_conversation": null,
+					"creator": "U0362BXQYJW",
+					"is_ext_shared": false,
+					"shared_team_ids": ["T0364MSFHV2"],
+					"pending_connected_team_ids": [],
+					"is_member": true,
+					"last_read": "0000000000.000000",
+					"topic": {
+						"value": "",
+						"creator": "",
+						"last_set": 0
+					},
+					"purpose": {
+						"value": "",
+						"creator": "",
+						"last_set": 0
+					},
+					"previous_names": []
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Slack",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Slack": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "753332eb-25d1-443a-acef-92993e89751a",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "qJdEfiBgYLdfYOTs",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/channel/getAll.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/channel/getAll.test.ts
new file mode 100644
index 0000000000000..4b816693baaf6
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/channel/getAll.test.ts
@@ -0,0 +1,162 @@
+import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow';
+import nock from 'nock';
+
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+
+import { executeWorkflow } from '../../../../../../test/nodes/ExecuteWorkflow';
+import * as genericFunctions from '../../../../V2/GenericFunctions';
+
+const API_RESPONSE = {
+	ok: true,
+	channels: [
+		{
+			id: 'C0362BX17TM',
+			name: 'general',
+			is_channel: true,
+			is_group: false,
+			is_im: false,
+			is_mpim: false,
+			is_private: false,
+			created: 1646724991,
+			is_archived: false,
+			is_general: true,
+			unlinked: 0,
+			name_normalized: 'general',
+			is_shared: false,
+			is_org_shared: false,
+			is_pending_ext_shared: false,
+			pending_shared: [],
+			context_team_id: 'T0364MSFHV2',
+			updated: 1734075560630,
+			parent_conversation: null,
+			creator: 'U0362BXQYJW',
+			is_ext_shared: false,
+			shared_team_ids: ['T0364MSFHV2'],
+			pending_connected_team_ids: [],
+			is_member: true,
+			topic: {
+				value: '',
+				creator: '',
+				last_set: 0,
+			},
+			purpose: {
+				value:
+					'This is the one channel that will always include everyone. It’s a great spot for announcements and team-wide conversations.',
+				creator: 'U0362BXQYJW',
+				last_set: 1646724991,
+			},
+			properties: {
+				use_case: 'welcome',
+			},
+			previous_names: [],
+			num_members: 1,
+		},
+		{
+			id: 'C0362BXRZQA',
+			name: 'random',
+			is_channel: true,
+			is_group: false,
+			is_im: false,
+			is_mpim: false,
+			is_private: false,
+			created: 1646724991,
+			is_archived: false,
+			is_general: false,
+			unlinked: 0,
+			name_normalized: 'random',
+			is_shared: false,
+			is_org_shared: false,
+			is_pending_ext_shared: false,
+			pending_shared: [],
+			context_team_id: 'T0364MSFHV2',
+			updated: 1725415586388,
+			parent_conversation: null,
+			creator: 'U0362BXQYJW',
+			is_ext_shared: false,
+			shared_team_ids: ['T0364MSFHV2'],
+			pending_connected_team_ids: [],
+			is_member: true,
+			topic: {
+				value: '',
+				creator: '',
+				last_set: 0,
+			},
+			purpose: {
+				value:
+					'This channel is for... well, everything else. It’s a place for team jokes, spur-of-the-moment ideas, and funny GIFs. Go wild!',
+				creator: 'U0362BXQYJW',
+				last_set: 1646724991,
+			},
+			properties: {
+				tabs: [
+					{
+						id: 'files',
+						label: '',
+						type: 'files',
+					},
+				],
+				tabz: [
+					{
+						type: 'files',
+					},
+				],
+				use_case: 'random',
+			},
+			previous_names: [],
+			num_members: 2,
+		},
+	],
+	response_metadata: {
+		next_cursor: 'dGVhbTpDMDM2MkMyM1RSOA==',
+	},
+};
+
+jest.mock('../../../../V2/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../V2/GenericFunctions');
+	return {
+		...originalModule,
+		slackApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'GET') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test SlackV2, channel => getAll', () => {
+	const workflows = ['nodes/Slack/test/v2/node/channel/getAll.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../V2/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
+		const { result } = await executeWorkflow(testData, types);
+
+		const resultNodeData = getResultNodeData(result, testData);
+
+		resultNodeData.forEach(({ nodeName, resultData }) => {
+			return expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+		});
+
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledTimes(1);
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledWith(
+			'GET',
+			'/conversations.list',
+			{},
+			{ exclude_archived: true, limit: 2, types: 'public_channel,private_channel,im,mpim' },
+		);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/channel/getAll.workflow.json b/packages/nodes-base/nodes/Slack/test/v2/node/channel/getAll.workflow.json
new file mode 100644
index 0000000000000..e90a9a9a858cc
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/channel/getAll.workflow.json
@@ -0,0 +1,181 @@
+{
+	"name": "slack new tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "e679c883-1839-47dc-9511-8f7dc370e6b0",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "channel",
+				"operation": "getAll",
+				"limit": 2,
+				"filters": {
+					"excludeArchived": true,
+					"types": ["public_channel", "private_channel", "im", "mpim"]
+				}
+			},
+			"id": "2e1937a6-4c8f-4cd1-ae42-11b2bd12cc4c",
+			"name": "Slack",
+			"type": "n8n-nodes-base.slack",
+			"typeVersion": 2.3,
+			"position": [1040, 360],
+			"webhookId": "04c5e584-45f4-48d0-bcd2-0ecacecb0f53",
+			"credentials": {
+				"slackApi": {
+					"id": "Bg0bWXf8apAimCqJ",
+					"name": "Slack account 2"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "06652908-6b8e-443a-9508-ab229b011b73",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": "C0362BX17TM",
+					"name": "general",
+					"is_channel": true,
+					"is_group": false,
+					"is_im": false,
+					"is_mpim": false,
+					"is_private": false,
+					"created": 1646724991,
+					"is_archived": false,
+					"is_general": true,
+					"unlinked": 0,
+					"name_normalized": "general",
+					"is_shared": false,
+					"is_org_shared": false,
+					"is_pending_ext_shared": false,
+					"pending_shared": [],
+					"context_team_id": "T0364MSFHV2",
+					"updated": 1734075560630,
+					"parent_conversation": null,
+					"creator": "U0362BXQYJW",
+					"is_ext_shared": false,
+					"shared_team_ids": ["T0364MSFHV2"],
+					"pending_connected_team_ids": [],
+					"is_member": true,
+					"topic": {
+						"value": "",
+						"creator": "",
+						"last_set": 0
+					},
+					"purpose": {
+						"value": "This is the one channel that will always include everyone. It’s a great spot for announcements and team-wide conversations.",
+						"creator": "U0362BXQYJW",
+						"last_set": 1646724991
+					},
+					"properties": {
+						"use_case": "welcome"
+					},
+					"previous_names": [],
+					"num_members": 1
+				}
+			},
+			{
+				"json": {
+					"id": "C0362BXRZQA",
+					"name": "random",
+					"is_channel": true,
+					"is_group": false,
+					"is_im": false,
+					"is_mpim": false,
+					"is_private": false,
+					"created": 1646724991,
+					"is_archived": false,
+					"is_general": false,
+					"unlinked": 0,
+					"name_normalized": "random",
+					"is_shared": false,
+					"is_org_shared": false,
+					"is_pending_ext_shared": false,
+					"pending_shared": [],
+					"context_team_id": "T0364MSFHV2",
+					"updated": 1725415586388,
+					"parent_conversation": null,
+					"creator": "U0362BXQYJW",
+					"is_ext_shared": false,
+					"shared_team_ids": ["T0364MSFHV2"],
+					"pending_connected_team_ids": [],
+					"is_member": true,
+					"topic": {
+						"value": "",
+						"creator": "",
+						"last_set": 0
+					},
+					"purpose": {
+						"value": "This channel is for... well, everything else. It’s a place for team jokes, spur-of-the-moment ideas, and funny GIFs. Go wild!",
+						"creator": "U0362BXQYJW",
+						"last_set": 1646724991
+					},
+					"properties": {
+						"tabs": [
+							{
+								"id": "files",
+								"label": "",
+								"type": "files"
+							}
+						],
+						"tabz": [
+							{
+								"type": "files"
+							}
+						],
+						"use_case": "random"
+					},
+					"previous_names": [],
+					"num_members": 2
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Slack",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Slack": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "f74e9c2c-83f4-4ef8-b436-704e1a27a9ef",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "qJdEfiBgYLdfYOTs",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/channel/history.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/channel/history.test.ts
new file mode 100644
index 0000000000000..99878cb69162f
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/channel/history.test.ts
@@ -0,0 +1,219 @@
+import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow';
+import nock from 'nock';
+
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+
+import { executeWorkflow } from '../../../../../../test/nodes/ExecuteWorkflow';
+import * as genericFunctions from '../../../../V2/GenericFunctions';
+
+const API_RESPONSE = [
+	{
+		user: 'U0362BXQYJW',
+		type: 'message',
+		ts: '1734322597.935429',
+		bot_id: 'B0382SHFM46',
+		app_id: 'A037UTP0Z39',
+		text: 'test message\n_Automated with this <http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd|n8n workflow>_',
+		team: 'T0364MSFHV2',
+		bot_profile: {
+			id: 'B0382SHFM46',
+			deleted: false,
+			name: 'blocks-test',
+			updated: 1648028754,
+			app_id: 'A037UTP0Z39',
+			icons: {
+				image_36: 'https://a.slack-edge.com/80588/img/plugins/app/bot_36.png',
+				image_48: 'https://a.slack-edge.com/80588/img/plugins/app/bot_48.png',
+				image_72: 'https://a.slack-edge.com/80588/img/plugins/app/service_72.png',
+			},
+			team_id: 'T0364MSFHV2',
+		},
+		blocks: [
+			{
+				type: 'rich_text',
+				block_id: 'piR',
+				elements: [
+					{
+						type: 'rich_text_section',
+						elements: [
+							{
+								type: 'text',
+								text: 'test message\n',
+							},
+							{
+								type: 'text',
+								text: 'Automated with this ',
+								style: {
+									italic: true,
+								},
+							},
+							{
+								type: 'link',
+								url: 'http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd',
+								text: 'n8n workflow',
+								style: {
+									italic: true,
+								},
+							},
+						],
+					},
+				],
+			},
+		],
+	},
+	{
+		user: 'U0362BXQYJW',
+		type: 'message',
+		ts: '1734322341.161179',
+		bot_id: 'B0382SHFM46',
+		app_id: 'A037UTP0Z39',
+		text: 'test message\n_Automated with this <http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd|n8n workflow>_',
+		team: 'T0364MSFHV2',
+		bot_profile: {
+			id: 'B0382SHFM46',
+			app_id: 'A037UTP0Z39',
+			name: 'blocks-test',
+			icons: {
+				image_36: 'https://a.slack-edge.com/80588/img/plugins/app/bot_36.png',
+				image_48: 'https://a.slack-edge.com/80588/img/plugins/app/bot_48.png',
+				image_72: 'https://a.slack-edge.com/80588/img/plugins/app/service_72.png',
+			},
+			deleted: false,
+			updated: 1648028754,
+			team_id: 'T0364MSFHV2',
+		},
+		blocks: [
+			{
+				type: 'rich_text',
+				block_id: '2BN',
+				elements: [
+					{
+						type: 'rich_text_section',
+						elements: [
+							{
+								type: 'text',
+								text: 'test message\n',
+							},
+							{
+								type: 'text',
+								text: 'Automated with this ',
+								style: {
+									italic: true,
+								},
+							},
+							{
+								type: 'link',
+								url: 'http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd',
+								text: 'n8n workflow',
+								style: {
+									italic: true,
+								},
+							},
+						],
+					},
+				],
+			},
+		],
+	},
+	{
+		user: 'U0362BXQYJW',
+		type: 'message',
+		ts: '1734321960.507649',
+		edited: {
+			user: 'B0382SHFM46',
+			ts: '1734324905.000000',
+		},
+		bot_id: 'B0382SHFM46',
+		app_id: 'A037UTP0Z39',
+		text: 'updated message',
+		team: 'T0364MSFHV2',
+		bot_profile: {
+			id: 'B0382SHFM46',
+			app_id: 'A037UTP0Z39',
+			name: 'blocks-test',
+			icons: {
+				image_36: 'https://a.slack-edge.com/80588/img/plugins/app/bot_36.png',
+				image_48: 'https://a.slack-edge.com/80588/img/plugins/app/bot_48.png',
+				image_72: 'https://a.slack-edge.com/80588/img/plugins/app/service_72.png',
+			},
+			deleted: false,
+			updated: 1648028754,
+			team_id: 'T0364MSFHV2',
+		},
+		blocks: [
+			{
+				type: 'rich_text',
+				block_id: 'wR+',
+				elements: [
+					{
+						type: 'rich_text_section',
+						elements: [
+							{
+								type: 'text',
+								text: 'updated message',
+							},
+						],
+					},
+				],
+			},
+		],
+	},
+	{
+		subtype: 'channel_join',
+		user: 'U0362BXQYJW',
+		text: '<@U0362BXQYJW> has joined the channel',
+		type: 'message',
+		ts: '1734321942.689159',
+	},
+];
+
+jest.mock('../../../../V2/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../V2/GenericFunctions');
+	return {
+		...originalModule,
+		slackApiRequestAllItems: jest.fn(async function (_: string, method: IHttpRequestMethods) {
+			if (method === 'GET') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test SlackV2, channel => history', () => {
+	const workflows = ['nodes/Slack/test/v2/node/channel/history.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../V2/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
+		const { result } = await executeWorkflow(testData, types);
+
+		const resultNodeData = getResultNodeData(result, testData);
+
+		resultNodeData.forEach(({ nodeName, resultData }) => {
+			return expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+		});
+
+		expect(genericFunctions.slackApiRequestAllItems).toHaveBeenCalledTimes(1);
+		expect(genericFunctions.slackApiRequestAllItems).toHaveBeenCalledWith(
+			'messages',
+			'GET',
+			'/conversations.history',
+			{},
+			{ channel: 'C08514ZPKB8', inclusive: true },
+		);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/channel/history.workflow.json b/packages/nodes-base/nodes/Slack/test/v2/node/channel/history.workflow.json
new file mode 100644
index 0000000000000..2647ee99fed66
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/channel/history.workflow.json
@@ -0,0 +1,254 @@
+{
+	"name": "slack new tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "e679c883-1839-47dc-9511-8f7dc370e6b0",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "channel",
+				"operation": "history",
+				"channelId": {
+					"__rl": true,
+					"value": "C08514ZPKB8",
+					"mode": "list",
+					"cachedResultName": "test-002"
+				},
+				"returnAll": true,
+				"filters": {
+					"inclusive": true
+				}
+			},
+			"id": "2e1937a6-4c8f-4cd1-ae42-11b2bd12cc4c",
+			"name": "Slack",
+			"type": "n8n-nodes-base.slack",
+			"typeVersion": 2.3,
+			"position": [1040, 360],
+			"webhookId": "04c5e584-45f4-48d0-bcd2-0ecacecb0f53",
+			"credentials": {
+				"slackApi": {
+					"id": "Bg0bWXf8apAimCqJ",
+					"name": "Slack account 2"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "06652908-6b8e-443a-9508-ab229b011b73",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"user": "U0362BXQYJW",
+					"type": "message",
+					"ts": "1734322597.935429",
+					"bot_id": "B0382SHFM46",
+					"app_id": "A037UTP0Z39",
+					"text": "test message\n_Automated with this <http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd|n8n workflow>_",
+					"team": "T0364MSFHV2",
+					"bot_profile": {
+						"id": "B0382SHFM46",
+						"deleted": false,
+						"name": "blocks-test",
+						"updated": 1648028754,
+						"app_id": "A037UTP0Z39",
+						"icons": {
+							"image_36": "https://a.slack-edge.com/80588/img/plugins/app/bot_36.png",
+							"image_48": "https://a.slack-edge.com/80588/img/plugins/app/bot_48.png",
+							"image_72": "https://a.slack-edge.com/80588/img/plugins/app/service_72.png"
+						},
+						"team_id": "T0364MSFHV2"
+					},
+					"blocks": [
+						{
+							"type": "rich_text",
+							"block_id": "piR",
+							"elements": [
+								{
+									"type": "rich_text_section",
+									"elements": [
+										{
+											"type": "text",
+											"text": "test message\n"
+										},
+										{
+											"type": "text",
+											"text": "Automated with this ",
+											"style": {
+												"italic": true
+											}
+										},
+										{
+											"type": "link",
+											"url": "http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd",
+											"text": "n8n workflow",
+											"style": {
+												"italic": true
+											}
+										}
+									]
+								}
+							]
+						}
+					]
+				}
+			},
+			{
+				"json": {
+					"user": "U0362BXQYJW",
+					"type": "message",
+					"ts": "1734322341.161179",
+					"bot_id": "B0382SHFM46",
+					"app_id": "A037UTP0Z39",
+					"text": "test message\n_Automated with this <http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd|n8n workflow>_",
+					"team": "T0364MSFHV2",
+					"bot_profile": {
+						"id": "B0382SHFM46",
+						"app_id": "A037UTP0Z39",
+						"name": "blocks-test",
+						"icons": {
+							"image_36": "https://a.slack-edge.com/80588/img/plugins/app/bot_36.png",
+							"image_48": "https://a.slack-edge.com/80588/img/plugins/app/bot_48.png",
+							"image_72": "https://a.slack-edge.com/80588/img/plugins/app/service_72.png"
+						},
+						"deleted": false,
+						"updated": 1648028754,
+						"team_id": "T0364MSFHV2"
+					},
+					"blocks": [
+						{
+							"type": "rich_text",
+							"block_id": "2BN",
+							"elements": [
+								{
+									"type": "rich_text_section",
+									"elements": [
+										{
+											"type": "text",
+											"text": "test message\n"
+										},
+										{
+											"type": "text",
+											"text": "Automated with this ",
+											"style": {
+												"italic": true
+											}
+										},
+										{
+											"type": "link",
+											"url": "http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd",
+											"text": "n8n workflow",
+											"style": {
+												"italic": true
+											}
+										}
+									]
+								}
+							]
+						}
+					]
+				}
+			},
+			{
+				"json": {
+					"user": "U0362BXQYJW",
+					"type": "message",
+					"ts": "1734321960.507649",
+					"edited": {
+						"user": "B0382SHFM46",
+						"ts": "1734324905.000000"
+					},
+					"bot_id": "B0382SHFM46",
+					"app_id": "A037UTP0Z39",
+					"text": "updated message",
+					"team": "T0364MSFHV2",
+					"bot_profile": {
+						"id": "B0382SHFM46",
+						"app_id": "A037UTP0Z39",
+						"name": "blocks-test",
+						"icons": {
+							"image_36": "https://a.slack-edge.com/80588/img/plugins/app/bot_36.png",
+							"image_48": "https://a.slack-edge.com/80588/img/plugins/app/bot_48.png",
+							"image_72": "https://a.slack-edge.com/80588/img/plugins/app/service_72.png"
+						},
+						"deleted": false,
+						"updated": 1648028754,
+						"team_id": "T0364MSFHV2"
+					},
+					"blocks": [
+						{
+							"type": "rich_text",
+							"block_id": "wR+",
+							"elements": [
+								{
+									"type": "rich_text_section",
+									"elements": [
+										{
+											"type": "text",
+											"text": "updated message"
+										}
+									]
+								}
+							]
+						}
+					]
+				}
+			},
+			{
+				"json": {
+					"subtype": "channel_join",
+					"user": "U0362BXQYJW",
+					"text": "<@U0362BXQYJW> has joined the channel",
+					"type": "message",
+					"ts": "1734321942.689159"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Slack",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Slack": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "6b7102c7-d3c5-4b88-b67d-4ee6ae51b581",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "qJdEfiBgYLdfYOTs",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/file/upload.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/file/upload.test.ts
new file mode 100644
index 0000000000000..154b137bfc121
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/file/upload.test.ts
@@ -0,0 +1,83 @@
+import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow';
+import nock from 'nock';
+
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+
+import { executeWorkflow } from '../../../../../../test/nodes/ExecuteWorkflow';
+import * as genericFunctions from '../../../../V2/GenericFunctions';
+
+const API_RESPONSE = { files: { test: 'OK' } };
+
+jest.mock('../../../../V2/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../V2/GenericFunctions');
+	return {
+		...originalModule,
+		slackApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'POST') {
+				return API_RESPONSE;
+			}
+			if (method === 'GET') {
+				return { upload_url: 'https://slack.com/api/files.upload' };
+			}
+		}),
+	};
+});
+
+describe('Test SlackV2, file => upload', () => {
+	const workflows = ['nodes/Slack/test/v2/node/file/upload.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../V2/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
+		const { result } = await executeWorkflow(testData, types);
+
+		const resultNodeData = getResultNodeData(result, testData);
+
+		resultNodeData.forEach(({ nodeName, resultData }) => {
+			return expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+		});
+
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledTimes(3);
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledWith(
+			'GET',
+			'/files.getUploadURLExternal',
+			{},
+			{ filename: 'test _name.txt', length: 25 },
+		);
+
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'https://slack.com/api/files.upload',
+			{},
+			{},
+			{ 'Content-Type': 'multipart/form-data' },
+			expect.objectContaining({
+				formData: expect.any(Object),
+			}),
+		);
+
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/files.completeUploadExternal',
+			{
+				files: [{ id: undefined, title: 'Test Title' }],
+				initial_comment: 'test inline',
+				thread_ts: '1734322671.726339',
+			},
+		);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/file/upload.workflow.json b/packages/nodes-base/nodes/Slack/test/v2/node/file/upload.workflow.json
new file mode 100644
index 0000000000000..b22096a310b5c
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/file/upload.workflow.json
@@ -0,0 +1,147 @@
+{
+	"name": "slack new tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "e679c883-1839-47dc-9511-8f7dc370e6b0",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [440, 360]
+		},
+		{
+			"parameters": {
+				"resource": "file",
+				"options": {
+					"fileName": "test _name.txt",
+					"initialComment": "test inline",
+					"threadTs": "1734322671.726339",
+					"title": "Test Title"
+				}
+			},
+			"id": "2e1937a6-4c8f-4cd1-ae42-11b2bd12cc4c",
+			"name": "Slack",
+			"type": "n8n-nodes-base.slack",
+			"typeVersion": 2.3,
+			"position": [1100, 360],
+			"webhookId": "04c5e584-45f4-48d0-bcd2-0ecacecb0f53",
+			"credentials": {
+				"slackApi": {
+					"id": "Bg0bWXf8apAimCqJ",
+					"name": "Slack account 2"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "06652908-6b8e-443a-9508-ab229b011b73",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1320, 360]
+		},
+		{
+			"parameters": {
+				"operation": "toJson",
+				"options": {}
+			},
+			"id": "76e317ed-7f2b-46b9-8c9b-f91a0b5d0fdd",
+			"name": "Convert to File",
+			"type": "n8n-nodes-base.convertToFile",
+			"typeVersion": 1.1,
+			"position": [860, 360]
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "a60db675-c351-49fc-bbad-555a70ee5d6d",
+							"name": "f1",
+							"value": "123",
+							"type": "string"
+						},
+						{
+							"id": "b96e7f11-a0ea-4a7f-b803-5ab3238af054",
+							"name": "f2",
+							"value": "456",
+							"type": "string"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "773453a7-2bdc-4d50-a3e6-be5e1b86d820",
+			"name": "Edit Fields",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.4,
+			"position": [660, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"test": "OK"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Edit Fields",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Slack": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Convert to File": {
+			"main": [
+				[
+					{
+						"node": "Slack",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Edit Fields": {
+			"main": [
+				[
+					{
+						"node": "Convert to File",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "3a19732a-4416-487c-9f76-1291c610b5d1",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "qJdEfiBgYLdfYOTs",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/message/delete.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/message/delete.test.ts
new file mode 100644
index 0000000000000..c18f17ba54acc
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/message/delete.test.ts
@@ -0,0 +1,63 @@
+import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow';
+import nock from 'nock';
+
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+
+import { executeWorkflow } from '../../../../../../test/nodes/ExecuteWorkflow';
+import * as genericFunctions from '../../../../V2/GenericFunctions';
+
+const API_RESPONSE = {
+	ok: true,
+	channel: 'C08514ZPKB8',
+	message_timestamp: '1734322671.726339',
+};
+
+jest.mock('../../../../V2/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../V2/GenericFunctions');
+	return {
+		...originalModule,
+		slackApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'POST') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test SlackV2, message => delete', () => {
+	const workflows = ['nodes/Slack/test/v2/node/message/delete.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../V2/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
+		const { result } = await executeWorkflow(testData, types);
+
+		const resultNodeData = getResultNodeData(result, testData);
+
+		resultNodeData.forEach(({ nodeName, resultData }) => {
+			return expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+		});
+
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledTimes(1);
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/chat.delete',
+			{ channel: 'C08514ZPKB8', ts: '1734322671.726339' },
+			{},
+		);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/message/delete.workflow.json b/packages/nodes-base/nodes/Slack/test/v2/node/message/delete.workflow.json
new file mode 100644
index 0000000000000..19687b7ebc3af
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/message/delete.workflow.json
@@ -0,0 +1,92 @@
+{
+	"name": "slack tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "e679c883-1839-47dc-9511-8f7dc370e6b0",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"operation": "delete",
+				"select": "channel",
+				"channelId": {
+					"__rl": true,
+					"value": "C08514ZPKB8",
+					"mode": "list",
+					"cachedResultName": "test-002"
+				},
+				"timestamp": 1734322671.726339
+			},
+			"id": "2e1937a6-4c8f-4cd1-ae42-11b2bd12cc4c",
+			"name": "Slack",
+			"type": "n8n-nodes-base.slack",
+			"typeVersion": 2.3,
+			"position": [1040, 360],
+			"webhookId": "04c5e584-45f4-48d0-bcd2-0ecacecb0f53",
+			"credentials": {
+				"slackApi": {
+					"id": "Bg0bWXf8apAimCqJ",
+					"name": "Slack account 2"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "06652908-6b8e-443a-9508-ab229b011b73",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"ok": true,
+					"channel": "C08514ZPKB8",
+					"message_timestamp": "1734322671.726339"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Slack",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Slack": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "cf10cd01-6650-48ca-b4a2-ec07be9d026c",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "qJdEfiBgYLdfYOTs",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/message/getPermalink.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/message/getPermalink.test.ts
new file mode 100644
index 0000000000000..78735d0fc626b
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/message/getPermalink.test.ts
@@ -0,0 +1,63 @@
+import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow';
+import nock from 'nock';
+
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+
+import { executeWorkflow } from '../../../../../../test/nodes/ExecuteWorkflow';
+import * as genericFunctions from '../../../../V2/GenericFunctions';
+
+const API_RESPONSE = {
+	ok: true,
+	permalink: 'https://myspace-qhg7381.slack.com/archives/C08514ZPKB8/p1734322671726339',
+	channel: 'C08514ZPKB8',
+};
+
+jest.mock('../../../../V2/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../V2/GenericFunctions');
+	return {
+		...originalModule,
+		slackApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'GET') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test SlackV2, message => getPermalink', () => {
+	const workflows = ['nodes/Slack/test/v2/node/message/getPermalink.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../V2/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
+		const { result } = await executeWorkflow(testData, types);
+
+		const resultNodeData = getResultNodeData(result, testData);
+
+		resultNodeData.forEach(({ nodeName, resultData }) => {
+			return expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+		});
+
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledTimes(1);
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledWith(
+			'GET',
+			'/chat.getPermalink',
+			{},
+			{ channel: 'C08514ZPKB8', message_ts: '1734322671.726339' },
+		);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/message/getPermalink.workflow.json b/packages/nodes-base/nodes/Slack/test/v2/node/message/getPermalink.workflow.json
new file mode 100644
index 0000000000000..812e8be6cd723
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/message/getPermalink.workflow.json
@@ -0,0 +1,91 @@
+{
+	"name": "slack tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "e679c883-1839-47dc-9511-8f7dc370e6b0",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"operation": "getPermalink",
+				"channelId": {
+					"__rl": true,
+					"value": "C08514ZPKB8",
+					"mode": "list",
+					"cachedResultName": "test-002"
+				},
+				"timestamp": 1734322671.726339
+			},
+			"id": "2e1937a6-4c8f-4cd1-ae42-11b2bd12cc4c",
+			"name": "Slack",
+			"type": "n8n-nodes-base.slack",
+			"typeVersion": 2.3,
+			"position": [1040, 360],
+			"webhookId": "04c5e584-45f4-48d0-bcd2-0ecacecb0f53",
+			"credentials": {
+				"slackApi": {
+					"id": "Bg0bWXf8apAimCqJ",
+					"name": "Slack account 2"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "06652908-6b8e-443a-9508-ab229b011b73",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"ok": true,
+					"permalink": "https://myspace-qhg7381.slack.com/archives/C08514ZPKB8/p1734322671726339",
+					"channel": "C08514ZPKB8"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Slack",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Slack": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "64c251c3-afe5-4636-a3fc-de769f8a9ea0",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "qJdEfiBgYLdfYOTs",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/message/post.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/message/post.test.ts
new file mode 100644
index 0000000000000..2cfff4b6d0a94
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/message/post.test.ts
@@ -0,0 +1,111 @@
+import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow';
+import nock from 'nock';
+
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+
+import { executeWorkflow } from '../../../../../../test/nodes/ExecuteWorkflow';
+import * as genericFunctions from '../../../../V2/GenericFunctions';
+
+const API_RESPONSE = {
+	ok: true,
+	channel: 'C08514ZPKB8',
+	message: {
+		user: 'U0362BXQYJW',
+		type: 'message',
+		ts: '1734322671.726339',
+		bot_id: 'B0382SHFM46',
+		app_id: 'A037UTP0Z39',
+		text: 'test message',
+		team: 'T0364MSFHV2',
+		bot_profile: {
+			id: 'B0382SHFM46',
+			app_id: 'A037UTP0Z39',
+			name: 'blocks-test',
+			icons: {
+				image_36: 'https://a.slack-edge.com/80588/img/plugins/app/bot_36.png',
+				image_48: 'https://a.slack-edge.com/80588/img/plugins/app/bot_48.png',
+				image_72: 'https://a.slack-edge.com/80588/img/plugins/app/service_72.png',
+			},
+			deleted: false,
+			updated: 1648028754,
+			team_id: 'T0364MSFHV2',
+		},
+		blocks: [
+			{
+				type: 'rich_text',
+				block_id: 't02Ox',
+				elements: [
+					{
+						type: 'rich_text_section',
+						elements: [
+							{
+								type: 'text',
+								text: 'test message',
+							},
+						],
+					},
+				],
+			},
+		],
+	},
+	message_timestamp: '1734322671.726339',
+};
+
+jest.mock('../../../../V2/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../V2/GenericFunctions');
+	return {
+		...originalModule,
+		slackApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'POST') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test SlackV2, message => post', () => {
+	const workflows = ['nodes/Slack/test/v2/node/message/post.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../V2/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
+		const { result } = await executeWorkflow(testData, types);
+
+		const resultNodeData = getResultNodeData(result, testData);
+
+		resultNodeData.forEach(({ nodeName, resultData }) => {
+			return expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+		});
+
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledTimes(1);
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/chat.postMessage',
+			{
+				channel: 'C08514ZPKB8',
+				icon_emoji: '😁',
+				includeLinkToWorkflow: false,
+				link_names: true,
+				mrkdwn: true,
+				text: 'test message',
+				unfurl_links: true,
+				unfurl_media: true,
+			},
+			{},
+		);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/message/post.workflow.json b/packages/nodes-base/nodes/Slack/test/v2/node/message/post.workflow.json
new file mode 100644
index 0000000000000..0f3d797f8af20
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/message/post.workflow.json
@@ -0,0 +1,143 @@
+{
+	"name": "slack tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "e679c883-1839-47dc-9511-8f7dc370e6b0",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"select": "channel",
+				"channelId": {
+					"__rl": true,
+					"value": "C08514ZPKB8",
+					"mode": "list",
+					"cachedResultName": "test-002"
+				},
+				"text": "test message",
+				"otherOptions": {
+					"includeLinkToWorkflow": false,
+					"botProfile": {
+						"imageValues": {
+							"profilePhotoType": "emoji",
+							"icon_emoji": "😁"
+						}
+					},
+					"link_names": true,
+					"mrkdwn": true,
+					"unfurl_links": true,
+					"unfurl_media": true
+				}
+			},
+			"id": "2e1937a6-4c8f-4cd1-ae42-11b2bd12cc4c",
+			"name": "Slack",
+			"type": "n8n-nodes-base.slack",
+			"typeVersion": 2.3,
+			"position": [1040, 360],
+			"webhookId": "04c5e584-45f4-48d0-bcd2-0ecacecb0f53",
+			"credentials": {
+				"slackApi": {
+					"id": "Bg0bWXf8apAimCqJ",
+					"name": "Slack account 2"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "06652908-6b8e-443a-9508-ab229b011b73",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"ok": true,
+					"channel": "C08514ZPKB8",
+					"message": {
+						"user": "U0362BXQYJW",
+						"type": "message",
+						"ts": "1734322671.726339",
+						"bot_id": "B0382SHFM46",
+						"app_id": "A037UTP0Z39",
+						"text": "test message",
+						"team": "T0364MSFHV2",
+						"bot_profile": {
+							"id": "B0382SHFM46",
+							"app_id": "A037UTP0Z39",
+							"name": "blocks-test",
+							"icons": {
+								"image_36": "https://a.slack-edge.com/80588/img/plugins/app/bot_36.png",
+								"image_48": "https://a.slack-edge.com/80588/img/plugins/app/bot_48.png",
+								"image_72": "https://a.slack-edge.com/80588/img/plugins/app/service_72.png"
+							},
+							"deleted": false,
+							"updated": 1648028754,
+							"team_id": "T0364MSFHV2"
+						},
+						"blocks": [
+							{
+								"type": "rich_text",
+								"block_id": "t02Ox",
+								"elements": [
+									{
+										"type": "rich_text_section",
+										"elements": [
+											{
+												"type": "text",
+												"text": "test message"
+											}
+										]
+									}
+								]
+							}
+						]
+					},
+					"message_timestamp": "1734322671.726339"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Slack",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Slack": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "2bc19572-58f0-4cb9-91c3-78b4b3e0cd95",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "qJdEfiBgYLdfYOTs",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/message/search.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/message/search.test.ts
new file mode 100644
index 0000000000000..03179ebede51f
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/message/search.test.ts
@@ -0,0 +1,255 @@
+import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow';
+import nock from 'nock';
+
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+
+import { executeWorkflow } from '../../../../../../test/nodes/ExecuteWorkflow';
+import * as genericFunctions from '../../../../V2/GenericFunctions';
+
+const API_RESPONSE = {
+	ok: true,
+	query: 'test in:test-002',
+	messages: {
+		total: 3,
+		pagination: {
+			total_count: 3,
+			page: 1,
+			per_page: 2,
+			page_count: 1,
+			first: 1,
+			last: 3,
+		},
+		paging: {
+			count: 2,
+			total: 3,
+			page: 1,
+			pages: 1,
+		},
+		matches: [
+			{
+				iid: 'a60ff37e-5653-4c53-8a44-783ea4315476',
+				team: 'T0364MSFHV2',
+				score: 0,
+				channel: {
+					id: 'C08514ZPKB8',
+					is_channel: true,
+					is_group: false,
+					is_im: false,
+					is_mpim: false,
+					is_shared: false,
+					is_org_shared: false,
+					is_ext_shared: false,
+					is_private: false,
+					name: 'test-002',
+					pending_shared: [],
+					is_pending_ext_shared: false,
+				},
+				type: 'message',
+				user: 'U0362BXQYJW',
+				username: 'michael.k',
+				ts: '1734322597.935429',
+				blocks: [
+					{
+						type: 'rich_text',
+						block_id: '+bc',
+						elements: [
+							{
+								type: 'rich_text_section',
+								elements: [
+									{
+										type: 'text',
+										text: 'test message\n',
+									},
+									{
+										type: 'text',
+										text: 'Automated with this ',
+										style: {
+											italic: true,
+										},
+									},
+									{
+										type: 'link',
+										url: 'http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd',
+										text: 'n8n workflow',
+										style: {
+											italic: true,
+										},
+									},
+								],
+							},
+						],
+					},
+				],
+				text: 'test message\n_Automated with this <http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd|n8n workflow>_',
+				permalink: 'https://myspace-qhg7381.slack.com/archives/C08514ZPKB8/p1734322597935429',
+				no_reactions: true,
+			},
+			{
+				iid: '96ee0d2e-1a7d-40bf-b4b2-71ee15f004a8',
+				team: 'T0364MSFHV2',
+				score: 0,
+				channel: {
+					id: 'C08514ZPKB8',
+					is_channel: true,
+					is_group: false,
+					is_im: false,
+					is_mpim: false,
+					is_shared: false,
+					is_org_shared: false,
+					is_ext_shared: false,
+					is_private: false,
+					name: 'test-002',
+					pending_shared: [],
+					is_pending_ext_shared: false,
+				},
+				type: 'message',
+				user: 'U0362BXQYJW',
+				username: 'michael.k',
+				ts: '1734322341.161179',
+				blocks: [
+					{
+						type: 'rich_text',
+						block_id: 'FGAKN',
+						elements: [
+							{
+								type: 'rich_text_section',
+								elements: [
+									{
+										type: 'text',
+										text: 'test message\n',
+									},
+									{
+										type: 'text',
+										text: 'Automated with this ',
+										style: {
+											italic: true,
+										},
+									},
+									{
+										type: 'link',
+										url: 'http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd',
+										text: 'n8n workflow',
+										style: {
+											italic: true,
+										},
+									},
+								],
+							},
+						],
+					},
+				],
+				text: 'test message\n_Automated with this <http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd|n8n workflow>_',
+				permalink: 'https://myspace-qhg7381.slack.com/archives/C08514ZPKB8/p1734322341161179',
+				no_reactions: true,
+			},
+			{
+				iid: '72f79902-65f7-4bf3-b64b-3fd0b0c3746c',
+				team: 'T0364MSFHV2',
+				score: 0,
+				channel: {
+					id: 'C08514ZPKB8',
+					is_channel: true,
+					is_group: false,
+					is_im: false,
+					is_mpim: false,
+					is_shared: false,
+					is_org_shared: false,
+					is_ext_shared: false,
+					is_private: false,
+					name: 'test-002',
+					pending_shared: [],
+					is_pending_ext_shared: false,
+				},
+				type: 'message',
+				user: 'U0362BXQYJW',
+				username: 'michael.k',
+				ts: '1734321960.507649',
+				blocks: [
+					{
+						type: 'rich_text',
+						block_id: 'fnjm',
+						elements: [
+							{
+								type: 'rich_text_section',
+								elements: [
+									{
+										type: 'text',
+										text: 'test message\n',
+									},
+									{
+										type: 'text',
+										text: 'Automated with this ',
+										style: {
+											italic: true,
+										},
+									},
+									{
+										type: 'link',
+										url: 'http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd',
+										text: 'n8n workflow',
+										style: {
+											italic: true,
+										},
+									},
+								],
+							},
+						],
+					},
+				],
+				text: 'test message\n_Automated with this <http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd|n8n workflow>_',
+				permalink: 'https://myspace-qhg7381.slack.com/archives/C08514ZPKB8/p1734321960507649',
+				no_reactions: true,
+			},
+		],
+	},
+};
+
+jest.mock('../../../../V2/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../V2/GenericFunctions');
+	return {
+		...originalModule,
+		slackApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'POST') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test SlackV2, message => search', () => {
+	const workflows = ['nodes/Slack/test/v2/node/message/search.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../V2/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
+		const { result } = await executeWorkflow(testData, types);
+
+		const resultNodeData = getResultNodeData(result, testData);
+
+		resultNodeData.forEach(({ nodeName, resultData }) => {
+			return expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+		});
+
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledTimes(1);
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/search.messages',
+			{},
+			{ count: 2, query: 'test in:test-002', sort: 'timestamp', sort_dir: 'desc' },
+		);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/message/search.workflow.json b/packages/nodes-base/nodes/Slack/test/v2/node/message/search.workflow.json
new file mode 100644
index 0000000000000..56d63bc20cec3
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/message/search.workflow.json
@@ -0,0 +1,262 @@
+{
+	"name": "slack tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "e679c883-1839-47dc-9511-8f7dc370e6b0",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"operation": "search",
+				"query": "test",
+				"limit": 2,
+				"options": {
+					"searchChannel": ["test-002"]
+				}
+			},
+			"id": "2e1937a6-4c8f-4cd1-ae42-11b2bd12cc4c",
+			"name": "Slack",
+			"type": "n8n-nodes-base.slack",
+			"typeVersion": 2.3,
+			"position": [1040, 360],
+			"webhookId": "04c5e584-45f4-48d0-bcd2-0ecacecb0f53",
+			"credentials": {
+				"slackApi": {
+					"id": "Bg0bWXf8apAimCqJ",
+					"name": "Slack account 2"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "06652908-6b8e-443a-9508-ab229b011b73",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"iid": "a60ff37e-5653-4c53-8a44-783ea4315476",
+					"team": "T0364MSFHV2",
+					"score": 0,
+					"channel": {
+						"id": "C08514ZPKB8",
+						"is_channel": true,
+						"is_group": false,
+						"is_im": false,
+						"is_mpim": false,
+						"is_shared": false,
+						"is_org_shared": false,
+						"is_ext_shared": false,
+						"is_private": false,
+						"name": "test-002",
+						"pending_shared": [],
+						"is_pending_ext_shared": false
+					},
+					"type": "message",
+					"user": "U0362BXQYJW",
+					"username": "michael.k",
+					"ts": "1734322597.935429",
+					"blocks": [
+						{
+							"type": "rich_text",
+							"block_id": "+bc",
+							"elements": [
+								{
+									"type": "rich_text_section",
+									"elements": [
+										{
+											"type": "text",
+											"text": "test message\n"
+										},
+										{
+											"type": "text",
+											"text": "Automated with this ",
+											"style": {
+												"italic": true
+											}
+										},
+										{
+											"type": "link",
+											"url": "http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd",
+											"text": "n8n workflow",
+											"style": {
+												"italic": true
+											}
+										}
+									]
+								}
+							]
+						}
+					],
+					"text": "test message\n_Automated with this <http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd|n8n workflow>_",
+					"permalink": "https://myspace-qhg7381.slack.com/archives/C08514ZPKB8/p1734322597935429",
+					"no_reactions": true
+				}
+			},
+			{
+				"json": {
+					"iid": "96ee0d2e-1a7d-40bf-b4b2-71ee15f004a8",
+					"team": "T0364MSFHV2",
+					"score": 0,
+					"channel": {
+						"id": "C08514ZPKB8",
+						"is_channel": true,
+						"is_group": false,
+						"is_im": false,
+						"is_mpim": false,
+						"is_shared": false,
+						"is_org_shared": false,
+						"is_ext_shared": false,
+						"is_private": false,
+						"name": "test-002",
+						"pending_shared": [],
+						"is_pending_ext_shared": false
+					},
+					"type": "message",
+					"user": "U0362BXQYJW",
+					"username": "michael.k",
+					"ts": "1734322341.161179",
+					"blocks": [
+						{
+							"type": "rich_text",
+							"block_id": "FGAKN",
+							"elements": [
+								{
+									"type": "rich_text_section",
+									"elements": [
+										{
+											"type": "text",
+											"text": "test message\n"
+										},
+										{
+											"type": "text",
+											"text": "Automated with this ",
+											"style": {
+												"italic": true
+											}
+										},
+										{
+											"type": "link",
+											"url": "http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd",
+											"text": "n8n workflow",
+											"style": {
+												"italic": true
+											}
+										}
+									]
+								}
+							]
+						}
+					],
+					"text": "test message\n_Automated with this <http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd|n8n workflow>_",
+					"permalink": "https://myspace-qhg7381.slack.com/archives/C08514ZPKB8/p1734322341161179",
+					"no_reactions": true
+				}
+			},
+			{
+				"json": {
+					"iid": "72f79902-65f7-4bf3-b64b-3fd0b0c3746c",
+					"team": "T0364MSFHV2",
+					"score": 0,
+					"channel": {
+						"id": "C08514ZPKB8",
+						"is_channel": true,
+						"is_group": false,
+						"is_im": false,
+						"is_mpim": false,
+						"is_shared": false,
+						"is_org_shared": false,
+						"is_ext_shared": false,
+						"is_private": false,
+						"name": "test-002",
+						"pending_shared": [],
+						"is_pending_ext_shared": false
+					},
+					"type": "message",
+					"user": "U0362BXQYJW",
+					"username": "michael.k",
+					"ts": "1734321960.507649",
+					"blocks": [
+						{
+							"type": "rich_text",
+							"block_id": "fnjm",
+							"elements": [
+								{
+									"type": "rich_text_section",
+									"elements": [
+										{
+											"type": "text",
+											"text": "test message\n"
+										},
+										{
+											"type": "text",
+											"text": "Automated with this ",
+											"style": {
+												"italic": true
+											}
+										},
+										{
+											"type": "link",
+											"url": "http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd",
+											"text": "n8n workflow",
+											"style": {
+												"italic": true
+											}
+										}
+									]
+								}
+							]
+						}
+					],
+					"text": "test message\n_Automated with this <http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd|n8n workflow>_",
+					"permalink": "https://myspace-qhg7381.slack.com/archives/C08514ZPKB8/p1734321960507649",
+					"no_reactions": true
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Slack",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Slack": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "0ea58133-0522-40ae-ab51-ec3c1eced057",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "qJdEfiBgYLdfYOTs",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/message/update.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/message/update.test.ts
new file mode 100644
index 0000000000000..acf00fbd95384
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/message/update.test.ts
@@ -0,0 +1,112 @@
+import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow';
+import nock from 'nock';
+
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+
+import { executeWorkflow } from '../../../../../../test/nodes/ExecuteWorkflow';
+import * as genericFunctions from '../../../../V2/GenericFunctions';
+
+const API_RESPONSE = {
+	ok: true,
+	channel: 'C08514ZPKB8',
+	text: 'updated message',
+	message: {
+		user: 'U0362BXQYJW',
+		type: 'message',
+		edited: {
+			user: 'B0382SHFM46',
+			ts: '1734324905.000000',
+		},
+		bot_id: 'B0382SHFM46',
+		app_id: 'A037UTP0Z39',
+		text: 'updated message',
+		team: 'T0364MSFHV2',
+		bot_profile: {
+			id: 'B0382SHFM46',
+			app_id: 'A037UTP0Z39',
+			name: 'blocks-test',
+			icons: {
+				image_36: 'https://a.slack-edge.com/80588/img/plugins/app/bot_36.png',
+				image_48: 'https://a.slack-edge.com/80588/img/plugins/app/bot_48.png',
+				image_72: 'https://a.slack-edge.com/80588/img/plugins/app/service_72.png',
+			},
+			deleted: false,
+			updated: 1648028754,
+			team_id: 'T0364MSFHV2',
+		},
+		blocks: [
+			{
+				type: 'rich_text',
+				block_id: 'Akc',
+				elements: [
+					{
+						type: 'rich_text_section',
+						elements: [
+							{
+								type: 'text',
+								text: 'updated message',
+							},
+						],
+					},
+				],
+			},
+		],
+	},
+	message_timestamp: '1734321960.507649',
+};
+
+jest.mock('../../../../V2/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../V2/GenericFunctions');
+	return {
+		...originalModule,
+		slackApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'POST') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test SlackV2, message => update', () => {
+	const workflows = ['nodes/Slack/test/v2/node/message/update.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../V2/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
+		const { result } = await executeWorkflow(testData, types);
+
+		const resultNodeData = getResultNodeData(result, testData);
+
+		resultNodeData.forEach(({ nodeName, resultData }) => {
+			return expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+		});
+
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledTimes(1);
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/chat.update',
+			{
+				channel: 'C08514ZPKB8',
+				link_names: true,
+				parse: 'none',
+				text: 'updated message',
+				ts: '1734321960.507649',
+			},
+			{},
+		);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/message/update.workflow.json b/packages/nodes-base/nodes/Slack/test/v2/node/message/update.workflow.json
new file mode 100644
index 0000000000000..9a9472fdceecf
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/message/update.workflow.json
@@ -0,0 +1,142 @@
+{
+	"name": "slack tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "e679c883-1839-47dc-9511-8f7dc370e6b0",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"operation": "update",
+				"channelId": {
+					"__rl": true,
+					"value": "C08514ZPKB8",
+					"mode": "list",
+					"cachedResultName": "test-002"
+				},
+				"ts": 1734321960.507649,
+				"text": "updated message",
+				"updateFields": {
+					"link_names": true,
+					"parse": "none"
+				},
+				"otherOptions": {
+					"includeLinkToWorkflow": false
+				}
+			},
+			"id": "2e1937a6-4c8f-4cd1-ae42-11b2bd12cc4c",
+			"name": "Slack",
+			"type": "n8n-nodes-base.slack",
+			"typeVersion": 2.3,
+			"position": [1040, 360],
+			"webhookId": "04c5e584-45f4-48d0-bcd2-0ecacecb0f53",
+			"credentials": {
+				"slackApi": {
+					"id": "Bg0bWXf8apAimCqJ",
+					"name": "Slack account 2"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "06652908-6b8e-443a-9508-ab229b011b73",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"ok": true,
+					"channel": "C08514ZPKB8",
+					"text": "updated message",
+					"message": {
+						"user": "U0362BXQYJW",
+						"type": "message",
+						"edited": {
+							"user": "B0382SHFM46",
+							"ts": "1734324905.000000"
+						},
+						"bot_id": "B0382SHFM46",
+						"app_id": "A037UTP0Z39",
+						"text": "updated message",
+						"team": "T0364MSFHV2",
+						"bot_profile": {
+							"id": "B0382SHFM46",
+							"app_id": "A037UTP0Z39",
+							"name": "blocks-test",
+							"icons": {
+								"image_36": "https://a.slack-edge.com/80588/img/plugins/app/bot_36.png",
+								"image_48": "https://a.slack-edge.com/80588/img/plugins/app/bot_48.png",
+								"image_72": "https://a.slack-edge.com/80588/img/plugins/app/service_72.png"
+							},
+							"deleted": false,
+							"updated": 1648028754,
+							"team_id": "T0364MSFHV2"
+						},
+						"blocks": [
+							{
+								"type": "rich_text",
+								"block_id": "Akc",
+								"elements": [
+									{
+										"type": "rich_text_section",
+										"elements": [
+											{
+												"type": "text",
+												"text": "updated message"
+											}
+										]
+									}
+								]
+							}
+						]
+					},
+					"message_timestamp": "1734321960.507649"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Slack",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Slack": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "27133240-8ff6-4115-b330-9cbc9aa95b25",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "qJdEfiBgYLdfYOTs",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/user/updateProfile.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/user/updateProfile.test.ts
new file mode 100644
index 0000000000000..62577de3b99c9
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/user/updateProfile.test.ts
@@ -0,0 +1,71 @@
+import type { INodeTypes, WorkflowTestData } from 'n8n-workflow';
+import nock from 'nock';
+
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+
+import { executeWorkflow } from '../../../../../../test/nodes/ExecuteWorkflow';
+import * as genericFunctions from '../../../../V2/GenericFunctions';
+
+const API_RESPONSE = { profile: { test: 'OK' } };
+
+jest.mock('../../../../V2/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../V2/GenericFunctions');
+	return {
+		...originalModule,
+		slackApiRequest: jest.fn(async function () {
+			return API_RESPONSE;
+		}),
+	};
+});
+
+describe('Test SlackV2, user => updateProfile', () => {
+	const workflows = ['nodes/Slack/test/v2/node/user/updateProfile.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../V2/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
+		const { result } = await executeWorkflow(testData, types);
+
+		const resultNodeData = getResultNodeData(result, testData);
+
+		resultNodeData.forEach(({ nodeName, resultData }) => {
+			return expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+		});
+
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledTimes(1);
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/users.profile.set',
+			{
+				profile: {
+					customFieldUi: {
+						customFieldValues: [{ alt: '', id: 'Xf05SGHVUDKM', value: 'TEST title' }],
+					},
+					email: 'some@email.com',
+					fields: { Xf05SGHVUDKM: { alt: '', value: 'TEST title' } },
+					first_name: 'first',
+					last_name: 'last',
+					status_emoji: '👶',
+					status_expiration: 1734670800,
+					status_text: 'test status',
+				},
+				user: 'id-new',
+			},
+			{},
+		);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/user/updateProfile.workflow.json b/packages/nodes-base/nodes/Slack/test/v2/node/user/updateProfile.workflow.json
new file mode 100644
index 0000000000000..d835db0b71935
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/user/updateProfile.workflow.json
@@ -0,0 +1,106 @@
+{
+	"name": "slack new tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "e679c883-1839-47dc-9511-8f7dc370e6b0",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "user",
+				"operation": "updateProfile",
+				"options": {
+					"customFieldUi": {
+						"customFieldValues": [
+							{
+								"id": "Xf05SGHVUDKM",
+								"value": "TEST title"
+							}
+						]
+					},
+					"email": "some@email.com",
+					"first_name": "first",
+					"last_name": "last",
+					"status": {
+						"set_status": [
+							{
+								"status_emoji": "👶",
+								"status_expiration": "2024-12-20T00:00:00",
+								"status_text": "test status"
+							}
+						]
+					},
+					"user": "id-new"
+				}
+			},
+			"id": "2e1937a6-4c8f-4cd1-ae42-11b2bd12cc4c",
+			"name": "Slack",
+			"type": "n8n-nodes-base.slack",
+			"typeVersion": 2.3,
+			"position": [1040, 360],
+			"webhookId": "04c5e584-45f4-48d0-bcd2-0ecacecb0f53",
+			"credentials": {
+				"slackApi": {
+					"id": "Bg0bWXf8apAimCqJ",
+					"name": "Slack account 2"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "06652908-6b8e-443a-9508-ab229b011b73",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"test": "OK"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Slack",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Slack": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "297af4ef-eca5-493d-8a1f-c735fcb805f2",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "qJdEfiBgYLdfYOTs",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts b/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts
index 83406e1b518a8..475d27fff0b03 100644
--- a/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts
+++ b/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts
@@ -6,12 +6,12 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
-
 import snowflake from 'snowflake-sdk';
-import { connect, destroy, execute } from './GenericFunctions';
 
 import { getResolvables } from '@utils/utilities';
 
+import { connect, destroy, execute } from './GenericFunctions';
+
 export class Snowflake implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Snowflake',
diff --git a/packages/nodes-base/nodes/Splunk/test/v2/node/alert.test.ts b/packages/nodes-base/nodes/Splunk/test/v2/node/alert.test.ts
index 5857e14cd4964..1fc0b92831de2 100644
--- a/packages/nodes-base/nodes/Splunk/test/v2/node/alert.test.ts
+++ b/packages/nodes-base/nodes/Splunk/test/v2/node/alert.test.ts
@@ -1,5 +1,6 @@
 import { mock } from 'jest-mock-extended';
 import type { IExecuteFunctions } from 'n8n-workflow';
+
 import * as alert from '../../../v2/actions/alert';
 import * as transport from '../../../v2/transport';
 
diff --git a/packages/nodes-base/nodes/Splunk/test/v2/node/report.test.ts b/packages/nodes-base/nodes/Splunk/test/v2/node/report.test.ts
index 118ca8dd60189..d63056ba897e1 100644
--- a/packages/nodes-base/nodes/Splunk/test/v2/node/report.test.ts
+++ b/packages/nodes-base/nodes/Splunk/test/v2/node/report.test.ts
@@ -1,8 +1,9 @@
 import { mock } from 'jest-mock-extended';
 import type { IExecuteFunctions } from 'n8n-workflow';
+
+import { SPLUNK } from '../../../v1/types';
 import * as report from '../../../v2/actions/report';
 import * as transport from '../../../v2/transport';
-import { SPLUNK } from '../../../v1/types';
 
 jest.mock('../../../v2/transport', () => ({
 	splunkApiJsonRequest: jest.fn(),
diff --git a/packages/nodes-base/nodes/Splunk/test/v2/node/search.test.ts b/packages/nodes-base/nodes/Splunk/test/v2/node/search.test.ts
index d8e02ec86b9dd..3cc4a40cd6cb0 100644
--- a/packages/nodes-base/nodes/Splunk/test/v2/node/search.test.ts
+++ b/packages/nodes-base/nodes/Splunk/test/v2/node/search.test.ts
@@ -1,5 +1,6 @@
 import { mock } from 'jest-mock-extended';
 import type { IExecuteFunctions } from 'n8n-workflow';
+
 import * as search from '../../../v2/actions/search';
 import * as transport from '../../../v2/transport';
 
diff --git a/packages/nodes-base/nodes/Splunk/test/v2/node/user.test.ts b/packages/nodes-base/nodes/Splunk/test/v2/node/user.test.ts
index c33a38dc56b1a..b4e930a608f0f 100644
--- a/packages/nodes-base/nodes/Splunk/test/v2/node/user.test.ts
+++ b/packages/nodes-base/nodes/Splunk/test/v2/node/user.test.ts
@@ -1,8 +1,9 @@
 import { mock } from 'jest-mock-extended';
 import type { IExecuteFunctions } from 'n8n-workflow';
+
+import { SPLUNK } from '../../../v1/types';
 import * as user from '../../../v2/actions/user';
 import * as transport from '../../../v2/transport';
-import { SPLUNK } from '../../../v1/types';
 
 jest.mock('../../../v2/transport', () => ({
 	splunkApiJsonRequest: jest.fn(),
diff --git a/packages/nodes-base/nodes/Splunk/test/v2/utils.test.ts b/packages/nodes-base/nodes/Splunk/test/v2/utils.test.ts
index 425c52daabf5e..2fdaafdd99ef1 100644
--- a/packages/nodes-base/nodes/Splunk/test/v2/utils.test.ts
+++ b/packages/nodes-base/nodes/Splunk/test/v2/utils.test.ts
@@ -1,5 +1,7 @@
 import { mock } from 'jest-mock-extended';
 import type { IDataObject, IExecuteFunctions } from 'n8n-workflow';
+
+import { SPLUNK } from '../../v1/types';
 import {
 	formatEntry,
 	extractErrorDescription,
@@ -9,7 +11,6 @@ import {
 	setReturnAllOrLimit,
 	parseXml,
 } from '../../v2/helpers/utils';
-import { SPLUNK } from '../../v1/types';
 
 describe('Splunk, formatEntry', () => {
 	test('should format the entry correctly when doNotFormatContent is false', () => {
diff --git a/packages/nodes-base/nodes/Splunk/v1/GenericFunctions.ts b/packages/nodes-base/nodes/Splunk/v1/GenericFunctions.ts
index c6594e1403306..a7ca5f9abe924 100644
--- a/packages/nodes-base/nodes/Splunk/v1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Splunk/v1/GenericFunctions.ts
@@ -7,7 +7,6 @@ import type {
 	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError, sleep } from 'n8n-workflow';
-
 import { parseString } from 'xml2js';
 
 import {
diff --git a/packages/nodes-base/nodes/Splunk/v1/SplunkV1.node.ts b/packages/nodes-base/nodes/Splunk/v1/SplunkV1.node.ts
index b6d793fc63dc4..d9e790809ae77 100644
--- a/packages/nodes-base/nodes/Splunk/v1/SplunkV1.node.ts
+++ b/packages/nodes-base/nodes/Splunk/v1/SplunkV1.node.ts
@@ -1,3 +1,4 @@
+import set from 'lodash/set';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,19 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import set from 'lodash/set';
-import { oldVersionNotice } from '../../../utils/descriptions';
-import {
-	formatFeed,
-	formatResults,
-	formatSearch,
-	getId,
-	populate,
-	setCount,
-	splunkApiRequest,
-	toUnixEpoch,
-} from './GenericFunctions';
-
 import {
 	firedAlertOperations,
 	searchConfigurationFields,
@@ -33,8 +21,18 @@ import {
 	userFields,
 	userOperations,
 } from './descriptions';
-
+import {
+	formatFeed,
+	formatResults,
+	formatSearch,
+	getId,
+	populate,
+	setCount,
+	splunkApiRequest,
+	toUnixEpoch,
+} from './GenericFunctions';
 import type { SplunkFeedResponse } from './types';
+import { oldVersionNotice } from '../../../utils/descriptions';
 
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Splunk',
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/alert/getMetrics.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/alert/getMetrics.operation.ts
index aef07773c37ff..bb22daf00630b 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/alert/getMetrics.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/alert/getMetrics.operation.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import { splunkApiJsonRequest } from '../../transport';
 
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/alert/getReport.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/alert/getReport.operation.ts
index b76a3506d5376..d7a4390f7684b 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/alert/getReport.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/alert/getReport.operation.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import { splunkApiJsonRequest } from '../../transport';
 
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/alert/index.ts b/packages/nodes-base/nodes/Splunk/v2/actions/alert/index.ts
index 8d3a1f334255d..74458ea544b39 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/alert/index.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/alert/index.ts
@@ -1,7 +1,7 @@
 import type { INodeProperties } from 'n8n-workflow';
 
-import * as getReport from './getReport.operation';
 import * as getMetrics from './getMetrics.operation';
+import * as getReport from './getReport.operation';
 
 export { getReport, getMetrics };
 
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/report/create.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/report/create.operation.ts
index 1f3b59e273921..bf7bb847988e3 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/report/create.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/report/create.operation.ts
@@ -1,8 +1,9 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
-import { splunkApiJsonRequest, splunkApiRequest } from '../../transport';
 import { searchJobRLC } from '../../helpers/descriptions';
 import { formatFeed } from '../../helpers/utils';
+import { splunkApiJsonRequest, splunkApiRequest } from '../../transport';
 
 const properties: INodeProperties[] = [
 	searchJobRLC,
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/report/deleteReport.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/report/deleteReport.operation.ts
index 41aad443d1ed2..86ca26ae11232 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/report/deleteReport.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/report/deleteReport.operation.ts
@@ -1,7 +1,8 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
-import { splunkApiRequest } from '../../transport';
 import { reportRLC } from '../../helpers/descriptions';
+import { splunkApiRequest } from '../../transport';
 
 const properties: INodeProperties[] = [reportRLC];
 
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/report/get.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/report/get.operation.ts
index 32972c08f343a..ba71140e801ab 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/report/get.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/report/get.operation.ts
@@ -1,7 +1,8 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
-import { splunkApiJsonRequest } from '../../transport';
 import { reportRLC } from '../../helpers/descriptions';
+import { splunkApiJsonRequest } from '../../transport';
 
 const properties: INodeProperties[] = [reportRLC];
 
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/report/getAll.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/report/getAll.operation.ts
index c667d9ad9386e..0c3a86837f714 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/report/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/report/getAll.operation.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import { populate, setReturnAllOrLimit } from '../../helpers/utils';
 import { splunkApiJsonRequest } from '../../transport';
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/router.ts b/packages/nodes-base/nodes/Splunk/v2/actions/router.ts
index 3b0d3965e81f5..36e06ccc00fd4 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/router.ts
@@ -1,14 +1,13 @@
+import set from 'lodash/set';
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import set from 'lodash/set';
 import * as alert from './alert';
+import type { SplunkType } from './node.type';
 import * as report from './report';
 import * as search from './search';
 import * as user from './user';
 
-import type { SplunkType } from './node.type';
-
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	const items = this.getInputData();
 	let returnData: INodeExecutionData[] = [];
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/search/create.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/search/create.operation.ts
index b617b162aacb1..5191e106ee437 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/search/create.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/search/create.operation.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import { populate, toUnixEpoch } from '../../helpers/utils';
 import { splunkApiJsonRequest, splunkApiRequest } from '../../transport';
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/search/deleteJob.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/search/deleteJob.operation.ts
index 1bb463a5151e6..7f00a4e55b322 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/search/deleteJob.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/search/deleteJob.operation.ts
@@ -1,7 +1,8 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
-import { splunkApiRequest } from '../../transport';
 import { searchJobRLC } from '../../helpers/descriptions';
+import { splunkApiRequest } from '../../transport';
 
 const properties: INodeProperties[] = [searchJobRLC];
 
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/search/get.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/search/get.operation.ts
index 1df3721de168e..0175d8a7b7e0c 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/search/get.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/search/get.operation.ts
@@ -1,7 +1,8 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
-import { splunkApiJsonRequest } from '../../transport';
 import { searchJobRLC } from '../../helpers/descriptions';
+import { splunkApiJsonRequest } from '../../transport';
 
 const properties: INodeProperties[] = [searchJobRLC];
 
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/search/getAll.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/search/getAll.operation.ts
index 5ea3bb36857db..3cb1a7243b2a9 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/search/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/search/getAll.operation.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import { populate, setReturnAllOrLimit } from '../../helpers/utils';
 import { splunkApiJsonRequest } from '../../transport';
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/search/getResult.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/search/getResult.operation.ts
index 246cce383e2fa..f79ab5aebdcc5 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/search/getResult.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/search/getResult.operation.ts
@@ -1,8 +1,9 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
-import { splunkApiJsonRequest } from '../../transport';
-import { populate, setReturnAllOrLimit } from '../../helpers/utils';
 import { searchJobRLC } from '../../helpers/descriptions';
+import { populate, setReturnAllOrLimit } from '../../helpers/utils';
+import { splunkApiJsonRequest } from '../../transport';
 
 const properties: INodeProperties[] = [
 	searchJobRLC,
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/user/create.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/user/create.operation.ts
index 950391e611053..3d232c4d4f8dd 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/user/create.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/user/create.operation.ts
@@ -1,8 +1,9 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
+import type { SplunkFeedResponse } from '../../helpers/interfaces';
 import { formatFeed, populate } from '../../helpers/utils';
 import { splunkApiRequest } from '../../transport';
-import type { SplunkFeedResponse } from '../../helpers/interfaces';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/user/deleteUser.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/user/deleteUser.operation.ts
index e3d9a05605446..bf68be0366ebd 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/user/deleteUser.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/user/deleteUser.operation.ts
@@ -1,7 +1,8 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
-import { splunkApiRequest } from '../../transport';
 import { userRLC } from '../../helpers/descriptions';
+import { splunkApiRequest } from '../../transport';
 
 const properties: INodeProperties[] = [userRLC];
 
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/user/get.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/user/get.operation.ts
index 46ffad1e9d28e..d0430fd9340fa 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/user/get.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/user/get.operation.ts
@@ -1,7 +1,8 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
-import { splunkApiJsonRequest } from '../../transport';
 import { userRLC } from '../../helpers/descriptions';
+import { splunkApiJsonRequest } from '../../transport';
 
 const properties: INodeProperties[] = [userRLC];
 
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/user/getAll.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/user/getAll.operation.ts
index 822a40f2698e0..57ebe3fe7fa96 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/user/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/user/getAll.operation.ts
@@ -1,7 +1,8 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
-import { splunkApiJsonRequest } from '../../transport';
 import { setReturnAllOrLimit } from '../../helpers/utils';
+import { splunkApiJsonRequest } from '../../transport';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/user/update.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/user/update.operation.ts
index e680a8214e1c0..8ecf0ce6199b8 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/user/update.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/user/update.operation.ts
@@ -1,8 +1,9 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
+import { userRLC } from '../../helpers/descriptions';
 import { formatFeed, populate } from '../../helpers/utils';
 import { splunkApiRequest } from '../../transport';
-import { userRLC } from '../../helpers/descriptions';
 
 const properties: INodeProperties[] = [
 	userRLC,
diff --git a/packages/nodes-base/nodes/Splunk/v2/helpers/utils.ts b/packages/nodes-base/nodes/Splunk/v2/helpers/utils.ts
index 7515ba509f0be..3512c387765af 100644
--- a/packages/nodes-base/nodes/Splunk/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/helpers/utils.ts
@@ -1,9 +1,8 @@
 import type { IExecuteFunctions, IDataObject } from 'n8n-workflow';
-
 import { parseString } from 'xml2js';
 
-import { SPLUNK } from '../../v1/types';
 import type { SplunkError, SplunkFeedResponse } from './interfaces';
+import { SPLUNK } from '../../v1/types';
 
 function compactEntryContent(splunkObject: any): any {
 	if (typeof splunkObject !== 'object') {
diff --git a/packages/nodes-base/nodes/Splunk/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Splunk/v2/methods/listSearch.ts
index 087163cb7279e..758e54c5c99b6 100644
--- a/packages/nodes-base/nodes/Splunk/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/methods/listSearch.ts
@@ -1,4 +1,5 @@
 import type { IDataObject, ILoadOptionsFunctions, INodeListSearchResult } from 'n8n-workflow';
+
 import { splunkApiJsonRequest } from '../transport';
 
 export async function searchReports(
diff --git a/packages/nodes-base/nodes/Splunk/v2/transport/index.ts b/packages/nodes-base/nodes/Splunk/v2/transport/index.ts
index ee6fd8ea4f86a..665121eeb5ea3 100644
--- a/packages/nodes-base/nodes/Splunk/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/transport/index.ts
@@ -19,9 +19,8 @@ export async function splunkApiRequest(
 	body: IDataObject = {},
 	qs: IDataObject = {},
 ): Promise<any> {
-	const { baseUrl, allowUnauthorizedCerts } = (await this.getCredentials(
-		'splunkApi',
-	)) as SplunkCredentials;
+	const { baseUrl, allowUnauthorizedCerts } =
+		await this.getCredentials<SplunkCredentials>('splunkApi');
 
 	const options: IRequestOptions = {
 		headers: {
@@ -95,9 +94,8 @@ export async function splunkApiJsonRequest(
 	body: IDataObject = {},
 	qs: IDataObject = {},
 ) {
-	const { baseUrl, allowUnauthorizedCerts } = (await this.getCredentials(
-		'splunkApi',
-	)) as SplunkCredentials;
+	const { baseUrl, allowUnauthorizedCerts } =
+		await this.getCredentials<SplunkCredentials>('splunkApi');
 
 	qs.output_mode = 'json';
 
diff --git a/packages/nodes-base/nodes/Spontit/Spontit.node.ts b/packages/nodes-base/nodes/Spontit/Spontit.node.ts
index 9e20cd87cd81a..cb2ad23db5f76 100644
--- a/packages/nodes-base/nodes/Spontit/Spontit.node.ts
+++ b/packages/nodes-base/nodes/Spontit/Spontit.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -7,9 +8,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import { spontitApiRequest } from './GenericFunctions';
-
 import { pushFields, pushOperations } from './PushDescription';
 
 export class Spontit implements INodeType {
diff --git a/packages/nodes-base/nodes/Spotify/GenericFunctions.ts b/packages/nodes-base/nodes/Spotify/GenericFunctions.ts
index 6b61655ee30fd..7210a70e17af8 100644
--- a/packages/nodes-base/nodes/Spotify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Spotify/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -8,8 +9,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
 /**
  * Make an API request to Spotify
  *
diff --git a/packages/nodes-base/nodes/Spotify/Spotify.node.ts b/packages/nodes-base/nodes/Spotify/Spotify.node.ts
index b951831c3bbbe..b9c792a564a87 100644
--- a/packages/nodes-base/nodes/Spotify/Spotify.node.ts
+++ b/packages/nodes-base/nodes/Spotify/Spotify.node.ts
@@ -8,10 +8,10 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { spotifyApiRequest, spotifyApiRequestAllItems } from './GenericFunctions';
-
 import { isoCountryCodes } from '@utils/ISOCountryCodes';
 
+import { spotifyApiRequest, spotifyApiRequestAllItems } from './GenericFunctions';
+
 export class Spotify implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Spotify',
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/test/SpreadsheetFile.test.ts b/packages/nodes-base/nodes/SpreadsheetFile/test/SpreadsheetFile.test.ts
index 24ad71061217a..e599515315259 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile/test/SpreadsheetFile.test.ts
+++ b/packages/nodes-base/nodes/SpreadsheetFile/test/SpreadsheetFile.test.ts
@@ -1,9 +1,10 @@
-import path from 'path';
 import { readFileSync } from 'fs';
 import type { IWorkflowBase } from 'n8n-workflow';
+import path from 'path';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import * as Helpers from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 
 describe('Execute Spreadsheet File Node', () => {
 	beforeEach(async () => {
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/v1/SpreadsheetFileV1.node.ts b/packages/nodes-base/nodes/SpreadsheetFile/v1/SpreadsheetFileV1.node.ts
index 99c7cc80bb606..e575c756b1c84 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile/v1/SpreadsheetFileV1.node.ts
+++ b/packages/nodes-base/nodes/SpreadsheetFile/v1/SpreadsheetFileV1.node.ts
@@ -7,7 +7,6 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { BINARY_ENCODING, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-
 import type {
 	JSON2SheetOpts,
 	ParsingOptions,
@@ -22,6 +21,9 @@ import {
 	write as xlsxWrite,
 } from 'xlsx';
 
+import { oldVersionNotice } from '@utils/descriptions';
+import { flattenObject, generatePairedItemData } from '@utils/utilities';
+
 import {
 	operationProperty,
 	binaryProperty,
@@ -29,8 +31,6 @@ import {
 	fromFileOptions,
 	toFileOptions,
 } from '../description';
-import { flattenObject, generatePairedItemData } from '@utils/utilities';
-import { oldVersionNotice } from '@utils/descriptions';
 
 export class SpreadsheetFileV1 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/v2/SpreadsheetFileV2.node.ts b/packages/nodes-base/nodes/SpreadsheetFile/v2/SpreadsheetFileV2.node.ts
index 4694c3efa957c..20c885ab0660b 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile/v2/SpreadsheetFileV2.node.ts
+++ b/packages/nodes-base/nodes/SpreadsheetFile/v2/SpreadsheetFileV2.node.ts
@@ -7,9 +7,9 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { operationProperty } from '../description';
 import * as fromFile from './fromFile.operation';
 import * as toFile from './toFile.operation';
+import { operationProperty } from '../description';
 
 export class SpreadsheetFileV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/v2/fromFile.operation.ts b/packages/nodes-base/nodes/SpreadsheetFile/v2/fromFile.operation.ts
index 719faeb478480..7ec6ae2b68055 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile/v2/fromFile.operation.ts
+++ b/packages/nodes-base/nodes/SpreadsheetFile/v2/fromFile.operation.ts
@@ -1,10 +1,9 @@
+import { parse as createCSVParser } from 'csv-parse';
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
 import { BINARY_ENCODING, NodeOperationError } from 'n8n-workflow';
-
 import type { Sheet2JSONOpts, WorkBook, ParsingOptions } from 'xlsx';
 import { read as xlsxRead, readFile as xlsxReadFile, utils as xlsxUtils } from 'xlsx';
 
-import { parse as createCSVParser } from 'csv-parse';
 import { binaryProperty, fromFileOptions } from '../description';
 
 export const description: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/v2/toFile.operation.ts b/packages/nodes-base/nodes/SpreadsheetFile/v2/toFile.operation.ts
index 61f8f8509ef39..d89d1e9c233b2 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile/v2/toFile.operation.ts
+++ b/packages/nodes-base/nodes/SpreadsheetFile/v2/toFile.operation.ts
@@ -1,9 +1,10 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
 
-import { toFileOptions, toFileProperties } from '../description';
-import { generatePairedItemData } from '@utils/utilities';
 import type { JsonToSpreadsheetBinaryFormat, JsonToSpreadsheetBinaryOptions } from '@utils/binary';
 import { convertJsonToSpreadsheetBinary } from '@utils/binary';
+import { generatePairedItemData } from '@utils/utilities';
+
+import { toFileOptions, toFileProperties } from '../description';
 
 export const description: INodeProperties[] = [...toFileProperties, toFileOptions];
 
diff --git a/packages/nodes-base/nodes/Ssh/Ssh.node.ts b/packages/nodes-base/nodes/Ssh/Ssh.node.ts
index 322e53bd75b12..7c856f967e747 100644
--- a/packages/nodes-base/nodes/Ssh/Ssh.node.ts
+++ b/packages/nodes-base/nodes/Ssh/Ssh.node.ts
@@ -1,5 +1,4 @@
 import { writeFile } from 'fs/promises';
-import type { Readable } from 'stream';
 import type {
 	ICredentialTestFunctions,
 	ICredentialsDecrypted,
@@ -11,11 +10,11 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { BINARY_ENCODING, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-
-import { file as tmpFile } from 'tmp-promise';
-
 import type { Config } from 'node-ssh';
 import { NodeSSH } from 'node-ssh';
+import type { Readable } from 'stream';
+import { file as tmpFile } from 'tmp-promise';
+
 import { formatPrivateKey } from '@utils/utilities';
 
 async function resolveHomeDir(
diff --git a/packages/nodes-base/nodes/Stackby/Stackby.node.ts b/packages/nodes-base/nodes/Stackby/Stackby.node.ts
index 72c9ef4a180b2..f9b54e2a87252 100644
--- a/packages/nodes-base/nodes/Stackby/Stackby.node.ts
+++ b/packages/nodes-base/nodes/Stackby/Stackby.node.ts
@@ -7,9 +7,9 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { generatePairedItemData } from '../../utils/utilities';
 import type { IRecord } from './GenericFunction';
 import { apiRequest, apiRequestAllItems } from './GenericFunction';
+import { generatePairedItemData } from '../../utils/utilities';
 
 export class Stackby implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/StopAndError/test/node/StopAndError.test.ts b/packages/nodes-base/nodes/StopAndError/test/node/StopAndError.test.ts
index 4cc003fa7f3be..32066af72cf9e 100644
--- a/packages/nodes-base/nodes/StopAndError/test/node/StopAndError.test.ts
+++ b/packages/nodes-base/nodes/StopAndError/test/node/StopAndError.test.ts
@@ -1,8 +1,9 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
 import { NodeConnectionType, type IDataObject } from 'n8n-workflow';
-import type { WorkflowTestData } from '@test/nodes/types';
+
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import * as Helpers from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
 
 describe('Execute Stop and Error Node', () => {
 	const tests: WorkflowTestData[] = [
diff --git a/packages/nodes-base/nodes/Storyblok/Storyblok.node.ts b/packages/nodes-base/nodes/Storyblok/Storyblok.node.ts
index c921e6a26d320..488a333bb87d5 100644
--- a/packages/nodes-base/nodes/Storyblok/Storyblok.node.ts
+++ b/packages/nodes-base/nodes/Storyblok/Storyblok.node.ts
@@ -10,9 +10,7 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { storyblokApiRequest, storyblokApiRequestAllItems } from './GenericFunctions';
-
 import { storyContentFields, storyContentOperations } from './StoryContentDescription';
-
 import { storyManagementFields, storyManagementOperations } from './StoryManagementDescription';
 
 export class Storyblok implements INodeType {
diff --git a/packages/nodes-base/nodes/Strapi/Strapi.node.ts b/packages/nodes-base/nodes/Strapi/Strapi.node.ts
index c3ff781b6f642..5980e16dfce38 100644
--- a/packages/nodes-base/nodes/Strapi/Strapi.node.ts
+++ b/packages/nodes-base/nodes/Strapi/Strapi.node.ts
@@ -11,6 +11,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
+import { entryFields, entryOperations } from './EntryDescription';
 import {
 	getToken,
 	removeTrailingSlash,
@@ -19,8 +20,6 @@ import {
 	validateJSON,
 } from './GenericFunctions';
 
-import { entryFields, entryOperations } from './EntryDescription';
-
 export class Strapi implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Strapi',
diff --git a/packages/nodes-base/nodes/Strava/Strava.node.ts b/packages/nodes-base/nodes/Strava/Strava.node.ts
index 48f01c78f5b10..e613945cedd32 100644
--- a/packages/nodes-base/nodes/Strava/Strava.node.ts
+++ b/packages/nodes-base/nodes/Strava/Strava.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -7,10 +8,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-import { stravaApiRequest, stravaApiRequestAllItems } from './GenericFunctions';
-
 import { activityFields, activityOperations } from './ActivityDescription';
+import { stravaApiRequest, stravaApiRequestAllItems } from './GenericFunctions';
 
 export class Strava implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Stripe/Stripe.node.ts b/packages/nodes-base/nodes/Stripe/Stripe.node.ts
index 2c8b3042a1c5b..61435fada53d4 100644
--- a/packages/nodes-base/nodes/Stripe/Stripe.node.ts
+++ b/packages/nodes-base/nodes/Stripe/Stripe.node.ts
@@ -1,3 +1,4 @@
+import isEmpty from 'lodash/isEmpty';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,17 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import isEmpty from 'lodash/isEmpty';
-
-import {
-	adjustChargeFields,
-	adjustCustomerFields,
-	adjustMetadata,
-	handleListing,
-	loadResource,
-	stripeApiRequest,
-} from './helpers';
-
 import {
 	balanceOperations,
 	chargeFields,
@@ -35,6 +25,14 @@ import {
 	tokenFields,
 	tokenOperations,
 } from './descriptions';
+import {
+	adjustChargeFields,
+	adjustCustomerFields,
+	adjustMetadata,
+	handleListing,
+	loadResource,
+	stripeApiRequest,
+} from './helpers';
 
 export class Stripe implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Supabase/Supabase.node.ts b/packages/nodes-base/nodes/Supabase/Supabase.node.ts
index 06b9d03337e44..14d1f5abdd123 100644
--- a/packages/nodes-base/nodes/Supabase/Supabase.node.ts
+++ b/packages/nodes-base/nodes/Supabase/Supabase.node.ts
@@ -21,7 +21,6 @@ import {
 	supabaseApiRequest,
 	validateCredentials,
 } from './GenericFunctions';
-
 import { rowFields, rowOperations } from './RowDescription';
 
 export type FieldsUiValues = Array<{
diff --git a/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts b/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
index 264b7eb314fe3..6f3fcf2f91810 100644
--- a/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
+++ b/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
@@ -13,7 +13,6 @@ import type {
 import { deepCopy, jsonParse, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
 import { idsExist, surveyMonkeyApiRequest, surveyMonkeyRequestAllItems } from './GenericFunctions';
-
 import type { IAnswer, IChoice, IOther, IQuestion, IRow } from './Interfaces';
 
 export class SurveyMonkeyTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Switch/V3/SwitchV3.node.ts b/packages/nodes-base/nodes/Switch/V3/SwitchV3.node.ts
index ccc634597bcd8..6cfe7586011fe 100644
--- a/packages/nodes-base/nodes/Switch/V3/SwitchV3.node.ts
+++ b/packages/nodes-base/nodes/Switch/V3/SwitchV3.node.ts
@@ -1,3 +1,4 @@
+import set from 'lodash/set';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -10,11 +11,12 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { ApplicationError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-import set from 'lodash/set';
+
+import { capitalize } from '@utils/utilities';
+
 import { ENABLE_LESS_STRICT_TYPE_VALIDATION } from '../../../utils/constants';
 import { looseTypeValidationProperty } from '../../../utils/descriptions';
 import { getTypeValidationParameter, getTypeValidationStrictness } from '../../If/V2/utils';
-import { capitalize } from '@utils/utilities';
 
 const configuredOutputs = (parameters: INodeParameters) => {
 	const mode = parameters.mode as string;
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/SyncroMspV1.node.ts b/packages/nodes-base/nodes/SyncroMSP/v1/SyncroMspV1.node.ts
index 18f6568d04bdd..a8bf3b59af69b 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/SyncroMspV1.node.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/SyncroMspV1.node.ts
@@ -9,9 +9,9 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import { router } from './actions/router';
 import { versionDescription } from './actions/versionDescription';
 import { loadOptions } from './methods';
-import { router } from './actions/router';
 import { validateCredentials } from './transport';
 
 export class SyncroMspV1 implements INodeType {
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/create/description.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/create/description.ts
index 69a0dc8448eab..25a1dcae3c5cd 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/create/description.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/create/description.ts
@@ -1,6 +1,5 @@
-import type { ContactProperties } from '../../Interfaces';
-
 import { addressFixedCollection } from '../../../methods/sharedFields';
+import type { ContactProperties } from '../../Interfaces';
 
 export const contactCreateDescription: ContactProperties = [
 	{
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/create/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/create/index.ts
index 37a8c233e9f5c..8d292447298d8 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/create/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/create/index.ts
@@ -1,4 +1,4 @@
-import { createContact as execute } from './execute';
 import { contactCreateDescription as description } from './description';
+import { createContact as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/del/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/del/index.ts
index 59582e0e225d4..168905dbcbf93 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/del/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/del/index.ts
@@ -1,4 +1,4 @@
-import { deleteContact as execute } from './execute';
 import { contactDeleteDescription as description } from './description';
+import { deleteContact as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/get/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/get/index.ts
index e5e9388e5f0c3..ad369cda9b744 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/get/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/get/index.ts
@@ -1,4 +1,4 @@
-import { getContact as execute } from './execute';
 import { contactGetDescription as description } from './description';
+import { getContact as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/getAll/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/getAll/index.ts
index d6471c173d6d3..5c1817412f685 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/getAll/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/getAll/index.ts
@@ -1,4 +1,4 @@
-import { getAll as execute } from './execute';
 import { contactGetAllDescription as description } from './description';
+import { getAll as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/index.ts
index 92652e7bace61..cf82ea13904ef 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/index.ts
@@ -1,9 +1,10 @@
 import type { INodeProperties } from 'n8n-workflow';
-import * as getAll from './getAll';
+
 import * as create from './create';
+import * as del from './del';
 import * as get from './get';
+import * as getAll from './getAll';
 import * as update from './update';
-import * as del from './del';
 
 export { getAll, create, del as delete, update, get };
 
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/update/description.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/update/description.ts
index ae805a1a8cdbd..133c2a6327de3 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/update/description.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/update/description.ts
@@ -1,6 +1,5 @@
-import type { ContactProperties } from '../../Interfaces';
-
 import { addressFixedCollection } from '../../../methods/sharedFields';
+import type { ContactProperties } from '../../Interfaces';
 
 export const contactUpdateDescription: ContactProperties = [
 	{
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/update/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/update/index.ts
index 55a3a16158eb5..748a0d7780aca 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/update/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/update/index.ts
@@ -1,4 +1,4 @@
-import { updateContact as execute } from './execute';
 import { contactUpdateDescription as description } from './description';
+import { updateContact as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/create/description.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/create/description.ts
index a7353e5fe981b..641b6f0daebbd 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/create/description.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/create/description.ts
@@ -1,6 +1,5 @@
-import type { CustomerProperties } from '../../Interfaces';
-
 import { addressFixedCollection } from '../../../methods/sharedFields';
+import type { CustomerProperties } from '../../Interfaces';
 
 export const customerCreateDescription: CustomerProperties = [
 	{
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/create/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/create/index.ts
index 2d14aaa37a167..58490575c327f 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/create/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/create/index.ts
@@ -1,4 +1,4 @@
-import { addCustomer as execute } from './execute';
 import { customerCreateDescription as description } from './description';
+import { addCustomer as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/del/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/del/index.ts
index b2a8983763931..41e70e438c312 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/del/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/del/index.ts
@@ -1,4 +1,4 @@
-import { deleteCustomer as execute } from './execute';
 import { customerDeleteDescription as description } from './description';
+import { deleteCustomer as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/get/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/get/index.ts
index bbe397550b476..e4e98c28290db 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/get/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/get/index.ts
@@ -1,4 +1,4 @@
-import { getCustomer as execute } from './execute';
 import { customerGetDescription as description } from './description';
+import { getCustomer as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/getAll/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/getAll/index.ts
index 974c0543b3a26..f1ef5c86964d2 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/getAll/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/getAll/index.ts
@@ -1,4 +1,4 @@
-import { getAll as execute } from './execute';
 import { customerGetAllDescription as description } from './description';
+import { getAll as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/index.ts
index be3c8fd202e96..461649d8848f4 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/index.ts
@@ -1,9 +1,10 @@
 import type { INodeProperties } from 'n8n-workflow';
-import * as getAll from './getAll';
+
 import * as create from './create';
 import * as del from './del';
-import * as update from './update';
 import * as get from './get';
+import * as getAll from './getAll';
+import * as update from './update';
 
 export { getAll, create, del as delete, update, get };
 
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/update/description.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/update/description.ts
index 380aa0e9dd317..e97f0b0c47ec4 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/update/description.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/update/description.ts
@@ -1,6 +1,5 @@
-import type { CustomerProperties } from '../../Interfaces';
-
 import { addressFixedCollection } from '../../../methods/sharedFields';
+import type { CustomerProperties } from '../../Interfaces';
 
 export const customerUpdateDescription: CustomerProperties = [
 	{
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/update/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/update/index.ts
index 145cbcc32bca6..506191d3a1f35 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/update/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/update/index.ts
@@ -1,4 +1,4 @@
-import { updateCustomer as execute } from './execute';
 import { customerUpdateDescription as description } from './description';
+import { updateCustomer as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/create/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/create/index.ts
index 6b44825e55448..35c2f00e85a73 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/create/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/create/index.ts
@@ -1,4 +1,4 @@
-import { addAlert as execute } from './execute';
 import { rmmCreateDescription as description } from './description';
+import { addAlert as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/del/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/del/index.ts
index cfedcddc5959a..5e3e5f5c77d68 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/del/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/del/index.ts
@@ -1,4 +1,4 @@
-import { deleteAlert as execute } from './execute';
 import { rmmDeleteDescription as description } from './description';
+import { deleteAlert as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/get/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/get/index.ts
index df6bf2174ced8..6f870e9ed5832 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/get/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/get/index.ts
@@ -1,4 +1,4 @@
-import { getAlert as execute } from './execute';
 import { rmmGetDescription as description } from './description';
+import { getAlert as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/getAll/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/getAll/index.ts
index ad77601d55018..1e08b228251d3 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/getAll/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/getAll/index.ts
@@ -1,4 +1,4 @@
-import { getAll as execute } from './execute';
 import { rmmGetAllDescription as description } from './description';
+import { getAll as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/index.ts
index 5eaeaf3ec30fa..ea16363f51cce 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/index.ts
@@ -1,8 +1,9 @@
 import type { INodeProperties } from 'n8n-workflow';
-import * as get from './get';
-import * as getAll from './getAll';
+
 import * as create from './create';
 import * as del from './del';
+import * as get from './get';
+import * as getAll from './getAll';
 import * as mute from './mute';
 
 export { getAll, get, mute, del as delete, create };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/mute/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/mute/index.ts
index d39e22fffbeea..7c42ee4df2c83 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/mute/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/mute/index.ts
@@ -1,4 +1,4 @@
-import { muteAlert as execute } from './execute';
 import { rmmMuteDescription as description } from './description';
+import { muteAlert as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/router.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/router.ts
index 3b5a5b3210efb..e69c37e532b42 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/router.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/router.ts
@@ -1,12 +1,11 @@
 import type { IExecuteFunctions, INodeExecutionData, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import * as customer from './customer';
-import * as ticket from './ticket';
 import * as contact from './contact';
-import * as rmm from './rmm';
-
+import * as customer from './customer';
 import type { SyncroMsp } from './Interfaces';
+import * as rmm from './rmm';
+import * as ticket from './ticket';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	const items = this.getInputData();
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/create/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/create/index.ts
index 0a3b178defcc2..88fc8bd1ec40a 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/create/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/create/index.ts
@@ -1,4 +1,4 @@
-import { createTicket as execute } from './execute';
 import { ticketCreateDescription as description } from './description';
+import { createTicket as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/del/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/del/index.ts
index 8919e1726f526..c67a6d1c3409f 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/del/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/del/index.ts
@@ -1,4 +1,4 @@
-import { deleteTicket as execute } from './execute';
 import { ticketDeleteDescription as description } from './description';
+import { deleteTicket as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/get/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/get/index.ts
index 530eec20d89a2..1a77b36563890 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/get/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/get/index.ts
@@ -1,4 +1,4 @@
-import { getTicket as execute } from './execute';
 import { ticketGetDescription as description } from './description';
+import { getTicket as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/getAll/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/getAll/index.ts
index 93420f25d450e..116e1a925fd4a 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/getAll/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/getAll/index.ts
@@ -1,4 +1,4 @@
-import { getAll as execute } from './execute';
 import { ticketGetAllDescription as description } from './description';
+import { getAll as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/index.ts
index 49dfc1d67c2b4..b9a98c1a0a184 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/index.ts
@@ -1,8 +1,9 @@
 import type { INodeProperties } from 'n8n-workflow';
-import * as getAll from './getAll';
+
 import * as create from './create';
-import * as get from './get';
 import * as del from './del';
+import * as get from './get';
+import * as getAll from './getAll';
 import * as update from './update';
 
 export { getAll, create, get, del as delete, update };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/update/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/update/index.ts
index 98547072fee68..5cc0fdf1691f0 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/update/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/update/index.ts
@@ -1,4 +1,4 @@
-import { updateTicket as execute } from './execute';
 import { ticketUpdateDescription as description } from './description';
+import { updateTicket as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/versionDescription.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/versionDescription.ts
index cfb9711917c60..c112fe9ec55a8 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/versionDescription.ts
@@ -1,10 +1,10 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import { NodeConnectionType, type INodeTypeDescription } from 'n8n-workflow';
 
-import * as customer from './customer';
-import * as ticket from './ticket';
 import * as contact from './contact';
+import * as customer from './customer';
 import * as rmm from './rmm';
+import * as ticket from './ticket';
 
 export const versionDescription: INodeTypeDescription = {
 	displayName: 'SyncroMSP',
diff --git a/packages/nodes-base/nodes/Taiga/GenericFunctions.ts b/packages/nodes-base/nodes/Taiga/GenericFunctions.ts
index d01e36cdd4a21..70c6f70b5588a 100644
--- a/packages/nodes-base/nodes/Taiga/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Taiga/GenericFunctions.ts
@@ -1,5 +1,4 @@
 import { createHash } from 'crypto';
-
 import type {
 	ICredentialDataDecryptedObject,
 	IDataObject,
diff --git a/packages/nodes-base/nodes/Taiga/Taiga.node.ts b/packages/nodes-base/nodes/Taiga/Taiga.node.ts
index d49be81d246f9..d27502ffd3caa 100644
--- a/packages/nodes-base/nodes/Taiga/Taiga.node.ts
+++ b/packages/nodes-base/nodes/Taiga/Taiga.node.ts
@@ -9,14 +9,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import {
-	getVersionForUpdate,
-	handleListing,
-	taigaApiRequest,
-	throwOnEmptyUpdate,
-	toOptions,
-} from './GenericFunctions';
-
 import {
 	epicFields,
 	epicOperations,
@@ -27,6 +19,13 @@ import {
 	userStoryFields,
 	userStoryOperations,
 } from './descriptions';
+import {
+	getVersionForUpdate,
+	handleListing,
+	taigaApiRequest,
+	throwOnEmptyUpdate,
+	toOptions,
+} from './GenericFunctions';
 
 export class Taiga implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.ts b/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.ts
index 87c3bb8bcb0a8..fd6e9584770b0 100644
--- a/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.ts
+++ b/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.ts
@@ -10,15 +10,12 @@ import type {
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
 import { affiliateFields, affiliateOperations } from './AffiliateDescription';
-
 import {
 	affiliateMetadataFields,
 	affiliateMetadataOperations,
 } from './AffiliateMetadataDescription';
-
-import { programAffiliateFields, programAffiliateOperations } from './ProgramAffiliateDescription';
-
 import { tapfiliateApiRequest, tapfiliateApiRequestAllItems } from './GenericFunctions';
+import { programAffiliateFields, programAffiliateOperations } from './ProgramAffiliateDescription';
 
 export class Tapfiliate implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Telegram/Telegram.node.ts b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
index 5ae67465bf35c..7d1d37b09f3d6 100644
--- a/packages/nodes-base/nodes/Telegram/Telegram.node.ts
+++ b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
@@ -1,5 +1,3 @@
-import type { Readable } from 'stream';
-
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,9 +7,10 @@ import type {
 	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { BINARY_ENCODING, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import type { Readable } from 'stream';
 
-import { appendAttributionOption } from '../../utils/descriptions';
 import { addAdditionalFields, apiRequest, getPropertyName } from './GenericFunctions';
+import { appendAttributionOption } from '../../utils/descriptions';
 
 export class Telegram implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts b/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts
index 69d037c79c617..85752afbeb5f7 100644
--- a/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts
+++ b/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts
@@ -10,7 +10,6 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { apiRequest, getImageBySize, getSecretToken } from './GenericFunctions';
-
 import type { IEvent } from './IEvent';
 
 export class TelegramTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Telegram/tests/Workflow/workflow.test.ts b/packages/nodes-base/nodes/Telegram/tests/Workflow/workflow.test.ts
index de17adf1dbd1f..ad6a04dba30ea 100644
--- a/packages/nodes-base/nodes/Telegram/tests/Workflow/workflow.test.ts
+++ b/packages/nodes-base/nodes/Telegram/tests/Workflow/workflow.test.ts
@@ -1,7 +1,4 @@
 import nock from 'nock';
-import { FAKE_CREDENTIALS_DATA } from '../../../../test/nodes/FakeCredentialsMap';
-
-import { getWorkflowFilenames, testWorkflows } from '../../../../test/nodes/Helpers';
 
 import {
 	getChatResponse,
@@ -16,6 +13,8 @@ import {
 	sendAudioResponse,
 	getMemberResponse,
 } from './apiResponses';
+import { FAKE_CREDENTIALS_DATA } from '../../../../test/nodes/FakeCredentialsMap';
+import { getWorkflowFilenames, testWorkflows } from '../../../../test/nodes/Helpers';
 
 describe('Telegram', () => {
 	describe('Run Telegram workflow', () => {
diff --git a/packages/nodes-base/nodes/TheHive/GenericFunctions.ts b/packages/nodes-base/nodes/TheHive/GenericFunctions.ts
index ab9a4cd445830..6c3c99d3630af 100644
--- a/packages/nodes-base/nodes/TheHive/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/TheHive/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IHookFunctions,
@@ -8,7 +9,6 @@ import type {
 } from 'n8n-workflow';
 import { ApplicationError, jsonParse } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import { Eq } from './QueryFunctions';
 
 export async function theHiveApiRequest(
diff --git a/packages/nodes-base/nodes/TheHive/TheHive.node.ts b/packages/nodes-base/nodes/TheHive/TheHive.node.ts
index e4051914230ff..26946664a8d84 100644
--- a/packages/nodes-base/nodes/TheHive/TheHive.node.ts
+++ b/packages/nodes-base/nodes/TheHive/TheHive.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable @typescript-eslint/dot-notation */
+import set from 'lodash/set';
 import {
 	NodeConnectionType,
 	type IDataObject,
@@ -12,20 +13,11 @@ import {
 	type INodeTypeDescription,
 } from 'n8n-workflow';
 
-import set from 'lodash/set';
 import { alertFields, alertOperations } from './descriptions/AlertDescription';
-
-import { observableFields, observableOperations } from './descriptions/ObservableDescription';
-
 import { caseFields, caseOperations } from './descriptions/CaseDescription';
-
-import { taskFields, taskOperations } from './descriptions/TaskDescription';
-
 import { logFields, logOperations } from './descriptions/LogDescription';
-
-import type { IQueryObject } from './QueryFunctions';
-import { And, Between, ContainsString, Eq, Id, In, Parent } from './QueryFunctions';
-
+import { observableFields, observableOperations } from './descriptions/ObservableDescription';
+import { taskFields, taskOperations } from './descriptions/TaskDescription';
 import {
 	buildCustomFieldSearch,
 	mapResource,
@@ -36,6 +28,8 @@ import {
 	splitTags,
 	theHiveApiRequest,
 } from './GenericFunctions';
+import type { IQueryObject } from './QueryFunctions';
+import { And, Between, ContainsString, Eq, Id, In, Parent } from './QueryFunctions';
 
 export class TheHive implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.ts b/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.ts
index 7cc84868c1d3e..6c7b2ce8bfa11 100644
--- a/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.ts
+++ b/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.ts
@@ -7,6 +7,7 @@ import {
 	type IWebhookResponseData,
 	NodeConnectionType,
 } from 'n8n-workflow';
+
 import { eventsDescription } from './descriptions/EventsDescription';
 
 export class TheHiveTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/TheHive/interfaces/CaseInterface.ts b/packages/nodes-base/nodes/TheHive/interfaces/CaseInterface.ts
index 297ae58f5185f..3eeee45b48138 100644
--- a/packages/nodes-base/nodes/TheHive/interfaces/CaseInterface.ts
+++ b/packages/nodes-base/nodes/TheHive/interfaces/CaseInterface.ts
@@ -1,4 +1,5 @@
 import type { IDataObject } from 'n8n-workflow';
+
 import type { TLP } from './AlertInterface';
 export interface ICase {
 	// Required attributes
diff --git a/packages/nodes-base/nodes/TheHiveProject/TheHiveProjectTrigger.node.ts b/packages/nodes-base/nodes/TheHiveProject/TheHiveProjectTrigger.node.ts
index 5550fdf201cb8..6df7b41d65fdf 100644
--- a/packages/nodes-base/nodes/TheHiveProject/TheHiveProjectTrigger.node.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/TheHiveProjectTrigger.node.ts
@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import {
 	type IWebhookFunctions,
 	type IDataObject,
@@ -8,8 +9,6 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
 export class TheHiveProjectTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'TheHive 5 Trigger',
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/create.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/create.operation.ts
index e7a6fc6f9e955..3361088fb22c0 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/alert/create.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/create.operation.ts
@@ -1,3 +1,5 @@
+import FormData from 'form-data';
+import set from 'lodash/set';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -5,13 +7,11 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import set from 'lodash/set';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
-import FormData from 'form-data';
-import { theHiveApiRequest } from '../../transport';
-import { fixFieldType, prepareInputItem, splitAndTrim } from '../../helpers/utils';
 import { observableTypeOptions } from '../../descriptions';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
+import { fixFieldType, prepareInputItem, splitAndTrim } from '../../helpers/utils';
+import { theHiveApiRequest } from '../../transport';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/deleteAlert.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/deleteAlert.operation.ts
index 2e914b5f58ea1..bc92d468328aa 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/alert/deleteAlert.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/deleteAlert.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { alertRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { alertRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [alertRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/executeResponder.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/executeResponder.operation.ts
index 4a5712152ab6a..e7282c2366d50 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/alert/executeResponder.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/executeResponder.operation.ts
@@ -4,9 +4,11 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
 import { alertRLC, responderOptions } from '../../descriptions';
 import { theHiveApiRequest } from '../../transport';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [{ ...alertRLC, name: 'id' }, responderOptions];
 
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/get.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/get.operation.ts
index f634780025810..27429580e5979 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/alert/get.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/get.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { alertRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { alertRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	alertRLC,
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/index.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/index.ts
index 4e3801bf7cfab..e1550561d8e44 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/alert/index.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/index.ts
@@ -1,13 +1,13 @@
 import type { INodeProperties } from 'n8n-workflow';
 
 import * as create from './create.operation';
-import * as executeResponder from './executeResponder.operation';
 import * as deleteAlert from './deleteAlert.operation';
+import * as executeResponder from './executeResponder.operation';
 import * as get from './get.operation';
-import * as search from './search.operation';
-import * as status from './status.operation';
 import * as merge from './merge.operation';
 import * as promote from './promote.operation';
+import * as search from './search.operation';
+import * as status from './status.operation';
 import * as update from './update.operation';
 
 export { create, executeResponder, deleteAlert, get, search, status, merge, promote, update };
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/merge.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/merge.operation.ts
index 9be2833a4e47a..1be21dc2258c6 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/alert/merge.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/merge.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { alertRLC, caseRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { alertRLC, caseRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [alertRLC, caseRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/promote.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/promote.operation.ts
index d59821e8f68bf..4dfb9bb997fe3 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/alert/promote.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/promote.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { alertRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { alertRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	alertRLC,
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/search.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/search.operation.ts
index f74cb70b9a705..c5e80c24f89d5 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/alert/search.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/search.operation.ts
@@ -4,6 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
 import {
 	genericFiltersCollection,
 	returnAllAndLimit,
@@ -11,7 +14,6 @@ import {
 	sortCollection,
 } from '../../descriptions';
 import { theHiveApiQuery } from '../../transport';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	...returnAllAndLimit,
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/status.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/status.operation.ts
index 5244b79dfb380..0835ff91c196a 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/alert/status.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/status.operation.ts
@@ -1,8 +1,10 @@
 import type { INodeExecutionData, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { alertRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { alertRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	alertRLC,
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/update.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/update.operation.ts
index aaf0b398ed36f..a57cb4f3d769a 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/alert/update.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/update.operation.ts
@@ -1,3 +1,4 @@
+import set from 'lodash/set';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -5,11 +6,12 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import set from 'lodash/set';
-import { theHiveApiRequest } from '../../transport';
-import { fixFieldType, prepareInputItem } from '../../helpers/utils';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { fixFieldType, prepareInputItem } from '../../helpers/utils';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	{
 		displayName: 'Fields',
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/addAttachment.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/addAttachment.operation.ts
index cae32b71b5e75..c62eeb3b95498 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/addAttachment.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/addAttachment.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { attachmentsUi, caseRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { attachmentsUi, caseRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	caseRLC,
 	attachmentsUi,
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/create.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/create.operation.ts
index 7e212c3c62329..fe9973ac36734 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/create.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/create.operation.ts
@@ -1,3 +1,4 @@
+import set from 'lodash/set';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -5,11 +6,10 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import set from 'lodash/set';
-import { theHiveApiRequest } from '../../transport';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 import { fixFieldType, prepareInputItem } from '../../helpers/utils';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
+import { theHiveApiRequest } from '../../transport';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/deleteAttachment.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/deleteAttachment.operation.ts
index 7491cfcb51884..013092454fd26 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/deleteAttachment.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/deleteAttachment.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { caseRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { caseRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	caseRLC,
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/deleteCase.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/deleteCase.operation.ts
index 077b45ad9b4fc..c46a2558bf384 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/deleteCase.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/deleteCase.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { caseRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { caseRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [caseRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/executeResponder.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/executeResponder.operation.ts
index 3132266005317..d9d4c1c3d6873 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/executeResponder.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/executeResponder.operation.ts
@@ -4,9 +4,11 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
 import { caseRLC, responderOptions } from '../../descriptions';
 import { theHiveApiRequest } from '../../transport';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [{ ...caseRLC, name: 'id' }, responderOptions];
 
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/get.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/get.operation.ts
index 2c516f05ab377..fbb2e7d196ae0 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/get.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/get.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { caseRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { caseRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [caseRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/getAttachment.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/getAttachment.operation.ts
index 0a3566f154ffc..55e8696300e00 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/getAttachment.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/getAttachment.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { caseRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { caseRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	caseRLC,
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/getTimeline.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/getTimeline.operation.ts
index 3b945856f9b66..6a5584810d202 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/getTimeline.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/getTimeline.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { caseRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { caseRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [caseRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/index.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/index.ts
index 9a2ec7c3ae12a..9031d8592d760 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/index.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/index.ts
@@ -1,15 +1,14 @@
 import type { INodeProperties } from 'n8n-workflow';
 
 import * as addAttachment from './addAttachment.operation';
-
 import * as create from './create.operation';
 import * as deleteAttachment from './deleteAttachment.operation';
 import * as deleteCase from './deleteCase.operation';
 import * as executeResponder from './executeResponder.operation';
 import * as get from './get.operation';
 import * as getAttachment from './getAttachment.operation';
-import * as search from './search.operation';
 import * as getTimeline from './getTimeline.operation';
+import * as search from './search.operation';
 import * as update from './update.operation';
 
 export {
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/search.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/search.operation.ts
index c7f44f5e40f6b..dccfda95eefcc 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/search.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/search.operation.ts
@@ -4,6 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
 import {
 	genericFiltersCollection,
 	returnAllAndLimit,
@@ -11,7 +14,6 @@ import {
 	sortCollection,
 } from '../../descriptions';
 import { theHiveApiQuery } from '../../transport';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	...returnAllAndLimit,
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/update.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/update.operation.ts
index 4b3539bc2e7fe..dc25891740309 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/update.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/update.operation.ts
@@ -1,3 +1,4 @@
+import set from 'lodash/set';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -5,11 +6,12 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import set from 'lodash/set';
-import { theHiveApiRequest } from '../../transport';
-import { fixFieldType, prepareInputItem } from '../../helpers/utils';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { fixFieldType, prepareInputItem } from '../../helpers/utils';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	{
 		displayName: 'Fields',
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/comment/add.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/comment/add.operation.ts
index 572db219591dc..bc689dd55346d 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/comment/add.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/comment/add.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { alertRLC, caseRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { alertRLC, caseRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	{
 		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/comment/deleteComment.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/comment/deleteComment.operation.ts
index e178729c61e8f..e483422b14bb2 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/comment/deleteComment.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/comment/deleteComment.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { commentRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { commentRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [commentRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/comment/search.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/comment/search.operation.ts
index 86bcd95d6178b..17d6c6ee7805a 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/comment/search.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/comment/search.operation.ts
@@ -5,6 +5,9 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
 import {
 	alertRLC,
 	caseRLC,
@@ -13,9 +16,8 @@ import {
 	searchOptions,
 	sortCollection,
 } from '../../descriptions';
-import { theHiveApiQuery } from '../../transport';
 import type { QueryScope } from '../../helpers/interfaces';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
+import { theHiveApiQuery } from '../../transport';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/comment/update.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/comment/update.operation.ts
index 5379ce91a4e3a..ac3084f704cdd 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/comment/update.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/comment/update.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { commentRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { commentRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	commentRLC,
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/log/addAttachment.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/log/addAttachment.operation.ts
index 31e84c5dc914a..5226f8429572b 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/log/addAttachment.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/log/addAttachment.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { attachmentsUi, logRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { attachmentsUi, logRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [logRLC, attachmentsUi];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/log/create.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/log/create.operation.ts
index 2f73eeaed08cc..859e6ee00a975 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/log/create.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/log/create.operation.ts
@@ -5,11 +5,11 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { theHiveApiRequest } from '../../transport';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
-import { fixFieldType, prepareInputItem } from '../../helpers/utils';
 import { attachmentsUi, taskRLC } from '../../descriptions';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
+import { fixFieldType, prepareInputItem } from '../../helpers/utils';
+import { theHiveApiRequest } from '../../transport';
 
 const properties: INodeProperties[] = [
 	taskRLC,
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/log/deleteAttachment.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/log/deleteAttachment.operation.ts
index 017d7b499923a..8766b0c3da8d1 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/log/deleteAttachment.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/log/deleteAttachment.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { logRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { logRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	logRLC,
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/log/deleteLog.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/log/deleteLog.operation.ts
index 44fb4e5aed139..db1df28fd9288 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/log/deleteLog.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/log/deleteLog.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { logRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { logRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [logRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/log/executeResponder.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/log/executeResponder.operation.ts
index 8eceb9660b08d..76b3f69d7299f 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/log/executeResponder.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/log/executeResponder.operation.ts
@@ -4,9 +4,11 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
 import { logRLC, responderOptions } from '../../descriptions';
 import { theHiveApiRequest } from '../../transport';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [{ ...logRLC, name: 'id' }, responderOptions];
 
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/log/get.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/log/get.operation.ts
index b110db32aca09..993b916869c57 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/log/get.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/log/get.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { logRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { logRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [logRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/log/search.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/log/search.operation.ts
index 9aed5104042bc..8cb49fbfcac11 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/log/search.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/log/search.operation.ts
@@ -4,6 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
 import {
 	taskRLC,
 	genericFiltersCollection,
@@ -11,9 +14,8 @@ import {
 	sortCollection,
 	searchOptions,
 } from '../../descriptions';
-import { theHiveApiQuery } from '../../transport';
 import type { QueryScope } from '../../helpers/interfaces';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
+import { theHiveApiQuery } from '../../transport';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/node.description.ts b/packages/nodes-base/nodes/TheHiveProject/actions/node.description.ts
index bd6ca8cf59e96..9763d3e46d536 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/node.description.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/node.description.ts
@@ -6,9 +6,9 @@ import * as case_ from './case';
 import * as comment from './comment';
 import * as log from './log';
 import * as observable from './observable';
+import * as page from './page';
 import * as query from './query';
 import * as task from './task';
-import * as page from './page';
 
 export const description: INodeTypeDescription = {
 	displayName: 'TheHive 5',
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/observable/create.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/observable/create.operation.ts
index ba515bbb78ae9..889422f45beae 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/observable/create.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/observable/create.operation.ts
@@ -1,3 +1,4 @@
+import FormData from 'form-data';
 import {
 	NodeOperationError,
 	type IDataObject,
@@ -5,13 +6,13 @@ import {
 	type INodeExecutionData,
 	type INodeProperties,
 } from 'n8n-workflow';
-import FormData from 'form-data';
-import { theHiveApiRequest } from '../../transport';
 
-import { fixFieldType, prepareInputItem } from '../../helpers/utils';
-import { alertRLC, attachmentsUi, caseRLC } from '../../descriptions';
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { alertRLC, attachmentsUi, caseRLC } from '../../descriptions';
+import { fixFieldType, prepareInputItem } from '../../helpers/utils';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	{
 		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/observable/deleteObservable.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/observable/deleteObservable.operation.ts
index e8e6567b5afde..b1cf8fe0a111c 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/observable/deleteObservable.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/observable/deleteObservable.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { observableRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { observableRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [observableRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeAnalyzer.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeAnalyzer.operation.ts
index 54deac7c0b6f7..f547b67a70264 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeAnalyzer.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeAnalyzer.operation.ts
@@ -4,9 +4,11 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
 import { observableRLC, observableTypeOptions } from '../../descriptions';
 import { theHiveApiRequest } from '../../transport';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	observableRLC,
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeResponder.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeResponder.operation.ts
index 5f75bc93676ef..a02da30cdb052 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeResponder.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeResponder.operation.ts
@@ -4,9 +4,11 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
 import { observableRLC, responderOptions } from '../../descriptions';
 import { theHiveApiRequest } from '../../transport';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [{ ...observableRLC, name: 'id' }, responderOptions];
 
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/observable/get.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/observable/get.operation.ts
index 7dc729b56d39c..1d540732e371f 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/observable/get.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/observable/get.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { observableRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { observableRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [observableRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/observable/search.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/observable/search.operation.ts
index e27c8e8331c9b..1975fbb36ba43 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/observable/search.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/observable/search.operation.ts
@@ -5,6 +5,9 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
 import {
 	alertRLC,
 	caseRLC,
@@ -13,9 +16,8 @@ import {
 	searchOptions,
 	sortCollection,
 } from '../../descriptions';
-import { theHiveApiQuery } from '../../transport';
 import type { QueryScope } from '../../helpers/interfaces';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
+import { theHiveApiQuery } from '../../transport';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/observable/update.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/observable/update.operation.ts
index 9c3ef4243f880..3680aeefc9a2f 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/observable/update.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/observable/update.operation.ts
@@ -1,3 +1,4 @@
+import set from 'lodash/set';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -5,11 +6,12 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import set from 'lodash/set';
-import { theHiveApiRequest } from '../../transport';
-import { fixFieldType, prepareInputItem } from '../../helpers/utils';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { fixFieldType, prepareInputItem } from '../../helpers/utils';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	{
 		displayName: 'Fields',
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/page/create.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/page/create.operation.ts
index 0c2531d8df060..ab773de4ccf6c 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/page/create.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/page/create.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { caseRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { caseRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	{
 		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/page/deletePage.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/page/deletePage.operation.ts
index 3522404168119..84967ae027059 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/page/deletePage.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/page/deletePage.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { caseRLC, pageRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { caseRLC, pageRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	{
 		displayName: 'Delete From ...',
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/page/search.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/page/search.operation.ts
index 796da7b682a90..b060f3cbd0d4a 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/page/search.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/page/search.operation.ts
@@ -4,6 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
 import {
 	caseRLC,
 	genericFiltersCollection,
@@ -11,9 +14,8 @@ import {
 	sortCollection,
 	searchOptions,
 } from '../../descriptions';
-import { theHiveApiQuery } from '../../transport';
 import type { QueryScope } from '../../helpers/interfaces';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
+import { theHiveApiQuery } from '../../transport';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/page/update.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/page/update.operation.ts
index 8d41f9ba97be5..f03f17ec4169b 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/page/update.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/page/update.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { caseRLC, pageRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { caseRLC, pageRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	{
 		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/query/executeQuery.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/query/executeQuery.operation.ts
index f4772aacad363..e96e195cae805 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/query/executeQuery.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/query/executeQuery.operation.ts
@@ -6,9 +6,10 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError, jsonParse } from 'n8n-workflow';
 
-import { theHiveApiRequest } from '../../transport';
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	{
 		displayName: 'Query',
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/router.ts b/packages/nodes-base/nodes/TheHiveProject/actions/router.ts
index 03fe0a25e4e28..b6ac961627ce3 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/router.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/router.ts
@@ -1,11 +1,11 @@
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import type { TheHiveType } from './node.type';
 
 import * as alert from './alert';
 import * as case_ from './case';
 import * as comment from './comment';
 import * as log from './log';
+import type { TheHiveType } from './node.type';
 import * as observable from './observable';
 import * as page from './page';
 import * as query from './query';
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/task/create.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/task/create.operation.ts
index 414549e6904f7..a04c6c24f178c 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/task/create.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/task/create.operation.ts
@@ -5,11 +5,11 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { theHiveApiRequest } from '../../transport';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
-import { fixFieldType, prepareInputItem } from '../../helpers/utils';
 import { caseRLC } from '../../descriptions';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
+import { fixFieldType, prepareInputItem } from '../../helpers/utils';
+import { theHiveApiRequest } from '../../transport';
 
 const properties: INodeProperties[] = [
 	caseRLC,
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/task/deleteTask.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/task/deleteTask.operation.ts
index 213e4794cfb73..62c44daba25ab 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/task/deleteTask.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/task/deleteTask.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { taskRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { taskRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [taskRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/task/executeResponder.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/task/executeResponder.operation.ts
index d3f540baadb34..eb767ecbb4a68 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/task/executeResponder.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/task/executeResponder.operation.ts
@@ -4,9 +4,11 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
 import { responderOptions, taskRLC } from '../../descriptions';
 import { theHiveApiRequest } from '../../transport';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [{ ...taskRLC, name: 'id' }, responderOptions];
 
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/task/get.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/task/get.operation.ts
index f88853e614f2e..ec4f0ef35f933 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/task/get.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/task/get.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { taskRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { taskRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [taskRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/task/search.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/task/search.operation.ts
index 0954fc8856844..ce7d00e8e7e2c 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/task/search.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/task/search.operation.ts
@@ -4,6 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
 import {
 	caseRLC,
 	genericFiltersCollection,
@@ -11,9 +14,8 @@ import {
 	searchOptions,
 	sortCollection,
 } from '../../descriptions';
-import { theHiveApiQuery } from '../../transport';
 import type { QueryScope } from '../../helpers/interfaces';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
+import { theHiveApiQuery } from '../../transport';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/task/update.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/task/update.operation.ts
index 80875d27f64aa..c5a26fefcb80f 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/task/update.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/task/update.operation.ts
@@ -1,3 +1,4 @@
+import set from 'lodash/set';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -5,11 +6,12 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import set from 'lodash/set';
-import { theHiveApiRequest } from '../../transport';
-import { fixFieldType, prepareInputItem } from '../../helpers/utils';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { fixFieldType, prepareInputItem } from '../../helpers/utils';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	{
 		displayName: 'Fields',
diff --git a/packages/nodes-base/nodes/TheHiveProject/descriptions/common.description.ts b/packages/nodes-base/nodes/TheHiveProject/descriptions/common.description.ts
index 7a7d316a78e39..5653375dd4636 100644
--- a/packages/nodes-base/nodes/TheHiveProject/descriptions/common.description.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/descriptions/common.description.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { TLP } from '../helpers/interfaces';
 
 export const returnAllAndLimit: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/TheHiveProject/helpers/utils.ts b/packages/nodes-base/nodes/TheHiveProject/helpers/utils.ts
index 8c392043b8f1c..b4768123a2ca7 100644
--- a/packages/nodes-base/nodes/TheHiveProject/helpers/utils.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/helpers/utils.ts
@@ -1,7 +1,6 @@
-import { ApplicationError, type IDataObject } from 'n8n-workflow';
-
 import get from 'lodash/get';
 import set from 'lodash/set';
+import { ApplicationError, type IDataObject } from 'n8n-workflow';
 
 export function splitAndTrim(str: string | string[]) {
 	if (typeof str === 'string') {
diff --git a/packages/nodes-base/nodes/TheHiveProject/methods/listSearch.ts b/packages/nodes-base/nodes/TheHiveProject/methods/listSearch.ts
index ce35c11a485c5..cd3ca6d9abcaf 100644
--- a/packages/nodes-base/nodes/TheHiveProject/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/methods/listSearch.ts
@@ -1,4 +1,5 @@
 import type { IDataObject, ILoadOptionsFunctions, INodeListSearchResult } from 'n8n-workflow';
+
 import { theHiveApiRequest } from '../transport';
 
 async function listResource(
diff --git a/packages/nodes-base/nodes/TheHiveProject/methods/loadOptions.ts b/packages/nodes-base/nodes/TheHiveProject/methods/loadOptions.ts
index 3e7c925257857..7884b78104838 100644
--- a/packages/nodes-base/nodes/TheHiveProject/methods/loadOptions.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/methods/loadOptions.ts
@@ -1,11 +1,12 @@
 import type { IDataObject, ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
-import { theHiveApiRequest } from '../transport';
+
 import {
 	alertCommonFields,
 	caseCommonFields,
 	observableCommonFields,
 	taskCommonFields,
 } from '../helpers/constants';
+import { theHiveApiRequest } from '../transport';
 
 export async function loadResponders(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 	let resource = this.getNodeParameter('resource') as string;
diff --git a/packages/nodes-base/nodes/TheHiveProject/methods/resourceMapping.ts b/packages/nodes-base/nodes/TheHiveProject/methods/resourceMapping.ts
index 84703409ba0fd..59c5636091feb 100644
--- a/packages/nodes-base/nodes/TheHiveProject/methods/resourceMapping.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/methods/resourceMapping.ts
@@ -6,14 +6,6 @@ import type {
 	ResourceMapperFields,
 } from 'n8n-workflow';
 
-import { theHiveApiRequest } from '../transport';
-
-import {
-	alertCommonFields,
-	caseCommonFields,
-	observableCommonFields,
-	taskCommonFields,
-} from '../helpers/constants';
 import {
 	loadAlertStatus,
 	loadCaseStatus,
@@ -21,6 +13,13 @@ import {
 	loadObservableTypes,
 	loadUsers,
 } from './loadOptions';
+import {
+	alertCommonFields,
+	caseCommonFields,
+	observableCommonFields,
+	taskCommonFields,
+} from '../helpers/constants';
+import { theHiveApiRequest } from '../transport';
 
 async function getCustomFields(this: ILoadOptionsFunctions) {
 	const customFields = (await theHiveApiRequest.call(this, 'POST', '/v1/query', {
diff --git a/packages/nodes-base/nodes/TheHiveProject/test/transport.test.ts b/packages/nodes-base/nodes/TheHiveProject/test/transport.test.ts
index 442cb2739fe6e..0d370dc67504a 100644
--- a/packages/nodes-base/nodes/TheHiveProject/test/transport.test.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/test/transport.test.ts
@@ -1,8 +1,8 @@
 import type { IExecuteFunctions } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../transport/requestApi';
 
 import { theHiveApiQuery } from '../transport/queryHelper';
+import * as transport from '../transport/requestApi';
 
 jest.mock('../transport/requestApi', () => {
 	const originalModule = jest.requireActual('../transport/requestApi');
diff --git a/packages/nodes-base/nodes/TheHiveProject/transport/queryHelper.ts b/packages/nodes-base/nodes/TheHiveProject/transport/queryHelper.ts
index 69cd05f3e830a..28d5f67408a0d 100644
--- a/packages/nodes-base/nodes/TheHiveProject/transport/queryHelper.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/transport/queryHelper.ts
@@ -1,8 +1,8 @@
 import type { IExecuteFunctions, IDataObject } from 'n8n-workflow';
 
+import { theHiveApiRequest } from './requestApi';
 import type { QueryScope } from '../helpers/interfaces';
 import { constructFilter } from '../helpers/utils';
-import { theHiveApiRequest } from './requestApi';
 
 export async function theHiveApiQuery(
 	this: IExecuteFunctions,
diff --git a/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts b/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts
index 15461efdf4ffc..f485f9c8debee 100644
--- a/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts
+++ b/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts
@@ -5,8 +5,8 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-
 import pgPromise from 'pg-promise';
+
 import { pgInsert, pgQueryV2, pgUpdate } from '../Postgres/v1/genericFunctions';
 
 export class TimescaleDb implements INodeType {
diff --git a/packages/nodes-base/nodes/Todoist/v1/OperationHandler.ts b/packages/nodes-base/nodes/Todoist/v1/OperationHandler.ts
index b4cd4f2ec1b57..d2c48a5d072bd 100644
--- a/packages/nodes-base/nodes/Todoist/v1/OperationHandler.ts
+++ b/packages/nodes-base/nodes/Todoist/v1/OperationHandler.ts
@@ -1,9 +1,10 @@
 import type { IDataObject } from 'n8n-workflow';
 import { ApplicationError, jsonParse } from 'n8n-workflow';
 import { v4 as uuid } from 'uuid';
+
+import type { Section, TodoistResponse } from './Service';
 import type { Context } from '../GenericFunctions';
 import { FormatDueDatetime, todoistApiRequest, todoistSyncRequest } from '../GenericFunctions';
-import type { Section, TodoistResponse } from './Service';
 
 export interface OperationHandler {
 	handleOperation(ctx: Context, itemIndex: number): Promise<TodoistResponse>;
diff --git a/packages/nodes-base/nodes/Todoist/v1/Service.ts b/packages/nodes-base/nodes/Todoist/v1/Service.ts
index fa5112a5bffd0..348f6a1e7de36 100644
--- a/packages/nodes-base/nodes/Todoist/v1/Service.ts
+++ b/packages/nodes-base/nodes/Todoist/v1/Service.ts
@@ -1,5 +1,5 @@
 import type { IDataObject } from 'n8n-workflow';
-import type { Context } from '../GenericFunctions';
+
 import {
 	CloseHandler,
 	CreateHandler,
@@ -11,6 +11,7 @@ import {
 	SyncHandler,
 	UpdateHandler,
 } from './OperationHandler';
+import type { Context } from '../GenericFunctions';
 
 export class TodoistService implements Service {
 	async execute(
diff --git a/packages/nodes-base/nodes/Todoist/v1/TodoistV1.node.ts b/packages/nodes-base/nodes/Todoist/v1/TodoistV1.node.ts
index fccfa3f67985c..40ebfad5a32a0 100644
--- a/packages/nodes-base/nodes/Todoist/v1/TodoistV1.node.ts
+++ b/packages/nodes-base/nodes/Todoist/v1/TodoistV1.node.ts
@@ -11,10 +11,9 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { todoistApiRequest } from '../GenericFunctions';
-
 import type { OperationType } from './Service';
 import { TodoistService } from './Service';
+import { todoistApiRequest } from '../GenericFunctions';
 
 // interface IBodyCreateTask {
 // 	content?: string;
diff --git a/packages/nodes-base/nodes/Todoist/v2/OperationHandler.ts b/packages/nodes-base/nodes/Todoist/v2/OperationHandler.ts
index a1b706cac169f..d1b3009a9fb82 100644
--- a/packages/nodes-base/nodes/Todoist/v2/OperationHandler.ts
+++ b/packages/nodes-base/nodes/Todoist/v2/OperationHandler.ts
@@ -1,9 +1,10 @@
 import type { IDataObject } from 'n8n-workflow';
 import { ApplicationError, jsonParse } from 'n8n-workflow';
 import { v4 as uuid } from 'uuid';
+
+import type { Section, TodoistResponse } from './Service';
 import type { Context } from '../GenericFunctions';
 import { FormatDueDatetime, todoistApiRequest, todoistSyncRequest } from '../GenericFunctions';
-import type { Section, TodoistResponse } from './Service';
 
 export interface OperationHandler {
 	handleOperation(ctx: Context, itemIndex: number): Promise<TodoistResponse>;
diff --git a/packages/nodes-base/nodes/Todoist/v2/Service.ts b/packages/nodes-base/nodes/Todoist/v2/Service.ts
index b9fdb75ec3363..cd6fb5f1b9e33 100644
--- a/packages/nodes-base/nodes/Todoist/v2/Service.ts
+++ b/packages/nodes-base/nodes/Todoist/v2/Service.ts
@@ -1,5 +1,5 @@
 import type { IDataObject } from 'n8n-workflow';
-import type { Context } from '../GenericFunctions';
+
 import {
 	CloseHandler,
 	CreateHandler,
@@ -11,6 +11,7 @@ import {
 	SyncHandler,
 	UpdateHandler,
 } from './OperationHandler';
+import type { Context } from '../GenericFunctions';
 
 export class TodoistService implements Service {
 	async execute(
diff --git a/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts b/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts
index 585b205e0b094..57812697a0a8d 100644
--- a/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts
+++ b/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts
@@ -11,10 +11,9 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { todoistApiRequest } from '../GenericFunctions';
-
 import type { OperationType, TodoistProjectType } from './Service';
 import { TodoistService } from './Service';
+import { todoistApiRequest } from '../GenericFunctions';
 
 // interface IBodyCreateTask {
 // 	content?: string;
diff --git a/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts b/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts
index bfa368c1c487f..dbaf861ad0b2a 100644
--- a/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts
+++ b/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts
@@ -1,3 +1,5 @@
+import { DateTime } from 'luxon';
+import moment from 'moment-timezone';
 import type {
 	IPollFunctions,
 	IDataObject,
@@ -8,8 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-import { DateTime } from 'luxon';
 import { togglApiRequest } from './GenericFunctions';
 
 export class TogglTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Totp/Totp.node.ts b/packages/nodes-base/nodes/Totp/Totp.node.ts
index 60196b9b67546..191e4486b4abe 100644
--- a/packages/nodes-base/nodes/Totp/Totp.node.ts
+++ b/packages/nodes-base/nodes/Totp/Totp.node.ts
@@ -4,9 +4,7 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-
 import OTPAuth from 'otpauth';
 
 export class Totp implements INodeType {
diff --git a/packages/nodes-base/nodes/Totp/test/Totp.node.test.ts b/packages/nodes-base/nodes/Totp/test/Totp.node.test.ts
index f454daeba325d..f3ada2fa363f3 100644
--- a/packages/nodes-base/nodes/Totp/test/Totp.node.test.ts
+++ b/packages/nodes-base/nodes/Totp/test/Totp.node.test.ts
@@ -1,5 +1,5 @@
-import * as Helpers from '@test/nodes/Helpers';
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+import * as Helpers from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
 
 jest.mock('otpauth', () => {
diff --git a/packages/nodes-base/nodes/Transform/Aggregate/Aggregate.node.ts b/packages/nodes-base/nodes/Transform/Aggregate/Aggregate.node.ts
index 711146f74b79f..36791d57f7991 100644
--- a/packages/nodes-base/nodes/Transform/Aggregate/Aggregate.node.ts
+++ b/packages/nodes-base/nodes/Transform/Aggregate/Aggregate.node.ts
@@ -1,7 +1,6 @@
 import get from 'lodash/get';
 import isEmpty from 'lodash/isEmpty';
 import set from 'lodash/set';
-
 import {
 	NodeOperationError,
 	type IDataObject,
@@ -14,8 +13,9 @@ import {
 	type NodeExecutionHint,
 	NodeExecutionOutput,
 } from 'n8n-workflow';
-import { prepareFieldsArray } from '../utils/utils';
+
 import { addBinariesToItem } from './utils';
+import { prepareFieldsArray } from '../utils/utils';
 
 export class Aggregate implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Transform/Sort/Sort.node.ts b/packages/nodes-base/nodes/Transform/Sort/Sort.node.ts
index e2e3fa4f58d3e..38c225d3c75b4 100644
--- a/packages/nodes-base/nodes/Transform/Sort/Sort.node.ts
+++ b/packages/nodes-base/nodes/Transform/Sort/Sort.node.ts
@@ -10,9 +10,11 @@ import {
 	type INodeTypeDescription,
 	NodeConnectionType,
 } from 'n8n-workflow';
-import { sortByCode } from './utils';
+
 import { shuffleArray } from '@utils/utilities';
 
+import { sortByCode } from './utils';
+
 export class Sort implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Sort',
diff --git a/packages/nodes-base/nodes/Transform/SplitOut/SplitOut.node.ts b/packages/nodes-base/nodes/Transform/SplitOut/SplitOut.node.ts
index 5c2a9e3a687b9..57b77527e6e4d 100644
--- a/packages/nodes-base/nodes/Transform/SplitOut/SplitOut.node.ts
+++ b/packages/nodes-base/nodes/Transform/SplitOut/SplitOut.node.ts
@@ -15,6 +15,7 @@ import type {
 	INodeTypeDescription,
 	NodeExecutionHint,
 } from 'n8n-workflow';
+
 import { prepareFieldsArray } from '../utils/utils';
 
 export class SplitOut implements INodeType {
diff --git a/packages/nodes-base/nodes/Transform/Summarize/Summarize.node.ts b/packages/nodes-base/nodes/Transform/Summarize/Summarize.node.ts
index 12d0e06f22dcb..83ded6d7af5e7 100644
--- a/packages/nodes-base/nodes/Transform/Summarize/Summarize.node.ts
+++ b/packages/nodes-base/nodes/Transform/Summarize/Summarize.node.ts
@@ -6,7 +6,7 @@ import {
 	type INodeType,
 	type INodeTypeDescription,
 } from 'n8n-workflow';
-import { generatePairedItemData } from '../../../utils/utilities';
+
 import {
 	type Aggregations,
 	NUMERICAL_AGGREGATIONS,
@@ -16,6 +16,7 @@ import {
 	fieldValueGetter,
 	splitData,
 } from './utils';
+import { generatePairedItemData } from '../../../utils/utilities';
 
 export class Summarize implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts b/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts
index b089998eb812c..b4421dbf54f75 100644
--- a/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -9,8 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
 export async function travisciApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	method: IHttpRequestMethods,
diff --git a/packages/nodes-base/nodes/TravisCi/TravisCi.node.ts b/packages/nodes-base/nodes/TravisCi/TravisCi.node.ts
index fbc109dc8650b..6c6274839bd6f 100644
--- a/packages/nodes-base/nodes/TravisCi/TravisCi.node.ts
+++ b/packages/nodes-base/nodes/TravisCi/TravisCi.node.ts
@@ -8,7 +8,6 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { buildFields, buildOperations } from './BuildDescription';
-
 import { travisciApiRequest, travisciApiRequestAllItems } from './GenericFunctions';
 
 export class TravisCi implements INodeType {
diff --git a/packages/nodes-base/nodes/Trello/Trello.node.ts b/packages/nodes-base/nodes/Trello/Trello.node.ts
index ac599663d7b2c..0554a99939b5f 100644
--- a/packages/nodes-base/nodes/Trello/Trello.node.ts
+++ b/packages/nodes-base/nodes/Trello/Trello.node.ts
@@ -10,22 +10,14 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { apiRequest, apiRequestAllItems } from './GenericFunctions';
-
 import { attachmentFields, attachmentOperations } from './AttachmentDescription';
-
 import { boardFields, boardOperations } from './BoardDescription';
-
 import { boardMemberFields, boardMemberOperations } from './BoardMemberDescription';
-
-import { cardFields, cardOperations } from './CardDescription';
-
 import { cardCommentFields, cardCommentOperations } from './CardCommentDescription';
-
+import { cardFields, cardOperations } from './CardDescription';
 import { checklistFields, checklistOperations } from './ChecklistDescription';
-
+import { apiRequest, apiRequestAllItems } from './GenericFunctions';
 import { labelFields, labelOperations } from './LabelDescription';
-
 import { listFields, listOperations } from './ListDescription';
 
 interface TrelloBoardType {
diff --git a/packages/nodes-base/nodes/Twist/Twist.node.ts b/packages/nodes-base/nodes/Twist/Twist.node.ts
index 16d6d530ea9a4..a11c29c16e352 100644
--- a/packages/nodes-base/nodes/Twist/Twist.node.ts
+++ b/packages/nodes-base/nodes/Twist/Twist.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -8,20 +9,16 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
-
 import { v4 as uuid } from 'uuid';
-import moment from 'moment-timezone';
-import { twistApiRequest } from './GenericFunctions';
 
 import { channelFields, channelOperations } from './ChannelDescription';
-
+import { commentFields, commentOperations } from './CommentDescription';
+import { twistApiRequest } from './GenericFunctions';
 import {
 	messageConversationFields,
 	messageConversationOperations,
 } from './MessageConversationDescription';
-
 import { threadFields, threadOperations } from './ThreadDescription';
-import { commentFields, commentOperations } from './CommentDescription';
 
 export class Twist implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Twitter/Twitter.node.ts b/packages/nodes-base/nodes/Twitter/Twitter.node.ts
index 0cfb9b296b394..92e485d610416 100644
--- a/packages/nodes-base/nodes/Twitter/Twitter.node.ts
+++ b/packages/nodes-base/nodes/Twitter/Twitter.node.ts
@@ -2,7 +2,6 @@ import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow'
 import { VersionedNodeType } from 'n8n-workflow';
 
 import { TwitterV1 } from './V1/TwitterV1.node';
-
 import { TwitterV2 } from './V2/TwitterV2.node';
 
 export class Twitter extends VersionedNodeType {
diff --git a/packages/nodes-base/nodes/Twitter/V1/TwitterV1.node.ts b/packages/nodes-base/nodes/Twitter/V1/TwitterV1.node.ts
index 1b0bfd61c6ad2..7b42390e72561 100644
--- a/packages/nodes-base/nodes/Twitter/V1/TwitterV1.node.ts
+++ b/packages/nodes-base/nodes/Twitter/V1/TwitterV1.node.ts
@@ -1,3 +1,4 @@
+import ISO6391 from 'iso-639-1';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -11,17 +12,13 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import ISO6391 from 'iso-639-1';
 import { directMessageFields, directMessageOperations } from './DirectMessageDescription';
-
-import { tweetFields, tweetOperations } from './TweetDescription';
-
 import {
 	twitterApiRequest,
 	twitterApiRequestAllItems,
 	uploadAttachments,
 } from './GenericFunctions';
-
+import { tweetFields, tweetOperations } from './TweetDescription';
 import type { ITweet, ITweetCreate } from './TweetInterface';
 
 export class TwitterV1 implements INodeType {
diff --git a/packages/nodes-base/nodes/Twitter/V2/TwitterV2.node.ts b/packages/nodes-base/nodes/Twitter/V2/TwitterV2.node.ts
index bf2ea4056861e..e210689346749 100644
--- a/packages/nodes-base/nodes/Twitter/V2/TwitterV2.node.ts
+++ b/packages/nodes-base/nodes/Twitter/V2/TwitterV2.node.ts
@@ -1,3 +1,5 @@
+import ISO6391 from 'iso-639-1';
+import { DateTime } from 'luxon';
 import {
 	NodeConnectionType,
 	type IDataObject,
@@ -12,19 +14,16 @@ import {
 	type JsonObject,
 } from 'n8n-workflow';
 
-import ISO6391 from 'iso-639-1';
-import { DateTime } from 'luxon';
 import { directMessageFields, directMessageOperations } from './DirectMessageDescription';
-import { listFields, listOperations } from './ListDescription';
-import { tweetFields, tweetOperations } from './TweetDescription';
-import { userFields, userOperations } from './UserDescription';
-
 import {
 	returnId,
 	returnIdFromUsername,
 	twitterApiRequest,
 	twitterApiRequestAllItems,
 } from './GenericFunctions';
+import { listFields, listOperations } from './ListDescription';
+import { tweetFields, tweetOperations } from './TweetDescription';
+import { userFields, userOperations } from './UserDescription';
 
 export class TwitterV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/Twitter/test/Twitter.test.ts b/packages/nodes-base/nodes/Twitter/test/Twitter.test.ts
index fc7486ce57d4b..b653d691fe065 100644
--- a/packages/nodes-base/nodes/Twitter/test/Twitter.test.ts
+++ b/packages/nodes-base/nodes/Twitter/test/Twitter.test.ts
@@ -1,8 +1,10 @@
-import nock from 'nock';
 import type { INodeParameterResourceLocator } from 'n8n-workflow';
-import { returnId } from '../V2/GenericFunctions';
+import nock from 'nock';
+
 import { getWorkflowFilenames, testWorkflows } from '@test/nodes/Helpers';
 
+import { returnId } from '../V2/GenericFunctions';
+
 const searchResult = {
 	data: [
 		{
diff --git a/packages/nodes-base/nodes/UProc/ToolDescription.ts b/packages/nodes-base/nodes/UProc/ToolDescription.ts
index 0a6cd206a9b71..4be6f454a4b42 100644
--- a/packages/nodes-base/nodes/UProc/ToolDescription.ts
+++ b/packages/nodes-base/nodes/UProc/ToolDescription.ts
@@ -2,7 +2,6 @@ import type { IDataObject, INodeProperties } from 'n8n-workflow';
 import { deepCopy } from 'n8n-workflow';
 
 import { groups } from './Json/Groups';
-
 import { tools } from './Json/Tools';
 
 function capitalize(str: string): string {
@@ -75,10 +74,7 @@ for (const tool of (tools as IDataObject).processors as IDataObject[]) {
 			options: param.o,
 			displayOptions: {
 				show: {
-					group: [
-						//@ts-ignore
-						tool.g,
-					],
+					group: [tool.g],
 					tool: [tool.k],
 				},
 			},
@@ -96,7 +92,6 @@ for (const tool of (tools as IDataObject).processors as IDataObject[]) {
 		//if exists, other wise
 		if (modifiedParam) {
 			//Assign new group and tool
-			//@ts-ignore
 			modifiedParam.displayOptions.show.group.push(tool.g);
 			modifiedParam.displayOptions.show.tool.push(tool.k);
 
diff --git a/packages/nodes-base/nodes/UProc/UProc.node.ts b/packages/nodes-base/nodes/UProc/UProc.node.ts
index f48e2475839ad..2aeccd5e9ffba 100644
--- a/packages/nodes-base/nodes/UProc/UProc.node.ts
+++ b/packages/nodes-base/nodes/UProc/UProc.node.ts
@@ -9,9 +9,7 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { uprocApiRequest } from './GenericFunctions';
-
 import { groupOptions } from './GroupDescription';
-
 import { toolOperations, toolParameters } from './ToolDescription';
 
 export class UProc implements INodeType {
diff --git a/packages/nodes-base/nodes/UnleashedSoftware/GenericFunctions.ts b/packages/nodes-base/nodes/UnleashedSoftware/GenericFunctions.ts
index 23c0b1d8c62a8..52407c6c5eed2 100644
--- a/packages/nodes-base/nodes/UnleashedSoftware/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/UnleashedSoftware/GenericFunctions.ts
@@ -9,7 +9,6 @@ import type {
 	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
-
 import qs from 'qs';
 
 export async function unleashedApiRequest(
diff --git a/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.ts b/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.ts
index 9fd7fd1a97bab..1d6e90a16d721 100644
--- a/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.ts
+++ b/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import {
 	type IExecuteFunctions,
 	type IDataObject,
@@ -7,15 +8,12 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import {
 	convertNETDates,
 	unleashedApiRequest,
 	unleashedApiRequestAllItems,
 } from './GenericFunctions';
-
 import { salesOrderFields, salesOrderOperations } from './SalesOrderDescription';
-
 import { stockOnHandFields, stockOnHandOperations } from './StockOnHandDescription';
 
 export class UnleashedSoftware implements INodeType {
diff --git a/packages/nodes-base/nodes/Uplead/Uplead.node.ts b/packages/nodes-base/nodes/Uplead/Uplead.node.ts
index ca111ca57be60..ffa3df226de95 100644
--- a/packages/nodes-base/nodes/Uplead/Uplead.node.ts
+++ b/packages/nodes-base/nodes/Uplead/Uplead.node.ts
@@ -6,8 +6,9 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
-import { upleadApiRequest } from './GenericFunctions';
+
 import { companyFields, companyOperations } from './CompanyDesciption';
+import { upleadApiRequest } from './GenericFunctions';
 import { personFields, personOperations } from './PersonDescription';
 
 export class Uplead implements INodeType {
diff --git a/packages/nodes-base/nodes/UptimeRobot/UptimeRobot.node.ts b/packages/nodes-base/nodes/UptimeRobot/UptimeRobot.node.ts
index 4ab99039c0081..48637dd7c0430 100644
--- a/packages/nodes-base/nodes/UptimeRobot/UptimeRobot.node.ts
+++ b/packages/nodes-base/nodes/UptimeRobot/UptimeRobot.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -7,18 +8,13 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-import { uptimeRobotApiRequest } from './GenericFunctions';
-
-import { monitorFields, monitorOperations } from './MonitorDescription';
-
 import { alertContactFields, alertContactOperations } from './AlertContactDescription';
-
+import { uptimeRobotApiRequest } from './GenericFunctions';
 import {
 	maintenanceWindowFields,
 	maintenanceWindowOperations,
 } from './MaintenanceWindowDescription';
-
+import { monitorFields, monitorOperations } from './MonitorDescription';
 import { publicStatusPageFields, publicStatusPageOperations } from './PublicStatusPageDescription';
 
 export class UptimeRobot implements INodeType {
diff --git a/packages/nodes-base/nodes/UrlScanIo/UrlScanIo.node.ts b/packages/nodes-base/nodes/UrlScanIo/UrlScanIo.node.ts
index d51ff9d498de6..1862b9e8ae42e 100644
--- a/packages/nodes-base/nodes/UrlScanIo/UrlScanIo.node.ts
+++ b/packages/nodes-base/nodes/UrlScanIo/UrlScanIo.node.ts
@@ -8,7 +8,6 @@ import type {
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
 import { scanFields, scanOperations } from './descriptions';
-
 import { handleListing, normalizeId, urlScanIoApiRequest } from './GenericFunctions';
 
 export class UrlScanIo implements INodeType {
diff --git a/packages/nodes-base/nodes/Venafi/Datacenter/GenericFunctions.ts b/packages/nodes-base/nodes/Venafi/Datacenter/GenericFunctions.ts
index 8db5cc2f7f5ac..4c3438b3a4fdd 100644
--- a/packages/nodes-base/nodes/Venafi/Datacenter/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Venafi/Datacenter/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import { ApplicationError } from 'n8n-workflow';
 import type {
 	IDataObject,
@@ -8,8 +9,6 @@ import type {
 	IRequestOptions,
 } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
 export async function venafiApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
 	method: IHttpRequestMethods,
diff --git a/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenter.node.ts b/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenter.node.ts
index c749cb2402ac5..381e6da551c90 100644
--- a/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenter.node.ts
+++ b/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenter.node.ts
@@ -7,10 +7,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { venafiApiRequest, venafiApiRequestAllItems } from './GenericFunctions';
-
 import { certificateFields, certificateOperations } from './CertificateDescription';
-
+import { venafiApiRequest, venafiApiRequestAllItems } from './GenericFunctions';
 import { policyFields, policyOperations } from './PolicyDescription';
 
 export class VenafiTlsProtectDatacenter implements INodeType {
diff --git a/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenterTrigger.node.ts b/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenterTrigger.node.ts
index bf6bb6e9a1b2f..e31bf8924ded2 100644
--- a/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenterTrigger.node.ts
+++ b/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenterTrigger.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import {
 	type IPollFunctions,
 	type IDataObject,
@@ -7,8 +8,6 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
 import { venafiApiRequest } from './GenericFunctions';
 
 export class VenafiTlsProtectDatacenterTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Venafi/ProtectCloud/GenericFunctions.ts b/packages/nodes-base/nodes/Venafi/ProtectCloud/GenericFunctions.ts
index 933f8175ccf88..9841596504c53 100644
--- a/packages/nodes-base/nodes/Venafi/ProtectCloud/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Venafi/ProtectCloud/GenericFunctions.ts
@@ -1,3 +1,5 @@
+import * as nacl_factory from 'js-nacl';
+import get from 'lodash/get';
 import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
@@ -9,10 +11,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
-import * as nacl_factory from 'js-nacl';
-
 export async function venafiApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions,
 	method: IHttpRequestMethods,
diff --git a/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloud.node.ts b/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloud.node.ts
index fc0d0ea4a9196..fad5bac766c66 100644
--- a/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloud.node.ts
+++ b/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloud.node.ts
@@ -9,15 +9,7 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { encryptPassphrase, venafiApiRequest, venafiApiRequestAllItems } from './GenericFunctions';
-
 import { certificateFields, certificateOperations } from './CertificateDescription';
-
-import {
-	certificateRequestFields,
-	certificateRequestOperations,
-} from './CertificateRequestDescription';
-
 import type {
 	ICertficateKeystoreRequest,
 	ICertficateRequest,
@@ -25,6 +17,11 @@ import type {
 	IKeyTypeParameters,
 	ISubjectAltNamesByType,
 } from './CertificateInterface';
+import {
+	certificateRequestFields,
+	certificateRequestOperations,
+} from './CertificateRequestDescription';
+import { encryptPassphrase, venafiApiRequest, venafiApiRequestAllItems } from './GenericFunctions';
 
 export class VenafiTlsProtectCloud implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Vero/Vero.node.ts b/packages/nodes-base/nodes/Vero/Vero.node.ts
index bcb279c279bd0..ebf91441184ab 100644
--- a/packages/nodes-base/nodes/Vero/Vero.node.ts
+++ b/packages/nodes-base/nodes/Vero/Vero.node.ts
@@ -7,9 +7,10 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeApiError } from 'n8n-workflow';
+
+import { eventFields, eventOperations } from './EventDescripion';
 import { validateJSON, veroApiRequest } from './GenericFunctions';
 import { userFields, userOperations } from './UserDescription';
-import { eventFields, eventOperations } from './EventDescripion';
 
 export class Vero implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Wait/Wait.node.ts b/packages/nodes-base/nodes/Wait/Wait.node.ts
index 9039891e99c16..45922270c2c47 100644
--- a/packages/nodes-base/nodes/Wait/Wait.node.ts
+++ b/packages/nodes-base/nodes/Wait/Wait.node.ts
@@ -9,6 +9,16 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError, NodeConnectionType, WAIT_INDEFINITELY } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '../../utils/utilities';
+import {
+	formDescription,
+	formFields,
+	respondWithOptions,
+	formRespondMode,
+	formTitle,
+	appendAttributionToForm,
+} from '../Form/common.descriptions';
+import { formWebhook } from '../Form/utils';
 import {
 	authenticationProperty,
 	credentialsProperty,
@@ -20,17 +30,6 @@ import {
 	responseDataProperty,
 	responseModeProperty,
 } from '../Webhook/description';
-
-import {
-	formDescription,
-	formFields,
-	respondWithOptions,
-	formRespondMode,
-	formTitle,
-	appendAttributionToForm,
-} from '../Form/common.descriptions';
-import { formWebhook } from '../Form/utils';
-import { updateDisplayOptions } from '../../utils/utilities';
 import { Webhook } from '../Webhook/Webhook.node';
 
 const toWaitAmount: INodeProperties = {
diff --git a/packages/nodes-base/nodes/Webflow/V1/WebflowV1.node.ts b/packages/nodes-base/nodes/Webflow/V1/WebflowV1.node.ts
index 2985cd7369842..93846925639db 100644
--- a/packages/nodes-base/nodes/Webflow/V1/WebflowV1.node.ts
+++ b/packages/nodes-base/nodes/Webflow/V1/WebflowV1.node.ts
@@ -8,6 +8,7 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
+import { itemFields, itemOperations } from './ItemDescription';
 import {
 	webflowApiRequest,
 	webflowApiRequestAllItems,
@@ -16,8 +17,6 @@ import {
 	getFields,
 } from '../GenericFunctions';
 
-import { itemFields, itemOperations } from './ItemDescription';
-
 export class WebflowV1 implements INodeType {
 	description: INodeTypeDescription;
 
diff --git a/packages/nodes-base/nodes/Webflow/V2/WebflowV2.node.ts b/packages/nodes-base/nodes/Webflow/V2/WebflowV2.node.ts
index ad17ff9e05e13..3c9e6c56a66e8 100644
--- a/packages/nodes-base/nodes/Webflow/V2/WebflowV2.node.ts
+++ b/packages/nodes-base/nodes/Webflow/V2/WebflowV2.node.ts
@@ -4,9 +4,10 @@ import type {
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { getSites, getCollections, getFields } from '../GenericFunctions';
-import { versionDescription } from './actions/versionDescription';
+
 import { router } from './actions/router';
+import { versionDescription } from './actions/versionDescription';
+import { getSites, getCollections, getFields } from '../GenericFunctions';
 
 export class WebflowV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/Webflow/V2/actions/router.ts b/packages/nodes-base/nodes/Webflow/V2/actions/router.ts
index 371a9df3c6df7..59eb4c552eb63 100644
--- a/packages/nodes-base/nodes/Webflow/V2/actions/router.ts
+++ b/packages/nodes-base/nodes/Webflow/V2/actions/router.ts
@@ -1,8 +1,8 @@
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import type { WebflowType } from './node.type';
 
 import * as item from './Item/Item.resource';
+import type { WebflowType } from './node.type';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	let returnData: INodeExecutionData[] = [];
diff --git a/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts b/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts
index cdd2ee3814626..1da016bd9ba57 100644
--- a/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts
+++ b/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts
@@ -1,5 +1,6 @@
 import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
 import { VersionedNodeType } from 'n8n-workflow';
+
 import { WebflowTriggerV1 } from './V1/WebflowTriggerV1.node';
 import { WebflowTriggerV2 } from './V2/WebflowTriggerV2.node';
 
diff --git a/packages/nodes-base/nodes/Webhook/Webhook.node.ts b/packages/nodes-base/nodes/Webhook/Webhook.node.ts
index 9938f4eaa1d12..9255dab346ce6 100644
--- a/packages/nodes-base/nodes/Webhook/Webhook.node.ts
+++ b/packages/nodes-base/nodes/Webhook/Webhook.node.ts
@@ -1,7 +1,7 @@
 /* eslint-disable n8n-nodes-base/node-execute-block-wrong-error-thrown */
-import { pipeline } from 'stream/promises';
 import { createWriteStream } from 'fs';
 import { stat } from 'fs/promises';
+import isbot from 'isbot';
 import type {
 	IWebhookFunctions,
 	IDataObject,
@@ -12,10 +12,9 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { BINARY_ENCODING, NodeOperationError, Node } from 'n8n-workflow';
-
-import { v4 as uuid } from 'uuid';
-import isbot from 'isbot';
+import { pipeline } from 'stream/promises';
 import { file as tmpFile } from 'tmp-promise';
+import { v4 as uuid } from 'uuid';
 
 import {
 	authenticationProperty,
diff --git a/packages/nodes-base/nodes/Webhook/description.ts b/packages/nodes-base/nodes/Webhook/description.ts
index c0cd992c8e775..42a81aab717f1 100644
--- a/packages/nodes-base/nodes/Webhook/description.ts
+++ b/packages/nodes-base/nodes/Webhook/description.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties, INodeTypeDescription, IWebhookDescription } from 'n8n-workflow';
+
 import { getResponseCode, getResponseData } from './utils';
 
 export const defaultWebhookDescription: IWebhookDescription = {
diff --git a/packages/nodes-base/nodes/Webhook/test/Webhook.test.ts b/packages/nodes-base/nodes/Webhook/test/Webhook.test.ts
index 97fd23e90eb43..250ad3af8a3b0 100644
--- a/packages/nodes-base/nodes/Webhook/test/Webhook.test.ts
+++ b/packages/nodes-base/nodes/Webhook/test/Webhook.test.ts
@@ -1,9 +1,11 @@
 import type { Request } from 'express';
-import type { IWebhookFunctions } from 'n8n-workflow';
 import { mock } from 'jest-mock-extended';
-import { Webhook } from '../Webhook.node';
+import type { IWebhookFunctions } from 'n8n-workflow';
+
 import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
 
+import { Webhook } from '../Webhook.node';
+
 const workflows = getWorkflowFilenames(__dirname);
 
 describe('Test Webhook Node', () => {
diff --git a/packages/nodes-base/nodes/Webhook/test/utils.test.ts b/packages/nodes-base/nodes/Webhook/test/utils.test.ts
index 91a244aa41686..b2fc3f84e2b1a 100644
--- a/packages/nodes-base/nodes/Webhook/test/utils.test.ts
+++ b/packages/nodes-base/nodes/Webhook/test/utils.test.ts
@@ -1,5 +1,6 @@
 import jwt from 'jsonwebtoken';
 import { ApplicationError, type IWebhookFunctions } from 'n8n-workflow';
+
 import type { WebhookParameters } from '../utils';
 import {
 	checkResponseModeConfiguration,
diff --git a/packages/nodes-base/nodes/Webhook/utils.ts b/packages/nodes-base/nodes/Webhook/utils.ts
index 3f6b78e552abe..08a588a5a8089 100644
--- a/packages/nodes-base/nodes/Webhook/utils.ts
+++ b/packages/nodes-base/nodes/Webhook/utils.ts
@@ -1,3 +1,5 @@
+import basicAuth from 'basic-auth';
+import jwt from 'jsonwebtoken';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import type {
 	IWebhookFunctions,
@@ -5,10 +7,9 @@ import type {
 	IDataObject,
 	ICredentialDataDecryptedObject,
 } from 'n8n-workflow';
-import basicAuth from 'basic-auth';
-import jwt from 'jsonwebtoken';
-import { formatPrivateKey } from '../../utils/utilities';
+
 import { WebhookAuthorizationError } from './error';
+import { formatPrivateKey } from '../../utils/utilities';
 
 export type WebhookParameters = {
 	httpMethod: string | string[];
@@ -59,7 +60,7 @@ export const getResponseData = (parameters: WebhookParameters) => {
 };
 
 export const configuredOutputs = (parameters: WebhookParameters) => {
-	const httpMethod = parameters.httpMethod as string | string[];
+	const httpMethod = parameters.httpMethod;
 
 	if (!Array.isArray(httpMethod))
 		return [
diff --git a/packages/nodes-base/nodes/Wekan/Wekan.node.ts b/packages/nodes-base/nodes/Wekan/Wekan.node.ts
index 184f03a15055e..6e54c46ed174e 100644
--- a/packages/nodes-base/nodes/Wekan/Wekan.node.ts
+++ b/packages/nodes-base/nodes/Wekan/Wekan.node.ts
@@ -10,20 +10,14 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { wrapData } from '../../utils/utilities';
-import { apiRequest } from './GenericFunctions';
-
 import { boardFields, boardOperations } from './BoardDescription';
-
-import { cardFields, cardOperations } from './CardDescription';
-
 import { cardCommentFields, cardCommentOperations } from './CardCommentDescription';
-
+import { cardFields, cardOperations } from './CardDescription';
 import { checklistFields, checklistOperations } from './ChecklistDescription';
-
 import { checklistItemFields, checklistItemOperations } from './ChecklistItemDescription';
-
+import { apiRequest } from './GenericFunctions';
 import { listFields, listOperations } from './ListDescription';
+import { wrapData } from '../../utils/utilities';
 
 // https://wekan.github.io/api/v4.41/
 
diff --git a/packages/nodes-base/nodes/WhatsApp/GenericFunctions.ts b/packages/nodes-base/nodes/WhatsApp/GenericFunctions.ts
index b50c9adad9e20..6f027ccd8ef6c 100644
--- a/packages/nodes-base/nodes/WhatsApp/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/WhatsApp/GenericFunctions.ts
@@ -9,6 +9,7 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
+
 import type {
 	WhatsAppAppWebhookSubscriptionsResponse,
 	WhatsAppAppWebhookSubscription,
diff --git a/packages/nodes-base/nodes/WhatsApp/MediaDescription.ts b/packages/nodes-base/nodes/WhatsApp/MediaDescription.ts
index 48ef7dd377d17..e22498b35bc20 100644
--- a/packages/nodes-base/nodes/WhatsApp/MediaDescription.ts
+++ b/packages/nodes-base/nodes/WhatsApp/MediaDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { setupUpload } from './MediaFunctions';
 
 export const mediaFields: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/WhatsApp/MediaFunctions.ts b/packages/nodes-base/nodes/WhatsApp/MediaFunctions.ts
index 643c543f4d3fe..f1b47900c17c5 100644
--- a/packages/nodes-base/nodes/WhatsApp/MediaFunctions.ts
+++ b/packages/nodes-base/nodes/WhatsApp/MediaFunctions.ts
@@ -1,8 +1,7 @@
+import FormData from 'form-data';
 import type { IDataObject, IExecuteSingleFunctions, IHttpRequestOptions } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import FormData from 'form-data';
-
 export async function getUploadFormData(
 	this: IExecuteSingleFunctions,
 ): Promise<{ fileName: string; formData: FormData }> {
diff --git a/packages/nodes-base/nodes/WhatsApp/MessagesDescription.ts b/packages/nodes-base/nodes/WhatsApp/MessagesDescription.ts
index d3a087903c735..10fdc64d3db61 100644
--- a/packages/nodes-base/nodes/WhatsApp/MessagesDescription.ts
+++ b/packages/nodes-base/nodes/WhatsApp/MessagesDescription.ts
@@ -1,5 +1,6 @@
 import countryCodes from 'currency-codes';
 import type { INodeProperties } from 'n8n-workflow';
+
 import {
 	cleanPhoneNumber,
 	componentsRequest,
diff --git a/packages/nodes-base/nodes/WhatsApp/WhatsApp.node.ts b/packages/nodes-base/nodes/WhatsApp/WhatsApp.node.ts
index 7275a9b43e720..2947b4a60d8a2 100644
--- a/packages/nodes-base/nodes/WhatsApp/WhatsApp.node.ts
+++ b/packages/nodes-base/nodes/WhatsApp/WhatsApp.node.ts
@@ -1,8 +1,8 @@
 import type { INodeType, INodeTypeDescription } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { messageFields, messageTypeFields } from './MessagesDescription';
 import { mediaFields, mediaTypeFields } from './MediaDescription';
+import { messageFields, messageTypeFields } from './MessagesDescription';
 
 export class WhatsApp implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/WhatsApp/WhatsAppTrigger.node.ts b/packages/nodes-base/nodes/WhatsApp/WhatsAppTrigger.node.ts
index fb0f0e40f4971..a9603fb25fc76 100644
--- a/packages/nodes-base/nodes/WhatsApp/WhatsAppTrigger.node.ts
+++ b/packages/nodes-base/nodes/WhatsApp/WhatsAppTrigger.node.ts
@@ -9,6 +9,7 @@ import {
 	type IWebhookResponseData,
 	NodeConnectionType,
 } from 'n8n-workflow';
+
 import {
 	appWebhookSubscriptionCreate,
 	appWebhookSubscriptionDelete,
diff --git a/packages/nodes-base/nodes/Wise/GenericFunctions.ts b/packages/nodes-base/nodes/Wise/GenericFunctions.ts
index a5fe5538033ba..129ef4e8a97d6 100644
--- a/packages/nodes-base/nodes/Wise/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Wise/GenericFunctions.ts
@@ -1,5 +1,4 @@
 import { createSign } from 'crypto';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
diff --git a/packages/nodes-base/nodes/Wise/Wise.node.ts b/packages/nodes-base/nodes/Wise/Wise.node.ts
index 59ce8beff934f..22432a3422b41 100644
--- a/packages/nodes-base/nodes/Wise/Wise.node.ts
+++ b/packages/nodes-base/nodes/Wise/Wise.node.ts
@@ -1,3 +1,5 @@
+import omit from 'lodash/omit';
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -8,10 +10,8 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
-
-import omit from 'lodash/omit';
-import moment from 'moment-timezone';
 import { v4 as uuid } from 'uuid';
+
 import {
 	accountFields,
 	accountOperations,
@@ -26,7 +26,6 @@ import {
 	transferFields,
 	transferOperations,
 } from './descriptions';
-
 import type {
 	BorderlessAccount,
 	ExchangeRateAdditionalFields,
diff --git a/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts b/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
index f2519b17e5555..a4ef46ffd3d4e 100644
--- a/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
@@ -1,5 +1,6 @@
+import { snakeCase } from 'change-case';
 import { createHash } from 'crypto';
-
+import omit from 'lodash/omit';
 import type {
 	ICredentialDataDecryptedObject,
 	IDataObject,
@@ -11,9 +12,6 @@ import type {
 	IRequestOptions,
 } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
-
-import omit from 'lodash/omit';
 import type { ICouponLine, IFeeLine, ILineItem, IShoppingLine } from './OrderInterface';
 
 export async function woocommerceApiRequest(
diff --git a/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts b/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts
index 3fb4ac5830dd0..0aaab6b978c56 100644
--- a/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts
+++ b/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts
@@ -8,6 +8,8 @@ import {
 	type INodeTypeDescription,
 	NodeConnectionType,
 } from 'n8n-workflow';
+
+import { customerFields, customerOperations } from './descriptions';
 import {
 	adjustMetadata,
 	setFields,
@@ -16,9 +18,7 @@ import {
 	woocommerceApiRequest,
 	woocommerceApiRequestAllItems,
 } from './GenericFunctions';
-import { productFields, productOperations } from './ProductDescription';
 import { orderFields, orderOperations } from './OrderDescription';
-import type { IDimension, IImage, IProduct } from './ProductInterface';
 import type {
 	IAddress,
 	ICouponLine,
@@ -27,8 +27,8 @@ import type {
 	IOrder,
 	IShoppingLine,
 } from './OrderInterface';
-
-import { customerFields, customerOperations } from './descriptions';
+import { productFields, productOperations } from './ProductDescription';
+import type { IDimension, IImage, IProduct } from './ProductInterface';
 
 export class WooCommerce implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts b/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts
index 52257110c1edc..4178e23b31c97 100644
--- a/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts
+++ b/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts
@@ -8,13 +8,13 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
+
 import { wordpressApiRequest, wordpressApiRequestAllItems } from './GenericFunctions';
-import { postFields, postOperations } from './PostDescription';
 import { pageFields, pageOperations } from './PageDescription';
-import { userFields, userOperations } from './UserDescription';
-
-import type { IPost } from './PostInterface';
 import type { IPage } from './PageInterface';
+import { postFields, postOperations } from './PostDescription';
+import type { IPost } from './PostInterface';
+import { userFields, userOperations } from './UserDescription';
 import type { IUser } from './UserInterface';
 
 export class Wordpress implements INodeType {
diff --git a/packages/nodes-base/nodes/Workable/WorkableTrigger.node.ts b/packages/nodes-base/nodes/Workable/WorkableTrigger.node.ts
index 121ead0dc2955..5ccc7f0fa2a11 100644
--- a/packages/nodes-base/nodes/Workable/WorkableTrigger.node.ts
+++ b/packages/nodes-base/nodes/Workable/WorkableTrigger.node.ts
@@ -1,3 +1,4 @@
+import { snakeCase } from 'change-case';
 import type {
 	IHookFunctions,
 	IWebhookFunctions,
@@ -10,7 +11,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
 import { workableApiRequest } from './GenericFunctions';
 
 export class WorkableTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts b/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts
index 21cc48221b8bc..0ef83bbe9d73c 100644
--- a/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts
+++ b/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts
@@ -1,5 +1,3 @@
-import type { Readable } from 'stream';
-
 import { BINARY_ENCODING, NodeConnectionType } from 'n8n-workflow';
 import type {
 	IExecuteFunctions,
@@ -7,6 +5,7 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
+import type { Readable } from 'stream';
 
 export class WriteBinaryFile implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/WriteBinaryFile/test/WriteBinaryFile.test.ts b/packages/nodes-base/nodes/WriteBinaryFile/test/WriteBinaryFile.test.ts
index 4a06f8d0e3db3..1e5ac8e6c268b 100644
--- a/packages/nodes-base/nodes/WriteBinaryFile/test/WriteBinaryFile.test.ts
+++ b/packages/nodes-base/nodes/WriteBinaryFile/test/WriteBinaryFile.test.ts
@@ -1,8 +1,9 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
 import path from 'path';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import * as Helpers from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 
 describe('Test Write Binary File Node', () => {
 	beforeEach(async () => {
diff --git a/packages/nodes-base/nodes/Wufoo/WufooTrigger.node.ts b/packages/nodes-base/nodes/Wufoo/WufooTrigger.node.ts
index 7cb91c179cc4a..63e7212e4cf94 100644
--- a/packages/nodes-base/nodes/Wufoo/WufooTrigger.node.ts
+++ b/packages/nodes-base/nodes/Wufoo/WufooTrigger.node.ts
@@ -12,7 +12,6 @@ import type {
 import { NodeConnectionType, jsonParse } from 'n8n-workflow';
 
 import { wufooApiRequest } from './GenericFunctions';
-
 import type { IField, IWebhook } from './Interface';
 
 export class WufooTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Xero/Xero.node.ts b/packages/nodes-base/nodes/Xero/Xero.node.ts
index fade7c13343d9..894242fe7c163 100644
--- a/packages/nodes-base/nodes/Xero/Xero.node.ts
+++ b/packages/nodes-base/nodes/Xero/Xero.node.ts
@@ -10,16 +10,12 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
+import { contactFields, contactOperations } from './ContactDescription';
 import { xeroApiRequest, xeroApiRequestAllItems } from './GenericFunctions';
-
+import type { IAddress, IContact, IPhone } from './IContactInterface';
 import { invoiceFields, invoiceOperations } from './InvoiceDescription';
-
-import { contactFields, contactOperations } from './ContactDescription';
-
 import type { IInvoice, ILineItem } from './InvoiceInterface';
 
-import type { IAddress, IContact, IPhone } from './IContactInterface';
-
 export class Xero implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Xero',
diff --git a/packages/nodes-base/nodes/Xml/Xml.node.ts b/packages/nodes-base/nodes/Xml/Xml.node.ts
index 6b05660f246d9..d83eb3b82cd20 100644
--- a/packages/nodes-base/nodes/Xml/Xml.node.ts
+++ b/packages/nodes-base/nodes/Xml/Xml.node.ts
@@ -1,4 +1,3 @@
-import { Builder, Parser } from 'xml2js';
 import type {
 	IExecuteFunctions,
 	INodeExecutionData,
@@ -6,6 +5,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError, deepCopy } from 'n8n-workflow';
+import { Builder, Parser } from 'xml2js';
 
 export class Xml implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Yourls/Yourls.node.ts b/packages/nodes-base/nodes/Yourls/Yourls.node.ts
index e4fee71eca15f..c611ab2819a56 100644
--- a/packages/nodes-base/nodes/Yourls/Yourls.node.ts
+++ b/packages/nodes-base/nodes/Yourls/Yourls.node.ts
@@ -8,7 +8,6 @@ import {
 } from 'n8n-workflow';
 
 import { yourlsApiRequest } from './GenericFunctions';
-
 import { urlFields, urlOperations } from './UrlDescription';
 
 export class Yourls implements INodeType {
diff --git a/packages/nodes-base/nodes/Zammad/GenericFunctions.ts b/packages/nodes-base/nodes/Zammad/GenericFunctions.ts
index aad3fa3d84917..85ef2d7a6b12c 100644
--- a/packages/nodes-base/nodes/Zammad/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zammad/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import flow from 'lodash/flow';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -8,8 +9,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import flow from 'lodash/flow';
-
 import type { Zammad } from './types';
 
 export function tolerateTrailingSlash(url: string) {
@@ -34,9 +33,8 @@ export async function zammadApiRequest(
 	const authentication = this.getNodeParameter('authentication', 0) as 'basicAuth' | 'tokenAuth';
 
 	if (authentication === 'basicAuth') {
-		const credentials = (await this.getCredentials(
-			'zammadBasicAuthApi',
-		)) as Zammad.BasicAuthCredentials;
+		const credentials =
+			await this.getCredentials<Zammad.BasicAuthCredentials>('zammadBasicAuthApi');
 
 		const baseUrl = tolerateTrailingSlash(credentials.baseUrl);
 
@@ -49,9 +47,8 @@ export async function zammadApiRequest(
 
 		options.rejectUnauthorized = !credentials.allowUnauthorizedCerts;
 	} else {
-		const credentials = (await this.getCredentials(
-			'zammadTokenAuthApi',
-		)) as Zammad.TokenAuthCredentials;
+		const credentials =
+			await this.getCredentials<Zammad.TokenAuthCredentials>('zammadTokenAuthApi');
 
 		const baseUrl = tolerateTrailingSlash(credentials.baseUrl);
 
diff --git a/packages/nodes-base/nodes/Zammad/Zammad.node.ts b/packages/nodes-base/nodes/Zammad/Zammad.node.ts
index 5b006b444d8f5..07f64c680b1af 100644
--- a/packages/nodes-base/nodes/Zammad/Zammad.node.ts
+++ b/packages/nodes-base/nodes/Zammad/Zammad.node.ts
@@ -18,7 +18,6 @@ import {
 	ticketDescription,
 	userDescription,
 } from './descriptions';
-
 import {
 	doesNotBelongToZammad,
 	fieldToLoadOption,
@@ -38,7 +37,6 @@ import {
 	zammadApiRequest,
 	zammadApiRequestAllItems,
 } from './GenericFunctions';
-
 import type { Zammad as ZammadTypes } from './types';
 
 export class Zammad implements INodeType {
diff --git a/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts b/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts
index b83e50c290829..8c492275a8cb1 100644
--- a/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts
+++ b/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts
@@ -11,16 +11,11 @@ import type {
 import { NodeApiError, NodeOperationError, NodeConnectionType } from 'n8n-workflow';
 
 import { validateJSON, zendeskApiRequest, zendeskApiRequestAllItems } from './GenericFunctions';
-
+import { organizationFields, organizationOperations } from './OrganizationDescription';
 import { ticketFields, ticketOperations } from './TicketDescription';
-
 import { ticketFieldFields, ticketFieldOperations } from './TicketFieldDescription';
-
-import { userFields, userOperations } from './UserDescription';
-
-import { organizationFields, organizationOperations } from './OrganizationDescription';
-
 import type { IComment, ITicket } from './TicketInterface';
+import { userFields, userOperations } from './UserDescription';
 
 export class Zendesk implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts b/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts
index 72115e073ee8a..1a0b5f59d0931 100644
--- a/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts
+++ b/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts
@@ -10,9 +10,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { zendeskApiRequest, zendeskApiRequestAllItems } from './GenericFunctions';
 import { conditionFields } from './ConditionDescription';
-
+import { zendeskApiRequest, zendeskApiRequestAllItems } from './GenericFunctions';
 import { triggerPlaceholders } from './TriggerPlaceholders';
 
 export class ZendeskTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Zoho/GenericFunctions.ts b/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
index 7b025bfcda0e7..554cb49425e33 100644
--- a/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
@@ -1,3 +1,5 @@
+import flow from 'lodash/flow';
+import sortBy from 'lodash/sortBy';
 import type {
 	IExecuteFunctions,
 	IHookFunctions,
@@ -9,9 +11,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import flow from 'lodash/flow';
-import sortBy from 'lodash/sortBy';
-
 import type {
 	AllFields,
 	CamelCaseResource,
@@ -47,9 +46,7 @@ export async function zohoApiRequest(
 	qs: IDataObject = {},
 	uri?: string,
 ) {
-	const { oauthTokenData } = (await this.getCredentials(
-		'zohoOAuth2Api',
-	)) as ZohoOAuth2ApiCredentials;
+	const { oauthTokenData } = await this.getCredentials<ZohoOAuth2ApiCredentials>('zohoOAuth2Api');
 
 	const options: IRequestOptions = {
 		body: {
diff --git a/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts b/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
index e1cd2135be4bd..67d76a33abdd3 100644
--- a/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
+++ b/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
@@ -8,6 +8,28 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
+import {
+	accountFields,
+	accountOperations,
+	contactFields,
+	contactOperations,
+	dealFields,
+	dealOperations,
+	invoiceFields,
+	invoiceOperations,
+	leadFields,
+	leadOperations,
+	productFields,
+	productOperations,
+	purchaseOrderFields,
+	purchaseOrderOperations,
+	quoteFields,
+	quoteOperations,
+	salesOrderFields,
+	salesOrderOperations,
+	vendorFields,
+	vendorOperations,
+} from './descriptions';
 import {
 	addGetAllFilterOptions,
 	adjustAccountPayload,
@@ -31,7 +53,6 @@ import {
 	zohoApiRequest,
 	zohoApiRequestAllItems,
 } from './GenericFunctions';
-
 import type {
 	CamelCaseResource,
 	GetAllFilterOptions,
@@ -43,29 +64,6 @@ import type {
 	ProductDetails,
 } from './types';
 
-import {
-	accountFields,
-	accountOperations,
-	contactFields,
-	contactOperations,
-	dealFields,
-	dealOperations,
-	invoiceFields,
-	invoiceOperations,
-	leadFields,
-	leadOperations,
-	productFields,
-	productOperations,
-	purchaseOrderFields,
-	purchaseOrderOperations,
-	quoteFields,
-	quoteOperations,
-	salesOrderFields,
-	salesOrderOperations,
-	vendorFields,
-	vendorOperations,
-} from './descriptions';
-
 export class ZohoCrm implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Zoho CRM',
diff --git a/packages/nodes-base/nodes/Zoho/descriptions/SharedFields.ts b/packages/nodes-base/nodes/Zoho/descriptions/SharedFields.ts
index 6e79c724b1a8c..aa62792041443 100644
--- a/packages/nodes-base/nodes/Zoho/descriptions/SharedFields.ts
+++ b/packages/nodes-base/nodes/Zoho/descriptions/SharedFields.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { capitalizeInitial } from '../GenericFunctions';
 import type { CamelCaseResource } from '../types';
 
diff --git a/packages/nodes-base/nodes/Zoom/Zoom.node.ts b/packages/nodes-base/nodes/Zoom/Zoom.node.ts
index 2937ffa2f9848..2a9f051765823 100644
--- a/packages/nodes-base/nodes/Zoom/Zoom.node.ts
+++ b/packages/nodes-base/nodes/Zoom/Zoom.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import {
 	type IExecuteFunctions,
 	type IDataObject,
@@ -9,9 +10,7 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import { zoomApiRequest, zoomApiRequestAllItems } from './GenericFunctions';
-
 import { meetingFields, meetingOperations } from './MeetingDescription';
 
 // import {
diff --git a/packages/nodes-base/nodes/Zulip/Zulip.node.ts b/packages/nodes-base/nodes/Zulip/Zulip.node.ts
index 7caa98132cae3..67fab2e467480 100644
--- a/packages/nodes-base/nodes/Zulip/Zulip.node.ts
+++ b/packages/nodes-base/nodes/Zulip/Zulip.node.ts
@@ -1,3 +1,4 @@
+import { snakeCase } from 'change-case';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -8,13 +9,13 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-import { snakeCase } from 'change-case';
+
 import { validateJSON, zulipApiRequest } from './GenericFunctions';
 import { messageFields, messageOperations } from './MessageDescription';
 import type { IMessage } from './MessageInterface';
 import { streamFields, streamOperations } from './StreamDescription';
-import { userFields, userOperations } from './UserDescription';
 import type { IPrincipal, IStream } from './StreamInterface';
+import { userFields, userOperations } from './UserDescription';
 import type { IUser } from './UserInterface';
 
 export class Zulip implements INodeType {
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 0c6a5acb9152f..0307b66721640 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,19 +1,18 @@
 {
   "name": "n8n-nodes-base",
-  "version": "1.71.0",
+  "version": "1.73.0",
   "description": "Base nodes of n8n",
   "main": "index.js",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
     "typecheck": "tsc --noEmit",
-    "build": "tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && pnpm n8n-copy-icons && pnpm n8n-generate-translations && pnpm build:metadata",
-    "build:metadata": "pnpm n8n-generate-known && pnpm n8n-generate-ui-types",
+    "build": "tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && pnpm n8n-copy-icons && pnpm n8n-generate-translations && pnpm n8n-generate-metadata",
     "format": "biome format --write .",
     "format:check": "biome ci .",
-    "lint": "eslint . --quiet && node ./scripts/validate-load-options-methods.js",
-    "lintfix": "eslint . --fix",
-    "watch": "tsc-watch -p tsconfig.build.json --onCompilationComplete \"tsc-alias -p tsconfig.build.json\" --onSuccess \"pnpm n8n-generate-ui-types\"",
+    "lint": "eslint nodes credentials utils test --quiet && node ./scripts/validate-load-options-methods.js",
+    "lintfix": "eslint nodes credentials utils test --fix",
+    "watch": "tsc-watch -p tsconfig.build.json --onCompilationComplete \"tsc-alias -p tsconfig.build.json\" --onSuccess \"pnpm n8n-generate-metadata\"",
     "test": "jest"
   },
   "files": [
@@ -319,6 +318,8 @@
       "dist/credentials/Sms77Api.credentials.js",
       "dist/credentials/Smtp.credentials.js",
       "dist/credentials/Snowflake.credentials.js",
+      "dist/credentials/SolarWindsIpamApi.credentials.js",
+      "dist/credentials/SolarWindsObservabilityApi.credentials.js",
       "dist/credentials/SplunkApi.credentials.js",
       "dist/credentials/SpontitApi.credentials.js",
       "dist/credentials/SpotifyOAuth2Api.credentials.js",
@@ -492,8 +493,8 @@
       "dist/nodes/ErrorTrigger/ErrorTrigger.node.js",
       "dist/nodes/Eventbrite/EventbriteTrigger.node.js",
       "dist/nodes/ExecuteCommand/ExecuteCommand.node.js",
-      "dist/nodes/ExecuteWorkflow/ExecuteWorkflow.node.js",
-      "dist/nodes/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.js",
+      "dist/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.js",
+      "dist/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.js",
       "dist/nodes/ExecutionData/ExecutionData.node.js",
       "dist/nodes/Facebook/FacebookGraphApi.node.js",
       "dist/nodes/Facebook/FacebookTrigger.node.js",
@@ -866,6 +867,7 @@
     "fast-glob": "catalog:",
     "fflate": "0.7.4",
     "get-system-fonts": "2.0.2",
+    "generate-schema": "2.6.0",
     "gm": "1.25.0",
     "html-to-text": "9.0.5",
     "iconv-lite": "catalog:",
diff --git a/packages/nodes-base/scripts/validate-load-options-methods.js b/packages/nodes-base/scripts/validate-load-options-methods.js
index 9fa11a78222d8..b043365b93cd2 100644
--- a/packages/nodes-base/scripts/validate-load-options-methods.js
+++ b/packages/nodes-base/scripts/validate-load-options-methods.js
@@ -6,7 +6,7 @@ try {
 	definedMethods = require('../dist/methods/defined.json');
 } catch (error) {
 	console.error(
-		'Failed to find methods to validate. Please run `npm run n8n-generate-ui-types` first.',
+		'Failed to find methods to validate. Please run `npm run n8n-generate-metadata` first.',
 	);
 	process.exit(1);
 }
diff --git a/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts b/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts
index 82b20eaf82f5f..3573edf2d4390 100644
--- a/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts
+++ b/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts
@@ -1,4 +1,5 @@
 import nock from 'nock';
+
 import { executeWorkflow } from '../ExecuteWorkflow';
 import * as Helpers from '../Helpers';
 import type { WorkflowTestData } from '../types';
diff --git a/packages/nodes-base/test/nodes/ExecuteWorkflow.ts b/packages/nodes-base/test/nodes/ExecuteWorkflow.ts
index ffb79a78ed5eb..969001e619ba6 100644
--- a/packages/nodes-base/test/nodes/ExecuteWorkflow.ts
+++ b/packages/nodes-base/test/nodes/ExecuteWorkflow.ts
@@ -1,7 +1,8 @@
-import nock from 'nock';
 import { WorkflowExecute } from 'n8n-core';
 import type { INodeTypes, IRun, IRunExecutionData } from 'n8n-workflow';
 import { createDeferredPromise, Workflow } from 'n8n-workflow';
+import nock from 'nock';
+
 import * as Helpers from './Helpers';
 import type { WorkflowTestData } from './types';
 
diff --git a/packages/nodes-base/test/nodes/FakeCredentialsMap.ts b/packages/nodes-base/test/nodes/FakeCredentialsMap.ts
index 89eab8242b318..4daacbfd07012 100644
--- a/packages/nodes-base/test/nodes/FakeCredentialsMap.ts
+++ b/packages/nodes-base/test/nodes/FakeCredentialsMap.ts
@@ -125,4 +125,42 @@ BQIDAQAB
 		accessToken: 'testToken',
 		baseUrl: 'https://api.telegram.org',
 	},
+	gmailOAuth2: {
+		grantType: 'authorizationCode',
+		authUrl: 'https://accounts.google.com/o/oauth2/v2/auth',
+		accessTokenUrl: 'https://oauth2.googleapis.com/token',
+		clientId: 'CLIENTID',
+		clientSecret: 'CLIENTSECRET',
+		scope:
+			'https://www.googleapis.com/auth/gmail.labels https://www.googleapis.com/auth/gmail.addons.current.action.compose https://www.googleapis.com/auth/gmail.addons.current.message.action https://mail.google.com/ https://www.googleapis.com/auth/gmail.modify https://www.googleapis.com/auth/gmail.compose',
+		authQueryParameters: 'access_type=offline&prompt=consent',
+		authentication: 'body',
+		oauthTokenData: {
+			access_token: 'ACCESSTOKEN',
+			refresh_token: 'REFRESHTOKEN',
+			scope:
+				'https://www.googleapis.com/auth/gmail.labels https://www.googleapis.com/auth/gmail.addons.current.action.compose https://www.googleapis.com/auth/gmail.addons.current.message.action https://mail.google.com/ https://www.googleapis.com/auth/gmail.modify https://www.googleapis.com/auth/gmail.compose',
+			token_type: 'bearer',
+			expires_in: 86400,
+		},
+	},
+	notionApi: {
+		apiKey: 'key123',
+	},
+	philipsHueOAuth2Api: {
+		grantType: 'authorizationCode',
+		appId: 'APPID',
+		authUrl: 'https://api.meethue.com/v2/oauth2/authorize',
+		accessTokenUrl: 'https://api.meethue.com/v2/oauth2/token',
+		authQueryParameters: 'appid=APPID',
+		scope: '',
+		authentication: 'header',
+		oauthTokenData: {
+			access_token: 'ACCESSTOKEN',
+			refresh_token: 'REFRESHTOKEN',
+			scope: '',
+			token_type: 'bearer',
+			expires_in: 86400,
+		},
+	},
 } as const;
diff --git a/packages/nodes-base/test/nodes/Helpers.ts b/packages/nodes-base/test/nodes/Helpers.ts
index 98e8ebf9182c9..19e4f72b40793 100644
--- a/packages/nodes-base/test/nodes/Helpers.ts
+++ b/packages/nodes-base/test/nodes/Helpers.ts
@@ -1,12 +1,13 @@
 import { readFileSync, readdirSync, mkdtempSync } from 'fs';
-import path from 'path';
-import { tmpdir } from 'os';
-import nock from 'nock';
-import { isEmpty } from 'lodash';
-import { get } from 'lodash';
-import { BinaryDataService, Credentials, constructExecutionMetaData } from 'n8n-core';
-import { Container } from 'typedi';
 import { mock } from 'jest-mock-extended';
+import { get } from 'lodash';
+import { isEmpty } from 'lodash';
+import {
+	BinaryDataService,
+	Credentials,
+	UnrecognizedNodeTypeError,
+	constructExecutionMetaData,
+} from 'n8n-core';
 import type {
 	CredentialLoadingDetails,
 	ICredentialDataDecryptedObject,
@@ -34,8 +35,12 @@ import type {
 	WorkflowTestData,
 } from 'n8n-workflow';
 import { ApplicationError, ICredentialsHelper, NodeHelpers, WorkflowHooks } from 'n8n-workflow';
-import { executeWorkflow } from './ExecuteWorkflow';
+import nock from 'nock';
+import { tmpdir } from 'os';
+import path from 'path';
+import { Container } from 'typedi';
 
+import { executeWorkflow } from './ExecuteWorkflow';
 import { FAKE_CREDENTIALS_DATA } from './FakeCredentialsMap';
 
 const baseDir = path.resolve(__dirname, '../..');
@@ -251,12 +256,9 @@ export function setup(testData: WorkflowTestData[] | WorkflowTestData) {
 
 	const nodeNames = nodes.map((n) => n.type);
 	for (const nodeName of nodeNames) {
-		if (!nodeName.startsWith('n8n-nodes-base.')) {
-			throw new ApplicationError(`Unknown node type: ${nodeName}`, { level: 'warning' });
-		}
 		const loadInfo = knownNodes[nodeName.replace('n8n-nodes-base.', '')];
 		if (!loadInfo) {
-			throw new ApplicationError(`Unknown node type: ${nodeName}`, { level: 'warning' });
+			throw new UnrecognizedNodeTypeError('n8n-nodes-base', nodeName);
 		}
 		const sourcePath = loadInfo.sourcePath.replace(/^dist\//, './').replace(/\.js$/, '.ts');
 		const nodeSourcePath = path.join(baseDir, sourcePath);
@@ -330,7 +332,7 @@ export const equalityTest = async (testData: WorkflowTestData, types: INodeTypes
 		return expect(resultData, msg).toEqual(testData.output.nodeData[nodeName]);
 	});
 
-	expect(result.finished).toEqual(true);
+	expect(result.finished || result.status === 'waiting').toEqual(true);
 };
 
 const preparePinData = (pinData: IDataObject) => {
diff --git a/packages/nodes-base/test/nodes/Postgres/Postgres.node.functions.test.ts b/packages/nodes-base/test/nodes/Postgres/Postgres.node.functions.test.ts
index 8080c711fbfda..42b88b7338930 100644
--- a/packages/nodes-base/test/nodes/Postgres/Postgres.node.functions.test.ts
+++ b/packages/nodes-base/test/nodes/Postgres/Postgres.node.functions.test.ts
@@ -1,4 +1,5 @@
 const pgPromise = require('pg-promise');
+
 const PostgresFun = require('../../../nodes/Postgres/v1/genericFunctions');
 
 type NodeParams = Record<string, string | {}>;
diff --git a/packages/nodes-base/test/nodes/Start/StartNode.test.ts b/packages/nodes-base/test/nodes/Start/StartNode.test.ts
index c399bd4554bf3..f56806b8b4d87 100644
--- a/packages/nodes-base/test/nodes/Start/StartNode.test.ts
+++ b/packages/nodes-base/test/nodes/Start/StartNode.test.ts
@@ -1,6 +1,6 @@
+import { executeWorkflow } from '../ExecuteWorkflow';
 import * as Helpers from '../Helpers';
 import type { WorkflowTestData } from '../types';
-import { executeWorkflow } from '../ExecuteWorkflow';
 
 describe('Execute Start Node', () => {
 	const tests: WorkflowTestData[] = [
diff --git a/packages/nodes-base/tsconfig.build.json b/packages/nodes-base/tsconfig.build.json
index 3a26457c9cb0f..d92417abdd374 100644
--- a/packages/nodes-base/tsconfig.build.json
+++ b/packages/nodes-base/tsconfig.build.json
@@ -8,7 +8,8 @@
 		"credentials/**/*.ts",
 		"nodes/**/*.ts",
 		"nodes/**/*.json",
-		"credentials/translations/**/*.json"
+		"credentials/translations/**/*.json",
+		"types/**/*.ts"
 	],
 	"exclude": ["nodes/**/*.test.ts", "credentials/**/*.test.ts", "test/**"]
 }
diff --git a/packages/nodes-base/tsconfig.json b/packages/nodes-base/tsconfig.json
index b5a7282ff9000..2cbb72109a749 100644
--- a/packages/nodes-base/tsconfig.json
+++ b/packages/nodes-base/tsconfig.json
@@ -10,7 +10,13 @@
 		"noImplicitReturns": false,
 		"useUnknownInCatchVariables": false
 	},
-	"include": ["credentials/**/*.ts", "nodes/**/*.ts", "test/**/*.ts", "utils/**/*.ts"],
+	"include": [
+		"credentials/**/*.ts",
+		"nodes/**/*.ts",
+		"test/**/*.ts",
+		"utils/**/*.ts",
+		"types/**/*.ts"
+	],
 	"references": [
 		{ "path": "../@n8n/imap/tsconfig.build.json" },
 		{ "path": "../workflow/tsconfig.build.json" },
diff --git a/packages/nodes-base/types/generate-schema.d.ts b/packages/nodes-base/types/generate-schema.d.ts
new file mode 100644
index 0000000000000..90e0e15b05cac
--- /dev/null
+++ b/packages/nodes-base/types/generate-schema.d.ts
@@ -0,0 +1,27 @@
+declare module 'generate-schema' {
+	export interface SchemaObject {
+		$schema: string;
+		title?: string;
+		type: string;
+		properties?: {
+			[key: string]: SchemaObject | SchemaArray | SchemaProperty;
+		};
+		required?: string[];
+		items?: SchemaObject | SchemaArray;
+	}
+
+	export interface SchemaArray {
+		type: string;
+		items?: SchemaObject | SchemaArray | SchemaProperty;
+		oneOf?: Array<SchemaObject | SchemaArray | SchemaProperty>;
+		required?: string[];
+	}
+
+	export interface SchemaProperty {
+		type: string | string[];
+		format?: string;
+	}
+
+	export function json(title: string, schema: SchemaObject): SchemaObject;
+	export function json(schema: SchemaObject): SchemaObject;
+}
diff --git a/packages/nodes-base/utils/binary.ts b/packages/nodes-base/utils/binary.ts
index c552f6064fa0c..fadbd147cea14 100644
--- a/packages/nodes-base/utils/binary.ts
+++ b/packages/nodes-base/utils/binary.ts
@@ -1,13 +1,12 @@
+import iconv from 'iconv-lite';
+import get from 'lodash/get';
 import type { IBinaryData, IDataObject, IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError, BINARY_ENCODING } from 'n8n-workflow';
+import { getDocument as readPDF, version as pdfJsVersion } from 'pdfjs-dist';
+import type { DocumentInitParameters } from 'pdfjs-dist/types/src/display/api';
 import type { WorkBook, WritingOptions } from 'xlsx';
 import { utils as xlsxUtils, write as xlsxWrite } from 'xlsx';
 
-import get from 'lodash/get';
-import iconv from 'iconv-lite';
-
-import { getDocument as readPDF, version as pdfJsVersion } from 'pdfjs-dist';
-import type { DocumentInitParameters } from 'pdfjs-dist/types/src/display/api';
 import { flattenObject } from '@utils/utilities';
 
 export type JsonToSpreadsheetBinaryFormat = 'csv' | 'html' | 'rtf' | 'ods' | 'xls' | 'xlsx';
diff --git a/packages/nodes-base/utils/sendAndWait/email-templates.ts b/packages/nodes-base/utils/sendAndWait/email-templates.ts
index 8c9bd20345db2..1b0bc6153d709 100644
--- a/packages/nodes-base/utils/sendAndWait/email-templates.ts
+++ b/packages/nodes-base/utils/sendAndWait/email-templates.ts
@@ -103,7 +103,7 @@ export function createEmailBody(message: string, buttons: string, instanceId?: s
 					<tr>
 						<td
 							style="text-align: center; padding-top: 8px; font-family: Arial, sans-serif; font-size: 14px; color: #7e8186;">
-							<p>${message}</p>
+							<p style="white-space: pre-line;">${message}</p>
 						</td>
 					</tr>
 					<tr>
diff --git a/packages/nodes-base/utils/sendAndWait/test/util.test.ts b/packages/nodes-base/utils/sendAndWait/test/util.test.ts
index 16e37c7790598..5194887f2f110 100644
--- a/packages/nodes-base/utils/sendAndWait/test/util.test.ts
+++ b/packages/nodes-base/utils/sendAndWait/test/util.test.ts
@@ -1,12 +1,12 @@
 import { type MockProxy, mock } from 'jest-mock-extended';
 import type { IExecuteFunctions, INodeProperties, IWebhookFunctions } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
 import {
 	getSendAndWaitProperties,
 	getSendAndWaitConfig,
 	createEmail,
 	sendAndWaitWebhook,
-	MESSAGE_PREFIX,
 } from '../utils';
 
 describe('Send and Wait utils tests', () => {
@@ -159,7 +159,7 @@ describe('Send and Wait utils tests', () => {
 
 			expect(email).toEqual({
 				to: 'test@example.com',
-				subject: `${MESSAGE_PREFIX}Test subject`,
+				subject: 'Test subject',
 				body: '',
 				htmlBody: expect.stringContaining('Test message'),
 			});
@@ -208,5 +208,162 @@ describe('Send and Wait utils tests', () => {
 				workflowData: [[{ json: { data: { approved: false } } }]],
 			});
 		});
+
+		it('should handle freeText GET webhook', async () => {
+			const mockRender = jest.fn();
+
+			mockWebhookFunctions.getRequestObject.mockReturnValue({
+				method: 'GET',
+			} as any);
+
+			mockWebhookFunctions.getResponseObject.mockReturnValue({
+				render: mockRender,
+			} as any);
+
+			mockWebhookFunctions.getNodeParameter.mockImplementation((parameterName: string) => {
+				const params: { [key: string]: any } = {
+					responseType: 'freeText',
+					message: 'Test message',
+					options: {},
+				};
+				return params[parameterName];
+			});
+
+			const result = await sendAndWaitWebhook.call(mockWebhookFunctions);
+
+			expect(result).toEqual({
+				noWebhookResponse: true,
+			});
+
+			expect(mockRender).toHaveBeenCalledWith('form-trigger', {
+				testRun: false,
+				validForm: true,
+				formTitle: '',
+				formDescription: 'Test message',
+				formSubmittedHeader: 'Got it, thanks',
+				formSubmittedText: 'This page can be closed now',
+				n8nWebsiteLink: 'https://n8n.io/?utm_source=n8n-internal&utm_medium=form-trigger',
+				formFields: [
+					{
+						id: 'field-0',
+						errorId: 'error-field-0',
+						label: 'Response',
+						inputRequired: 'form-required',
+						defaultValue: '',
+						isTextarea: true,
+					},
+				],
+				appendAttribution: true,
+				buttonLabel: 'Submit',
+			});
+		});
+
+		it('should handle freeText POST webhook', async () => {
+			mockWebhookFunctions.getRequestObject.mockReturnValue({
+				method: 'POST',
+			} as any);
+
+			mockWebhookFunctions.getBodyData.mockReturnValue({
+				data: {
+					'field-0': 'test value',
+				},
+			} as any);
+
+			mockWebhookFunctions.getNodeParameter.mockImplementation((parameterName: string) => {
+				const params: { [key: string]: any } = {
+					responseType: 'freeText',
+				};
+				return params[parameterName];
+			});
+
+			const result = await sendAndWaitWebhook.call(mockWebhookFunctions);
+
+			expect(result.workflowData).toEqual([[{ json: { data: { text: 'test value' } } }]]);
+		});
+
+		it('should handle customForm GET webhook', async () => {
+			const mockRender = jest.fn();
+
+			mockWebhookFunctions.getRequestObject.mockReturnValue({
+				method: 'GET',
+			} as any);
+
+			mockWebhookFunctions.getResponseObject.mockReturnValue({
+				render: mockRender,
+			} as any);
+
+			mockWebhookFunctions.getNodeParameter.mockImplementation((parameterName: string) => {
+				const params: { [key: string]: any } = {
+					responseType: 'customForm',
+					message: 'Test message',
+					defineForm: 'fields',
+					'formFields.values': [{ label: 'Field 1', fieldType: 'text', requiredField: true }],
+					options: {
+						responseFormTitle: 'Test title',
+						responseFormDescription: 'Test description',
+						responseFormButtonLabel: 'Test button',
+					},
+				};
+				return params[parameterName];
+			});
+
+			const result = await sendAndWaitWebhook.call(mockWebhookFunctions);
+
+			expect(result).toEqual({
+				noWebhookResponse: true,
+			});
+
+			expect(mockRender).toHaveBeenCalledWith('form-trigger', {
+				testRun: false,
+				validForm: true,
+				formTitle: 'Test title',
+				formDescription: 'Test description',
+				formSubmittedHeader: 'Got it, thanks',
+				formSubmittedText: 'This page can be closed now',
+				n8nWebsiteLink: 'https://n8n.io/?utm_source=n8n-internal&utm_medium=form-trigger',
+				formFields: [
+					{
+						id: 'field-0',
+						errorId: 'error-field-0',
+						inputRequired: 'form-required',
+						defaultValue: '',
+						isInput: true,
+						type: 'text',
+					},
+				],
+				appendAttribution: true,
+				buttonLabel: 'Test button',
+			});
+		});
+
+		it('should handle customForm POST webhook', async () => {
+			mockWebhookFunctions.getRequestObject.mockReturnValue({
+				method: 'POST',
+			} as any);
+
+			mockWebhookFunctions.getNodeParameter.mockImplementation((parameterName: string) => {
+				const params: { [key: string]: any } = {
+					responseType: 'customForm',
+					defineForm: 'fields',
+					'formFields.values': [
+						{
+							fieldLabel: 'test 1',
+							fieldType: 'text',
+						},
+					],
+				};
+				return params[parameterName];
+			});
+
+			mockWebhookFunctions.getBodyData.mockReturnValue({
+				data: {
+					'field-0': 'test value',
+				},
+			} as any);
+
+			const result = await sendAndWaitWebhook.call(mockWebhookFunctions);
+
+			expect(result.workflowData).toEqual([[{ json: { data: { 'test 1': 'test value' } } }]]);
+		});
 	});
 });
diff --git a/packages/nodes-base/utils/sendAndWait/utils.ts b/packages/nodes-base/utils/sendAndWait/utils.ts
index fd633fe519199..5328c2c8d3114 100644
--- a/packages/nodes-base/utils/sendAndWait/utils.ts
+++ b/packages/nodes-base/utils/sendAndWait/utils.ts
@@ -1,13 +1,27 @@
-import { NodeOperationError, SEND_AND_WAIT_OPERATION, updateDisplayOptions } from 'n8n-workflow';
-import type { INodeProperties, IExecuteFunctions, IWebhookFunctions } from 'n8n-workflow';
-import type { IEmail } from './interfaces';
-import { escapeHtml } from '../utilities';
+import {
+	NodeOperationError,
+	SEND_AND_WAIT_OPERATION,
+	tryToParseJsonToFormFields,
+	updateDisplayOptions,
+} from 'n8n-workflow';
+import type {
+	INodeProperties,
+	IExecuteFunctions,
+	IWebhookFunctions,
+	IDataObject,
+	FormFieldsParameter,
+} from 'n8n-workflow';
+
 import {
 	ACTION_RECORDED_PAGE,
 	BUTTON_STYLE_PRIMARY,
 	BUTTON_STYLE_SECONDARY,
 	createEmailBody,
 } from './email-templates';
+import type { IEmail } from './interfaces';
+import { formFieldsProperties } from '../../nodes/Form/Form.node';
+import { prepareFormData, prepareFormReturnItem, resolveRawData } from '../../nodes/Form/utils';
+import { escapeHtml } from '../utilities';
 
 type SendAndWaitConfig = {
 	title: string;
@@ -16,7 +30,14 @@ type SendAndWaitConfig = {
 	options: Array<{ label: string; value: string; style: string }>;
 };
 
-export const MESSAGE_PREFIX = 'ACTION REQUIRED: ';
+type FormResponseTypeOptions = {
+	messageButtonLabel?: string;
+	responseFormTitle?: string;
+	responseFormDescription?: string;
+	responseFormButtonLabel?: string;
+};
+
+const INPUT_FIELD_IDENTIFIER = 'field-0';
 
 // Operation Properties ----------------------------------------------------------
 export function getSendAndWaitProperties(
@@ -57,9 +78,32 @@ export function getSendAndWaitProperties(
 			default: '',
 			required: true,
 			typeOptions: {
-				rows: 5,
+				rows: 4,
 			},
 		},
+		{
+			displayName: 'Response Type',
+			name: 'responseType',
+			type: 'options',
+			default: 'approval',
+			options: [
+				{
+					name: 'Approval',
+					value: 'approval',
+					description: 'User can approve/disapprove from within the message',
+				},
+				{
+					name: 'Free Text',
+					value: 'freeText',
+					description: 'User can submit a response via a form',
+				},
+				{
+					name: 'Custom Form',
+					value: 'customForm',
+					description: 'User can submit a response via a custom form',
+				},
+			],
+		},
 		{
 			displayName: 'Approval Options',
 			name: 'approvalOptions',
@@ -134,15 +178,61 @@ export function getSendAndWaitProperties(
 					],
 				},
 			],
+			displayOptions: {
+				show: {
+					responseType: ['approval'],
+				},
+			},
 		},
-		...additionalProperties,
+		...updateDisplayOptions(
+			{
+				show: {
+					responseType: ['customForm'],
+				},
+			},
+			formFieldsProperties,
+		),
 		{
-			displayName:
-				'Use the wait node for more complex approval flows. <a href="https://docs.n8n.io/nodes/n8n-nodes-base.wait" target="_blank">More info</a>',
-			name: 'useWaitNotice',
-			type: 'notice',
-			default: '',
+			displayName: 'Options',
+			name: 'options',
+			type: 'collection',
+			placeholder: 'Add option',
+			default: {},
+			options: [
+				{
+					displayName: 'Message Button Label',
+					name: 'messageButtonLabel',
+					type: 'string',
+					default: 'Respond',
+				},
+				{
+					displayName: 'Response Form Title',
+					name: 'responseFormTitle',
+					description: 'Title of the form that the user can access to provide their response',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'Response Form Description',
+					name: 'responseFormDescription',
+					description: 'Description of the form that the user can access to provide their response',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'Response Form Button Label',
+					name: 'responseFormButtonLabel',
+					type: 'string',
+					default: 'Submit',
+				},
+			],
+			displayOptions: {
+				show: {
+					responseType: ['freeText', 'customForm'],
+				},
+			},
 		},
+		...additionalProperties,
 	];
 
 	return updateDisplayOptions(
@@ -157,7 +247,136 @@ export function getSendAndWaitProperties(
 }
 
 // Webhook Function --------------------------------------------------------------
+const getFormResponseCustomizations = (context: IWebhookFunctions) => {
+	const message = context.getNodeParameter('message', '') as string;
+	const options = context.getNodeParameter('options', {}) as FormResponseTypeOptions;
+
+	let formTitle = '';
+	if (options.responseFormTitle) {
+		formTitle = options.responseFormTitle;
+	}
+
+	let formDescription = message;
+	if (options.responseFormDescription) {
+		formDescription = options.responseFormDescription;
+	}
+	formDescription = formDescription.replace(/\\n/g, '\n').replace(/<br>/g, '\n');
+
+	let buttonLabel = 'Submit';
+	if (options.responseFormButtonLabel) {
+		buttonLabel = options.responseFormButtonLabel;
+	}
+
+	return {
+		formTitle,
+		formDescription,
+		buttonLabel,
+	};
+};
+
 export async function sendAndWaitWebhook(this: IWebhookFunctions) {
+	const method = this.getRequestObject().method;
+	const res = this.getResponseObject();
+	const responseType = this.getNodeParameter('responseType', 'approval') as
+		| 'approval'
+		| 'freeText'
+		| 'customForm';
+
+	if (responseType === 'freeText') {
+		if (method === 'GET') {
+			const { formTitle, formDescription, buttonLabel } = getFormResponseCustomizations(this);
+
+			const data = prepareFormData({
+				formTitle,
+				formDescription,
+				formSubmittedHeader: 'Got it, thanks',
+				formSubmittedText: 'This page can be closed now',
+				buttonLabel,
+				redirectUrl: undefined,
+				formFields: [
+					{
+						fieldLabel: 'Response',
+						fieldType: 'textarea',
+						requiredField: true,
+					},
+				],
+				testRun: false,
+				query: {},
+			});
+
+			res.render('form-trigger', data);
+
+			return {
+				noWebhookResponse: true,
+			};
+		}
+		if (method === 'POST') {
+			const data = this.getBodyData().data as IDataObject;
+
+			return {
+				webhookResponse: ACTION_RECORDED_PAGE,
+				workflowData: [[{ json: { data: { text: data[INPUT_FIELD_IDENTIFIER] } } }]],
+			};
+		}
+	}
+
+	if (responseType === 'customForm') {
+		const defineForm = this.getNodeParameter('defineForm', 'fields') as 'fields' | 'json';
+		let fields: FormFieldsParameter = [];
+
+		if (defineForm === 'json') {
+			try {
+				const jsonOutput = this.getNodeParameter('jsonOutput', '', {
+					rawExpressions: true,
+				}) as string;
+
+				fields = tryToParseJsonToFormFields(resolveRawData(this, jsonOutput));
+			} catch (error) {
+				throw new NodeOperationError(this.getNode(), error.message, {
+					description: error.message,
+				});
+			}
+		} else {
+			fields = this.getNodeParameter('formFields.values', []) as FormFieldsParameter;
+		}
+
+		if (method === 'GET') {
+			const { formTitle, formDescription, buttonLabel } = getFormResponseCustomizations(this);
+
+			const data = prepareFormData({
+				formTitle,
+				formDescription,
+				formSubmittedHeader: 'Got it, thanks',
+				formSubmittedText: 'This page can be closed now',
+				buttonLabel,
+				redirectUrl: undefined,
+				formFields: fields,
+				testRun: false,
+				query: {},
+			});
+
+			res.render('form-trigger', data);
+
+			return {
+				noWebhookResponse: true,
+			};
+		}
+		if (method === 'POST') {
+			const returnItem = await prepareFormReturnItem(this, fields, 'production', true);
+			const json = returnItem.json;
+
+			delete json.submittedAt;
+			delete json.formMode;
+
+			returnItem.json = { data: json };
+
+			return {
+				webhookResponse: ACTION_RECORDED_PAGE,
+				workflowData: [[returnItem]],
+			};
+		}
+	}
+
 	const query = this.getRequestObject().query as { approved: 'false' | 'true' };
 	const approved = query.approved === 'true';
 	return {
@@ -168,7 +387,9 @@ export async function sendAndWaitWebhook(this: IWebhookFunctions) {
 
 // Send and Wait Config -----------------------------------------------------------
 export function getSendAndWaitConfig(context: IExecuteFunctions): SendAndWaitConfig {
-	const message = escapeHtml((context.getNodeParameter('message', 0, '') as string).trim());
+	const message = escapeHtml((context.getNodeParameter('message', 0, '') as string).trim())
+		.replace(/\\n/g, '\n')
+		.replace(/<br>/g, '\n');
 	const subject = escapeHtml(context.getNodeParameter('subject', 0, '') as string);
 	const resumeUrl = context.evaluateExpression('{{ $execution?.resumeUrl }}', 0) as string;
 	const nodeId = context.evaluateExpression('{{ $nodeId }}', 0) as string;
@@ -187,7 +408,16 @@ export function getSendAndWaitConfig(context: IExecuteFunctions): SendAndWaitCon
 		options: [],
 	};
 
-	if (approvalOptions.approvalType === 'double') {
+	const responseType = context.getNodeParameter('responseType', 0, 'approval') as string;
+
+	if (responseType === 'freeText' || responseType === 'customForm') {
+		const label = context.getNodeParameter('options.messageButtonLabel', 0, 'Respond') as string;
+		config.options.push({
+			label,
+			value: 'true',
+			style: 'primary',
+		});
+	} else if (approvalOptions.approvalType === 'double') {
 		const approveLabel = escapeHtml(approvalOptions.approveLabel || 'Approve');
 		const buttonApprovalStyle = approvalOptions.buttonApprovalStyle || 'primary';
 		const disapproveLabel = escapeHtml(approvalOptions.disapproveLabel || 'Disapprove');
@@ -245,7 +475,7 @@ export function createEmail(context: IExecuteFunctions) {
 
 	const email: IEmail = {
 		to,
-		subject: `${MESSAGE_PREFIX}${config.title}`,
+		subject: config.title,
 		body: '',
 		htmlBody: createEmailBody(config.message, buttons.join('\n'), instanceId),
 	};
diff --git a/packages/nodes-base/utils/utilities.ts b/packages/nodes-base/utils/utilities.ts
index 5c0b7f9d2bb72..cae18ae90b2a7 100644
--- a/packages/nodes-base/utils/utilities.ts
+++ b/packages/nodes-base/utils/utilities.ts
@@ -1,3 +1,4 @@
+import { isEqual, isNull, merge, isObject, reduce, get } from 'lodash';
 import type {
 	IDataObject,
 	IDisplayOptions,
@@ -5,11 +6,8 @@ import type {
 	INodeProperties,
 	IPairedItemData,
 } from 'n8n-workflow';
-
 import { ApplicationError, jsonParse, randomInt } from 'n8n-workflow';
 
-import { isEqual, isNull, merge, isObject, reduce, get } from 'lodash';
-
 /**
  * Creates an array of elements split into groups the length of `size`.
  * If `array` can't be split evenly, the final chunk will be the remaining
diff --git a/packages/nodes-base/utils/workflowInputsResourceMapping/.readme b/packages/nodes-base/utils/workflowInputsResourceMapping/.readme
new file mode 100644
index 0000000000000..e5556cc0cccaf
--- /dev/null
+++ b/packages/nodes-base/utils/workflowInputsResourceMapping/.readme
@@ -0,0 +1,5 @@
+These files contain reusable logic for workflow inputs mapping used in these nodes:
+
+    - n8n-nodes-base.executeWorkflow
+    - n8n-nodes-base.executeWorkflowTrigger
+    - @n8n/n8n-nodes-langchain.toolWorkflow
diff --git a/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts b/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts
new file mode 100644
index 0000000000000..ba1c17f315c79
--- /dev/null
+++ b/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts
@@ -0,0 +1,167 @@
+import { json as generateSchemaFromExample, type SchemaObject } from 'generate-schema';
+import type { JSONSchema7 } from 'json-schema';
+import _ from 'lodash';
+import type {
+	FieldValueOption,
+	FieldType,
+	IWorkflowNodeContext,
+	INodeExecutionData,
+	IDataObject,
+	ResourceMapperField,
+	ILocalLoadOptionsFunctions,
+	ResourceMapperFields,
+	ISupplyDataFunctions,
+} from 'n8n-workflow';
+import { jsonParse, NodeOperationError, EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE } from 'n8n-workflow';
+
+import {
+	JSON_EXAMPLE,
+	INPUT_SOURCE,
+	WORKFLOW_INPUTS,
+	VALUES,
+	TYPE_OPTIONS,
+	PASSTHROUGH,
+} from './constants';
+
+const SUPPORTED_TYPES = TYPE_OPTIONS.map((x) => x.value);
+
+function parseJsonSchema(schema: JSONSchema7): FieldValueOption[] | string {
+	if (!schema?.properties) {
+		return 'Invalid JSON schema. Missing key `properties` in schema';
+	}
+
+	if (typeof schema.properties !== 'object') {
+		return 'Invalid JSON schema. Key `properties` is not an object';
+	}
+
+	const result: FieldValueOption[] = [];
+	for (const [name, v] of Object.entries(schema.properties)) {
+		if (typeof v !== 'object') {
+			return `Invalid JSON schema. Value for property '${name}' is not an object`;
+		}
+
+		const type = v?.type;
+
+		if (type === 'null') {
+			result.push({ name, type: 'any' });
+		} else if (Array.isArray(type)) {
+			// Schema allows an array of types, but we don't
+			return `Invalid JSON schema. Array of types for property '${name}' is not supported by n8n. Either provide a single type or use type 'any' to allow any type`;
+		} else if (typeof type !== 'string') {
+			return `Invalid JSON schema. Unexpected non-string type ${type} for property '${name}'`;
+		} else if (!SUPPORTED_TYPES.includes(type as never)) {
+			return `Invalid JSON schema. Unsupported type ${type} for property '${name}'. Supported types are ${JSON.stringify(SUPPORTED_TYPES, null, 1)}`;
+		} else {
+			result.push({ name, type: type as FieldType });
+		}
+	}
+	return result;
+}
+
+function parseJsonExample(context: IWorkflowNodeContext): JSONSchema7 {
+	const jsonString = context.getNodeParameter(JSON_EXAMPLE, 0, '') as string;
+	const json = jsonParse<SchemaObject>(jsonString);
+
+	return generateSchemaFromExample(json) as JSONSchema7;
+}
+
+export function getFieldEntries(context: IWorkflowNodeContext): FieldValueOption[] {
+	const inputSource = context.getNodeParameter(INPUT_SOURCE, 0);
+	let result: FieldValueOption[] | string = 'Internal Error: Invalid input source';
+	try {
+		if (inputSource === WORKFLOW_INPUTS) {
+			result = context.getNodeParameter(
+				`${WORKFLOW_INPUTS}.${VALUES}`,
+				0,
+				[],
+			) as FieldValueOption[];
+		} else if (inputSource === JSON_EXAMPLE) {
+			const schema = parseJsonExample(context);
+			result = parseJsonSchema(schema);
+		} else if (inputSource === PASSTHROUGH) {
+			result = [];
+		}
+	} catch (e: unknown) {
+		result =
+			e && typeof e === 'object' && 'message' in e && typeof e.message === 'string'
+				? e.message
+				: `Unknown error occurred: ${JSON.stringify(e)}`;
+	}
+
+	if (Array.isArray(result)) {
+		return result;
+	}
+	throw new NodeOperationError(context.getNode(), result);
+}
+
+export function getWorkflowInputValues(this: ISupplyDataFunctions): INodeExecutionData[] {
+	const inputData = this.getInputData();
+
+	return inputData.map((item, itemIndex) => {
+		const itemFieldValues = this.getNodeParameter(
+			'workflowInputs.value',
+			itemIndex,
+			{},
+		) as IDataObject;
+
+		return {
+			json: {
+				...item.json,
+				...itemFieldValues,
+			},
+			index: itemIndex,
+			pairedItem: {
+				item: itemIndex,
+			},
+		};
+	});
+}
+
+export function getCurrentWorkflowInputData(this: ISupplyDataFunctions) {
+	const inputData: INodeExecutionData[] = getWorkflowInputValues.call(this);
+
+	const schema = this.getNodeParameter('workflowInputs.schema', 0, []) as ResourceMapperField[];
+
+	if (schema.length === 0) {
+		return inputData;
+	} else {
+		const removedKeys = new Set(schema.filter((x) => x.removed).map((x) => x.displayName));
+
+		const filteredInputData: INodeExecutionData[] = inputData.map((item, index) => ({
+			index,
+			pairedItem: { item: index },
+			json: _.pickBy(item.json, (_v, key) => !removedKeys.has(key)),
+		}));
+
+		return filteredInputData;
+	}
+}
+
+export async function loadWorkflowInputMappings(
+	this: ILocalLoadOptionsFunctions,
+): Promise<ResourceMapperFields> {
+	const nodeLoadContext = await this.getWorkflowNodeContext(EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE);
+	let fields: ResourceMapperField[] = [];
+
+	if (nodeLoadContext) {
+		const fieldValues = getFieldEntries(nodeLoadContext);
+
+		fields = fieldValues.map((currentWorkflowInput) => {
+			const field: ResourceMapperField = {
+				id: currentWorkflowInput.name,
+				displayName: currentWorkflowInput.name,
+				required: false,
+				defaultMatch: false,
+				display: true,
+				canBeUsedToMatch: true,
+			};
+
+			if (currentWorkflowInput.type !== 'any') {
+				field.type = currentWorkflowInput.type;
+			}
+
+			return field;
+		});
+	}
+	return { fields };
+}
diff --git a/packages/nodes-base/utils/workflowInputsResourceMapping/constants.ts b/packages/nodes-base/utils/workflowInputsResourceMapping/constants.ts
new file mode 100644
index 0000000000000..409d8d703ecab
--- /dev/null
+++ b/packages/nodes-base/utils/workflowInputsResourceMapping/constants.ts
@@ -0,0 +1,36 @@
+import type { FieldType } from 'n8n-workflow';
+
+export const INPUT_SOURCE = 'inputSource';
+export const WORKFLOW_INPUTS = 'workflowInputs';
+export const VALUES = 'values';
+export const JSON_EXAMPLE = 'jsonExample';
+export const PASSTHROUGH = 'passthrough';
+export const TYPE_OPTIONS: Array<{ name: string; value: FieldType | 'any' }> = [
+	{
+		name: 'Allow Any Type',
+		value: 'any',
+	},
+	{
+		name: 'String',
+		value: 'string',
+	},
+	{
+		name: 'Number',
+		value: 'number',
+	},
+	{
+		name: 'Boolean',
+		value: 'boolean',
+	},
+	{
+		name: 'Array',
+		value: 'array',
+	},
+	{
+		name: 'Object',
+		value: 'object',
+	},
+	// Intentional omission of `dateTime`, `time`, `string-alphanumeric`, `form-fields`, `jwt` and `url`
+];
+
+export const FALLBACK_DEFAULT_VALUE = null;
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 1c0c1301adf15..cabbeaaaaa618 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-workflow",
-  "version": "1.70.0",
+  "version": "1.72.0",
   "description": "Workflow base code of n8n",
   "main": "dist/index.js",
   "module": "src/index.ts",
diff --git a/packages/workflow/src/Constants.ts b/packages/workflow/src/Constants.ts
index ea05e58c599ca..8f35e5f257697 100644
--- a/packages/workflow/src/Constants.ts
+++ b/packages/workflow/src/Constants.ts
@@ -1,5 +1,3 @@
-import type { NodeParameterValue } from './Interfaces';
-
 export const DIGITS = '0123456789';
 export const UPPERCASE_LETTERS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
 export const LOWERCASE_LETTERS = UPPERCASE_LETTERS.toLowerCase();
@@ -87,35 +85,6 @@ export const LANGCHAIN_CUSTOM_TOOLS = [
 	HTTP_REQUEST_TOOL_LANGCHAIN_NODE_TYPE,
 ];
 
-//nodes that would execute only once with such parameters
-//add 'undefined' to parameters values if it is parameter's default value
-export const SINGLE_EXECUTION_NODES: { [key: string]: { [key: string]: NodeParameterValue[] } } = {
-	'n8n-nodes-base.code': {
-		mode: [undefined, 'runOnceForAllItems'],
-	},
-	'n8n-nodes-base.executeWorkflow': {
-		mode: [undefined, 'once'],
-	},
-	'n8n-nodes-base.crateDb': {
-		operation: [undefined, 'update'], // default insert
-	},
-	'n8n-nodes-base.timescaleDb': {
-		operation: [undefined, 'update'], // default insert
-	},
-	'n8n-nodes-base.microsoftSql': {
-		operation: [undefined, 'update', 'delete'], // default insert
-	},
-	'n8n-nodes-base.questDb': {
-		operation: [undefined], // default insert
-	},
-	'n8n-nodes-base.mongoDb': {
-		operation: ['insert', 'update'],
-	},
-	'n8n-nodes-base.redis': {
-		operation: [undefined], // default info
-	},
-};
-
 export const SEND_AND_WAIT_OPERATION = 'sendAndWait';
 export const AI_TRANSFORM_CODE_GENERATED_FOR_PROMPT = 'codeGeneratedForPrompt';
 export const AI_TRANSFORM_JS_CODE = 'jsCode';
diff --git a/packages/workflow/src/ErrorReporterProxy.ts b/packages/workflow/src/ErrorReporterProxy.ts
deleted file mode 100644
index cedb921d5e2bc..0000000000000
--- a/packages/workflow/src/ErrorReporterProxy.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { ApplicationError, type ReportingOptions } from './errors/application.error';
-import * as Logger from './LoggerProxy';
-
-interface ErrorReporter {
-	report: (error: Error | string, options?: ReportingOptions) => void;
-}
-
-const instance: ErrorReporter = {
-	report: (error, options) => {
-		if (error instanceof Error) {
-			let e = error;
-
-			const { executionId } = options ?? {};
-			const context = executionId ? ` (execution ${executionId})` : '';
-
-			do {
-				const msg = [e.message + context, e.stack ? `\n${e.stack}\n` : ''].join('');
-				const meta = e instanceof ApplicationError ? e.extra : undefined;
-				Logger.error(msg, meta);
-				e = e.cause as Error;
-			} while (e);
-		}
-	},
-};
-
-export function init(errorReporter: ErrorReporter) {
-	instance.report = errorReporter.report;
-}
-
-const wrap = (e: unknown) => {
-	if (e instanceof Error) return e;
-	if (typeof e === 'string') return new ApplicationError(e);
-	return;
-};
-
-export const error = (e: unknown, options?: ReportingOptions) => {
-	const toReport = wrap(e);
-	if (toReport) instance.report(toReport, options);
-};
-
-export const info = (msg: string, options?: ReportingOptions) => {
-	Logger.info(msg);
-	instance.report(msg, { ...options, level: 'info' });
-};
-
-export const warn = (warning: Error | string, options?: ReportingOptions) =>
-	error(warning, { ...options, level: 'warning' });
diff --git a/packages/workflow/src/Extensions/ExpressionExtension.ts b/packages/workflow/src/Extensions/ExpressionExtension.ts
index 2c8d745bd87a1..1f3b8d2fc0b32 100644
--- a/packages/workflow/src/Extensions/ExpressionExtension.ts
+++ b/packages/workflow/src/Extensions/ExpressionExtension.ts
@@ -137,7 +137,6 @@ export const extendTransform = (expression: string): { code: string } | undefine
 				// This is to match our fork of tmpl
 				const globalIdentifier = types.builders.identifier(
 					// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-					// @ts-ignore
 					typeof window !== 'object' ? 'global' : 'window',
 				);
 				// We want to define all of our commonly used identifiers and member
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index 81dbe231b0c97..6c28d4664dc2c 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -421,60 +421,6 @@ export interface IRunNodeResponse {
 	data: INodeExecutionData[][] | NodeExecutionOutput | null | undefined;
 	closeFunction?: CloseFunction;
 }
-export interface IGetExecuteFunctions {
-	(
-		workflow: Workflow,
-		runExecutionData: IRunExecutionData,
-		runIndex: number,
-		connectionInputData: INodeExecutionData[],
-		inputData: ITaskDataConnections,
-		node: INode,
-		additionalData: IWorkflowExecuteAdditionalData,
-		executeData: IExecuteData,
-		mode: WorkflowExecuteMode,
-		closeFunctions: CloseFunction[],
-		abortSignal?: AbortSignal,
-	): IExecuteFunctions;
-}
-
-export interface IGetExecuteSingleFunctions {
-	(
-		workflow: Workflow,
-		runExecutionData: IRunExecutionData,
-		runIndex: number,
-		connectionInputData: INodeExecutionData[],
-		inputData: ITaskDataConnections,
-		node: INode,
-		itemIndex: number,
-		additionalData: IWorkflowExecuteAdditionalData,
-		executeData: IExecuteData,
-		mode: WorkflowExecuteMode,
-		abortSignal?: AbortSignal,
-	): IExecuteSingleFunctions;
-}
-
-export interface IGetExecuteHookFunctions {
-	(
-		workflow: Workflow,
-		node: INode,
-		additionalData: IWorkflowExecuteAdditionalData,
-		mode: WorkflowExecuteMode,
-		activation: WorkflowActivateMode,
-		webhookData?: IWebhookData,
-	): IHookFunctions;
-}
-
-export interface IGetExecuteWebhookFunctions {
-	(
-		workflow: Workflow,
-		node: INode,
-		additionalData: IWorkflowExecuteAdditionalData,
-		mode: WorkflowExecuteMode,
-		webhookData: IWebhookData,
-		closeFunctions: CloseFunction[],
-		runExecutionData: IRunExecutionData | null,
-	): IWebhookFunctions;
-}
 
 export interface ISourceDataConnections {
 	// Key for each input type and because there can be multiple inputs of the same type it is an array
@@ -903,6 +849,7 @@ export type NodeTypeAndVersion = {
 	name: string;
 	type: string;
 	typeVersion: number;
+	disabled: boolean;
 };
 
 export interface FunctionsBase {
@@ -943,7 +890,7 @@ type BaseExecutionFunctions = FunctionsBaseWithRequiredKeys<'getMode'> & {
 	getContext(type: ContextType): IContextObject;
 	getExecuteData(): IExecuteData;
 	getWorkflowDataProxy(itemIndex: number): IWorkflowDataProxyData;
-	getInputSourceData(inputIndex?: number, inputName?: string): ISourceData;
+	getInputSourceData(inputIndex?: number, connectionType?: NodeConnectionType): ISourceData;
 	getExecutionCancelSignal(): AbortSignal | undefined;
 	onExecutionCancellation(handler: () => unknown): void;
 	logAiEvent(eventName: AiEvent, msg?: string | undefined): void;
@@ -962,11 +909,11 @@ export type IExecuteFunctions = ExecuteFunctions.GetNodeParameterFn &
 			},
 		): Promise<ExecuteWorkflowData>;
 		getInputConnectionData(
-			inputName: NodeConnectionType,
+			connectionType: AINodeConnectionType,
 			itemIndex: number,
 			inputIndex?: number,
 		): Promise<unknown>;
-		getInputData(inputIndex?: number, inputName?: string): INodeExecutionData[];
+		getInputData(inputIndex?: number, connectionType?: NodeConnectionType): INodeExecutionData[];
 		getNodeInputs(): INodeInputConfiguration[];
 		getNodeOutputs(): INodeOutputConfiguration[];
 		putExecutionToWait(waitTill: Date): Promise<void>;
@@ -1000,6 +947,7 @@ export type IExecuteFunctions = ExecuteFunctions.GetNodeParameterFn &
 				): NodeExecutionWithMetadata[];
 				assertBinaryData(itemIndex: number, propertyName: string): IBinaryData;
 				getBinaryDataBuffer(itemIndex: number, propertyName: string): Promise<Buffer>;
+				detectBinaryEncoding(buffer: Buffer): string;
 				copyInputItems(items: INodeExecutionData[], properties: string[]): IDataObject[];
 			};
 
@@ -1013,7 +961,7 @@ export type IExecuteFunctions = ExecuteFunctions.GetNodeParameterFn &
 	};
 
 export interface IExecuteSingleFunctions extends BaseExecutionFunctions {
-	getInputData(inputIndex?: number, inputName?: string): INodeExecutionData;
+	getInputData(inputIndex?: number, connectionType?: NodeConnectionType): INodeExecutionData;
 	getItemIndex(): number;
 	getNodeParameter(
 		parameterName: string,
@@ -1026,6 +974,7 @@ export interface IExecuteSingleFunctions extends BaseExecutionFunctions {
 		BinaryHelperFunctions & {
 			assertBinaryData(propertyName: string, inputIndex?: number): IBinaryData;
 			getBinaryDataBuffer(propertyName: string, inputIndex?: number): Promise<Buffer>;
+			detectBinaryEncoding(buffer: Buffer): string;
 		};
 }
 
@@ -1068,9 +1017,23 @@ export interface ILoadOptionsFunctions extends FunctionsBase {
 		options?: IGetNodeParameterOptions,
 	): NodeParameterValueType | object | undefined;
 	getCurrentNodeParameters(): INodeParameters | undefined;
+
 	helpers: RequestHelperFunctions & SSHTunnelFunctions;
 }
 
+export type FieldValueOption = { name: string; type: FieldType | 'any' };
+
+export type IWorkflowNodeContext = ExecuteFunctions.GetNodeParameterFn &
+	Pick<FunctionsBase, 'getNode'>;
+
+export interface ILocalLoadOptionsFunctions {
+	getWorkflowNodeContext(nodeType: string): Promise<IWorkflowNodeContext | null>;
+}
+
+export interface IWorkflowLoader {
+	get(workflowId: string): Promise<IWorkflowBase>;
+}
+
 export interface IPollFunctions
 	extends FunctionsBaseWithRequiredKeys<'getMode' | 'getActivationMode'> {
 	__emit(
@@ -1127,7 +1090,7 @@ export interface IWebhookFunctions extends FunctionsBaseWithRequiredKeys<'getMod
 	getBodyData(): IDataObject;
 	getHeaderData(): IncomingHttpHeaders;
 	getInputConnectionData(
-		inputName: NodeConnectionType,
+		connectionType: AINodeConnectionType,
 		itemIndex: number,
 		inputIndex?: number,
 	): Promise<unknown>;
@@ -1225,10 +1188,6 @@ export interface INodeExecutionData {
 export interface INodeExecuteFunctions {
 	getExecutePollFunctions: IGetExecutePollFunctions;
 	getExecuteTriggerFunctions: IGetExecuteTriggerFunctions;
-	getExecuteFunctions: IGetExecuteFunctions;
-	getExecuteSingleFunctions: IGetExecuteSingleFunctions;
-	getExecuteHookFunctions: IGetExecuteHookFunctions;
-	getExecuteWebhookFunctions: IGetExecuteWebhookFunctions;
 }
 
 export type NodeParameterValue = string | number | boolean | undefined | null;
@@ -1348,14 +1307,18 @@ export interface INodePropertyTypeOptions {
 	resourceMapper?: ResourceMapperTypeOptions;
 	filter?: FilterTypeOptions;
 	assignment?: AssignmentTypeOptions;
+	minRequiredFields?: number; // Supported by: fixedCollection
+	maxAllowedFields?: number; // Supported by: fixedCollection
 	[key: string]: any;
 }
 
-export interface ResourceMapperTypeOptions {
-	resourceMapperMethod: string;
-	mode: 'add' | 'update' | 'upsert';
+export interface ResourceMapperTypeOptionsBase {
+	mode: 'add' | 'update' | 'upsert' | 'map';
 	valuesLabel?: string;
-	fieldWords?: { singular: string; plural: string };
+	fieldWords?: {
+		singular: string;
+		plural: string;
+	};
 	addAllFields?: boolean;
 	noFieldsError?: string;
 	multiKeyMatch?: boolean;
@@ -1365,8 +1328,23 @@ export interface ResourceMapperTypeOptions {
 		description?: string;
 		hint?: string;
 	};
+	showTypeConversionOptions?: boolean;
 }
 
+// Enforce at least one of resourceMapperMethod or localResourceMapperMethod
+export type ResourceMapperTypeOptionsLocal = {
+	resourceMapperMethod: string;
+	localResourceMapperMethod?: never; // Explicitly disallows this property
+};
+
+export type ResourceMapperTypeOptionsExternal = {
+	localResourceMapperMethod: string;
+	resourceMapperMethod?: never; // Explicitly disallows this property
+};
+
+export type ResourceMapperTypeOptions = ResourceMapperTypeOptionsBase &
+	(ResourceMapperTypeOptionsLocal | ResourceMapperTypeOptionsExternal);
+
 type NonEmptyArray<T> = [T, ...T[]];
 
 export type FilterTypeCombinator = 'and' | 'or';
@@ -1638,6 +1616,9 @@ export interface INodeType {
 		resourceMapping?: {
 			[functionName: string]: (this: ILoadOptionsFunctions) => Promise<ResourceMapperFields>;
 		};
+		localResourceMapping?: {
+			[functionName: string]: (this: ILocalLoadOptionsFunctions) => Promise<ResourceMapperFields>;
+		};
 		actionHandler?: {
 			[functionName: string]: (
 				this: ILoadOptionsFunctions,
@@ -1862,30 +1843,21 @@ export interface IPostReceiveSort extends IPostReceiveBase {
 
 export const enum NodeConnectionType {
 	AiAgent = 'ai_agent',
-
 	AiChain = 'ai_chain',
-
 	AiDocument = 'ai_document',
-
 	AiEmbedding = 'ai_embedding',
-
 	AiLanguageModel = 'ai_languageModel',
-
 	AiMemory = 'ai_memory',
-
 	AiOutputParser = 'ai_outputParser',
-
 	AiRetriever = 'ai_retriever',
-
 	AiTextSplitter = 'ai_textSplitter',
-
 	AiTool = 'ai_tool',
-
 	AiVectorStore = 'ai_vectorStore',
-
 	Main = 'main',
 }
 
+export type AINodeConnectionType = Exclude<NodeConnectionType, NodeConnectionType.Main>;
+
 export const nodeConnectionTypes: NodeConnectionType[] = [
 	NodeConnectionType.AiAgent,
 	NodeConnectionType.AiChain,
@@ -2015,7 +1987,6 @@ export interface IWebhookDescription {
 	responseData?: WebhookResponseData | string;
 	restartWebhook?: boolean;
 	isForm?: boolean;
-	hasLifecycleMethods?: boolean; // set automatically by generate-ui-types
 	ndvHideUrl?: string | boolean; // If true the webhook will not be displayed in the editor
 	ndvHideMethod?: string | boolean; // If true the method will not be displayed in the editor
 }
@@ -2057,7 +2028,28 @@ export interface IWorkflowDataProxyData {
 	constructor: any;
 }
 
-export type IWorkflowDataProxyAdditionalKeys = IDataObject;
+export type IWorkflowDataProxyAdditionalKeys = IDataObject & {
+	$execution?: {
+		id: string;
+		mode: 'test' | 'production';
+		resumeUrl: string;
+		resumeFormUrl: string;
+		customData?: {
+			set(key: string, value: string): void;
+			setAll(obj: Record<string, string>): void;
+			get(key: string): string;
+			getAll(): Record<string, string>;
+		};
+	};
+	$vars?: IDataObject;
+	$secrets?: IDataObject;
+	$pageCount?: number;
+
+	/** @deprecated */
+	$executionId?: string;
+	/** @deprecated */
+	$resumeWebhookUrl?: string;
+};
 
 export interface IWorkflowMetadata {
 	id?: string;
@@ -2373,9 +2365,6 @@ export interface IWorkflowExecuteAdditionalData {
 		mode: WorkflowExecuteMode,
 		envProviderState: EnvProviderState,
 		executeData?: IExecuteData,
-		defaultReturnRunIndex?: number,
-		selfData?: IDataObject,
-		contextNodeName?: string,
 	): Promise<Result<T, E>>;
 }
 
@@ -2698,6 +2687,9 @@ export type ResourceMapperValue = {
 	value: { [key: string]: string | number | boolean | null } | null;
 	matchingColumns: string[];
 	schema: ResourceMapperField[];
+	ignoreTypeMismatchErrors: boolean;
+	attemptToConvertTypes: boolean;
+	convertFieldsToString: boolean;
 };
 
 export type FilterOperatorType =
diff --git a/packages/workflow/src/NodeHelpers.ts b/packages/workflow/src/NodeHelpers.ts
index 97e63c96d8a6a..22883a73bba4c 100644
--- a/packages/workflow/src/NodeHelpers.ts
+++ b/packages/workflow/src/NodeHelpers.ts
@@ -1,22 +1,16 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
-
 /* eslint-disable @typescript-eslint/no-use-before-define */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
-
 /* eslint-disable prefer-spread */
-
 import get from 'lodash/get';
 import isEqual from 'lodash/isEqual';
-import uniqBy from 'lodash/uniqBy';
 
-import { SINGLE_EXECUTION_NODES } from './Constants';
 import { ApplicationError } from './errors/application.error';
 import { NodeConnectionType } from './Interfaces';
 import type {
 	FieldType,
 	IContextObject,
-	IHttpRequestMethods,
 	INode,
 	INodeCredentialDescription,
 	INodeIssueObjectProperty,
@@ -33,12 +27,9 @@ import type {
 	IParameterDependencies,
 	IRunExecutionData,
 	IVersionedNodeType,
-	IWebhookData,
-	IWorkflowExecuteAdditionalData,
 	NodeParameterValue,
 	ResourceMapperValue,
 	INodeTypeDescription,
-	INodeTypeBaseDescription,
 	INodeOutputConfiguration,
 	INodeInputConfiguration,
 	GenericValue,
@@ -243,33 +234,6 @@ export const cronNodeOptions: INodePropertyCollection[] = [
 	},
 ];
 
-const commonPollingParameters: INodeProperties[] = [
-	{
-		displayName: 'Poll Times',
-		name: 'pollTimes',
-		type: 'fixedCollection',
-		typeOptions: {
-			multipleValues: true,
-			multipleValueButtonText: 'Add Poll Time',
-		},
-		default: { item: [{ mode: 'everyMinute' }] },
-		description: 'Time at which polling should occur',
-		placeholder: 'Add Poll Time',
-		options: cronNodeOptions,
-	},
-];
-
-export const commonCORSParameters: INodeProperties[] = [
-	{
-		displayName: 'Allowed Origins (CORS)',
-		name: 'allowedOrigins',
-		type: 'string',
-		default: '*',
-		description:
-			'Comma-separated list of URLs allowed for cross-origin non-preflight requests. Use * (default) to allow all origins.',
-	},
-];
-
 const declarativeNodeOptionParameters: INodeProperties = {
 	displayName: 'Request Options',
 	name: 'requestOptions',
@@ -351,101 +315,6 @@ const declarativeNodeOptionParameters: INodeProperties = {
 	],
 };
 
-/**
- * Modifies the description of the passed in object, such that it can be used
- * as an AI Agent Tool.
- * Returns the modified item (not copied)
- */
-export function convertNodeToAiTool<
-	T extends object & { description: INodeTypeDescription | INodeTypeBaseDescription },
->(item: T): T {
-	// quick helper function for type-guard down below
-	function isFullDescription(obj: unknown): obj is INodeTypeDescription {
-		return typeof obj === 'object' && obj !== null && 'properties' in obj;
-	}
-
-	if (isFullDescription(item.description)) {
-		item.description.name += 'Tool';
-		item.description.inputs = [];
-		item.description.outputs = [NodeConnectionType.AiTool];
-		item.description.displayName += ' Tool';
-		delete item.description.usableAsTool;
-
-		const hasResource = item.description.properties.some((prop) => prop.name === 'resource');
-		const hasOperation = item.description.properties.some((prop) => prop.name === 'operation');
-
-		if (!item.description.properties.map((prop) => prop.name).includes('toolDescription')) {
-			const descriptionType: INodeProperties = {
-				displayName: 'Tool Description',
-				name: 'descriptionType',
-				type: 'options',
-				noDataExpression: true,
-				options: [
-					{
-						name: 'Set Automatically',
-						value: 'auto',
-						description: 'Automatically set based on resource and operation',
-					},
-					{
-						name: 'Set Manually',
-						value: 'manual',
-						description: 'Manually set the description',
-					},
-				],
-				default: 'auto',
-			};
-
-			const descProp: INodeProperties = {
-				displayName: 'Description',
-				name: 'toolDescription',
-				type: 'string',
-				default: item.description.description,
-				required: true,
-				typeOptions: { rows: 2 },
-				description:
-					'Explain to the LLM what this tool does, a good, specific description would allow LLMs to produce expected results much more often',
-				placeholder: `e.g. ${item.description.description}`,
-			};
-
-			const noticeProp: INodeProperties = {
-				displayName:
-					"Use the expression {{ $fromAI('placeholder_name') }} for any data to be filled by the model",
-				name: 'notice',
-				type: 'notice',
-				default: '',
-			};
-
-			item.description.properties.unshift(descProp);
-
-			// If node has resource or operation we can determine pre-populate tool description based on it
-			// so we add the descriptionType property as the first property
-			if (hasResource || hasOperation) {
-				item.description.properties.unshift(descriptionType);
-
-				descProp.displayOptions = {
-					show: {
-						descriptionType: ['manual'],
-					},
-				};
-			}
-
-			item.description.properties.unshift(noticeProp);
-		}
-	}
-
-	const resources = item.description.codex?.resources ?? {};
-
-	item.description.codex = {
-		categories: ['AI'],
-		subcategories: {
-			AI: ['Tools'],
-			Tools: ['Other Tools'],
-		},
-		resources,
-	};
-	return item;
-}
-
 /**
  * Determines if the provided node type has any output types other than the main connection type.
  * @param typeDescription The node's type description to check.
@@ -518,27 +387,6 @@ export function applyDeclarativeNodeOptionParameters(nodeType: INodeType): void
 	return;
 }
 
-/**
- * Apply special parameters which should be added to nodeTypes depending on their type or configuration
- */
-export function applySpecialNodeParameters(nodeType: INodeType): void {
-	const { properties, polling, supportsCORS } = nodeType.description;
-	if (polling) {
-		properties.unshift(...commonPollingParameters);
-	}
-	if (nodeType.webhook && supportsCORS) {
-		const optionsProperty = properties.find(({ name }) => name === 'options');
-		if (optionsProperty)
-			optionsProperty.options = [
-				...commonCORSParameters,
-				...(optionsProperty.options as INodePropertyOptions[]),
-			];
-		else properties.push(...commonCORSParameters);
-	}
-
-	applyDeclarativeNodeOptionParameters(nodeType);
-}
-
 const getPropertyValues = (
 	nodeValues: INodeParameters,
 	propertyName: string,
@@ -751,7 +599,6 @@ export function getContext(
 
 /**
  * Returns which parameters are dependent on which
- *
  */
 function getParameterDependencies(nodePropertiesArray: INodeProperties[]): IParameterDependencies {
 	const dependencies: IParameterDependencies = {};
@@ -787,7 +634,6 @@ function getParameterDependencies(nodePropertiesArray: INodeProperties[]): IPara
 /**
  * Returns in which order the parameters should be resolved
  * to have the parameters available they depend on
- *
  */
 export function getParameterResolveOrder(
 	nodePropertiesArray: INodeProperties[],
@@ -1181,121 +1027,8 @@ export function getNodeParameters(
 	return nodeParameters;
 }
 
-/**
- * Returns all the webhooks which should be created for the give node
- */
-export function getNodeWebhooks(
-	workflow: Workflow,
-	node: INode,
-	additionalData: IWorkflowExecuteAdditionalData,
-	ignoreRestartWebhooks = false,
-): IWebhookData[] {
-	if (node.disabled === true) {
-		// Node is disabled so webhooks will also not be enabled
-		return [];
-	}
-
-	const nodeType = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
-
-	if (nodeType.description.webhooks === undefined) {
-		// Node does not have any webhooks so return
-		return [];
-	}
-
-	const workflowId = workflow.id || '__UNSAVED__';
-	const mode = 'internal';
-
-	const returnData: IWebhookData[] = [];
-	for (const webhookDescription of nodeType.description.webhooks) {
-		if (ignoreRestartWebhooks && webhookDescription.restartWebhook === true) {
-			continue;
-		}
-
-		let nodeWebhookPath = workflow.expression.getSimpleParameterValue(
-			node,
-			webhookDescription.path,
-			mode,
-			{},
-		);
-		if (nodeWebhookPath === undefined) {
-			// TODO: Use a proper logger
-			console.error(
-				`No webhook path could be found for node "${node.name}" in workflow "${workflowId}".`,
-			);
-			continue;
-		}
-
-		nodeWebhookPath = nodeWebhookPath.toString();
-
-		if (nodeWebhookPath.startsWith('/')) {
-			nodeWebhookPath = nodeWebhookPath.slice(1);
-		}
-		if (nodeWebhookPath.endsWith('/')) {
-			nodeWebhookPath = nodeWebhookPath.slice(0, -1);
-		}
-
-		const isFullPath: boolean = workflow.expression.getSimpleParameterValue(
-			node,
-			webhookDescription.isFullPath,
-			'internal',
-			{},
-			undefined,
-			false,
-		) as boolean;
-		const restartWebhook: boolean = workflow.expression.getSimpleParameterValue(
-			node,
-			webhookDescription.restartWebhook,
-			'internal',
-			{},
-			undefined,
-			false,
-		) as boolean;
-		const path = getNodeWebhookPath(workflowId, node, nodeWebhookPath, isFullPath, restartWebhook);
-
-		const webhookMethods = workflow.expression.getSimpleParameterValue(
-			node,
-			webhookDescription.httpMethod,
-			mode,
-			{},
-			undefined,
-			'GET',
-		);
-
-		if (webhookMethods === undefined) {
-			// TODO: Use a proper logger
-			console.error(
-				`The webhook "${path}" for node "${node.name}" in workflow "${workflowId}" could not be added because the httpMethod is not defined.`,
-			);
-			continue;
-		}
-
-		let webhookId: string | undefined;
-		if ((path.startsWith(':') || path.includes('/:')) && node.webhookId) {
-			webhookId = node.webhookId;
-		}
-
-		String(webhookMethods)
-			.split(',')
-			.forEach((httpMethod) => {
-				if (!httpMethod) return;
-				returnData.push({
-					httpMethod: httpMethod.trim() as IHttpRequestMethods,
-					node: node.name,
-					path,
-					webhookDescription,
-					workflowId,
-					workflowExecuteAdditionalData: additionalData,
-					webhookId,
-				});
-			});
-	}
-
-	return returnData;
-}
-
 /**
  * Returns the webhook path
- *
  */
 export function getNodeWebhookPath(
 	workflowId: string,
@@ -1321,7 +1054,6 @@ export function getNodeWebhookPath(
 
 /**
  * Returns the webhook URL
- *
  */
 export function getNodeWebhookUrl(
 	baseUrl: string,
@@ -1565,9 +1297,8 @@ export function nodeIssuesToString(issues: INodeIssues, node?: INode): string[]
 
 /*
  * Validates resource locator node parameters based on validation ruled defined in each parameter mode
- *
  */
-export const validateResourceLocatorParameter = (
+const validateResourceLocatorParameter = (
 	value: INodeParameterResourceLocator,
 	parameterMode: INodePropertyMode,
 ): string[] => {
@@ -1596,9 +1327,8 @@ export const validateResourceLocatorParameter = (
 
 /*
  * Validates resource mapper values based on service schema
- *
  */
-export const validateResourceMapperParameter = (
+const validateResourceMapperParameter = (
 	nodeProperties: INodeProperties,
 	value: ResourceMapperValue,
 	skipRequiredCheck = false,
@@ -1637,7 +1367,7 @@ export const validateResourceMapperParameter = (
 	return issues;
 };
 
-export const validateParameter = (
+const validateParameter = (
 	nodeProperties: INodeProperties,
 	value: GenericValue,
 	type: FieldType,
@@ -1665,7 +1395,7 @@ export const validateParameter = (
  * @param {INodeProperties} nodeProperties The properties of the node
  * @param {NodeParameterValue} value The value of the parameter
  */
-export function addToIssuesIfMissing(
+function addToIssuesIfMissing(
 	foundIssues: INodeIssues,
 	nodeProperties: INodeProperties,
 	value: NodeParameterValue | INodeParameterResourceLocator,
@@ -1838,7 +1568,7 @@ export function getParameterIssues(
 				data: option as INodeProperties,
 			});
 		}
-	} else if (nodeProperties.type === 'fixedCollection') {
+	} else if (nodeProperties.type === 'fixedCollection' && isDisplayed) {
 		basePath = basePath ? `${basePath}.` : `${nodeProperties.name}.`;
 
 		let propertyOptions: INodePropertyCollection;
@@ -1849,6 +1579,24 @@ export function getParameterIssues(
 				propertyOptions.name,
 				basePath.slice(0, -1),
 			);
+
+			// Validate allowed field counts
+			const valueArray = Array.isArray(value) ? value : [];
+			const { minRequiredFields, maxAllowedFields } = nodeProperties.typeOptions ?? {};
+			let error = '';
+
+			if (minRequiredFields && valueArray.length < minRequiredFields) {
+				error = `At least ${minRequiredFields} ${minRequiredFields === 1 ? 'field is' : 'fields are'} required.`;
+			}
+			if (maxAllowedFields && valueArray.length > maxAllowedFields) {
+				error = `At most ${maxAllowedFields} ${maxAllowedFields === 1 ? 'field is' : 'fields are'} allowed.`;
+			}
+			if (error) {
+				foundIssues.parameters ??= {};
+				foundIssues.parameters[nodeProperties.name] ??= [];
+				foundIssues.parameters[nodeProperties.name].push(error);
+			}
+
 			if (value === undefined) {
 				continue;
 			}
@@ -1940,7 +1688,6 @@ export function mergeIssues(destination: INodeIssues, source: INodeIssues | null
 
 /**
  * Merges the given node properties
- *
  */
 export function mergeNodeProperties(
 	mainProperties: INodeProperties[],
@@ -1971,53 +1718,3 @@ export function getVersionedNodeType(
 	}
 	return object;
 }
-
-export function getVersionedNodeTypeAll(object: IVersionedNodeType | INodeType): INodeType[] {
-	if ('nodeVersions' in object) {
-		return uniqBy(
-			Object.values(object.nodeVersions)
-				.map((element) => {
-					element.description.name = object.description.name;
-					element.description.codex = object.description.codex;
-					return element;
-				})
-				.reverse(),
-			(node) => {
-				const { version } = node.description;
-				return Array.isArray(version) ? version.join(',') : version.toString();
-			},
-		);
-	}
-	return [object];
-}
-
-export function getCredentialsForNode(
-	object: IVersionedNodeType | INodeType,
-): INodeCredentialDescription[] {
-	if ('nodeVersions' in object) {
-		return uniqBy(
-			Object.values(object.nodeVersions).flatMap(
-				(version) => version.description.credentials ?? [],
-			),
-			'name',
-		);
-	}
-
-	return object.description.credentials ?? [];
-}
-
-export function isSingleExecution(type: string, parameters: INodeParameters): boolean {
-	const singleExecutionCase = SINGLE_EXECUTION_NODES[type];
-
-	if (singleExecutionCase) {
-		for (const parameter of Object.keys(singleExecutionCase)) {
-			if (!singleExecutionCase[parameter].includes(parameters[parameter] as NodeParameterValue)) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	return false;
-}
diff --git a/packages/workflow/src/Workflow.ts b/packages/workflow/src/Workflow.ts
index b2eb597e2ed27..b63a83105afd8 100644
--- a/packages/workflow/src/Workflow.ts
+++ b/packages/workflow/src/Workflow.ts
@@ -1,62 +1,36 @@
 /* eslint-disable @typescript-eslint/no-use-before-define */
-
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-for-in-array */
-
-/* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
-
 import {
 	MANUAL_CHAT_TRIGGER_LANGCHAIN_NODE_TYPE,
 	NODES_WITH_RENAMABLE_CONTENT,
 	STARTING_NODE_TYPES,
 } from './Constants';
-import type { IDeferredPromise } from './DeferredPromise';
 import { ApplicationError } from './errors/application.error';
 import { Expression } from './Expression';
 import { getGlobalState } from './GlobalState';
 import type {
 	IConnections,
-	IExecuteResponsePromiseData,
-	IGetExecuteTriggerFunctions,
 	INode,
-	INodeExecuteFunctions,
 	INodeExecutionData,
-	INodeIssues,
 	INodeParameters,
 	INodes,
 	INodeType,
 	INodeTypes,
 	IPinData,
-	IPollFunctions,
-	IRunExecutionData,
-	ITaskDataConnections,
-	ITriggerResponse,
-	IWebhookData,
-	IWebhookResponseData,
-	IWorkflowIssues,
-	IWorkflowExecuteAdditionalData,
 	IWorkflowSettings,
-	WebhookSetupMethodNames,
-	WorkflowActivateMode,
-	WorkflowExecuteMode,
 	IConnection,
 	IConnectedNode,
 	IDataObject,
-	IExecuteData,
 	INodeConnection,
 	IObservableObject,
-	IRun,
-	IRunNodeResponse,
 	NodeParameterValueType,
-	CloseFunction,
 	INodeOutputConfiguration,
 } from './Interfaces';
-import { Node, NodeConnectionType } from './Interfaces';
+import { NodeConnectionType } from './Interfaces';
 import * as NodeHelpers from './NodeHelpers';
 import * as ObservableObject from './ObservableObject';
-import { RoutingNode } from './RoutingNode';
 
 function dedupe<T>(arr: T[]): T[] {
 	return [...new Set(arr)];
@@ -157,6 +131,13 @@ export class Workflow {
 		this.expression = new Expression(this);
 	}
 
+	overrideStaticData(staticData?: IDataObject) {
+		this.staticData = ObservableObject.create(staticData || {}, undefined, {
+			ignoreEmptyOnFirstChild: true,
+		});
+		this.staticData.__dataChanged = true;
+	}
+
 	/**
 	 * The default connections are by source node. This function rewrites them by destination nodes
 	 * to easily find parent nodes.
@@ -207,112 +188,6 @@ export class Workflow {
 		return returnConnection;
 	}
 
-	/**
-	 * A workflow can only be activated if it has a node which has either triggers
-	 * or webhooks defined.
-	 *
-	 * @param {string[]} [ignoreNodeTypes] Node-types to ignore in the check
-	 */
-	checkIfWorkflowCanBeActivated(ignoreNodeTypes?: string[]): boolean {
-		let node: INode;
-		let nodeType: INodeType | undefined;
-
-		for (const nodeName of Object.keys(this.nodes)) {
-			node = this.nodes[nodeName];
-
-			if (node.disabled === true) {
-				// Deactivated nodes can not trigger a run so ignore
-				continue;
-			}
-
-			if (ignoreNodeTypes !== undefined && ignoreNodeTypes.includes(node.type)) {
-				continue;
-			}
-
-			nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
-
-			if (nodeType === undefined) {
-				// Type is not known so check is not possible
-				continue;
-			}
-
-			if (
-				nodeType.poll !== undefined ||
-				nodeType.trigger !== undefined ||
-				nodeType.webhook !== undefined
-			) {
-				// Is a trigger node. So workflow can be activated.
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Checks if everything in the workflow is complete
-	 * and ready to be executed. If it returns null everything
-	 * is fine. If there are issues it returns the issues
-	 * which have been found for the different nodes.
-	 * TODO: Does currently not check for credential issues!
-	 */
-	checkReadyForExecution(
-		inputData: {
-			startNode?: string;
-			destinationNode?: string;
-			pinDataNodeNames?: string[];
-		} = {},
-	): IWorkflowIssues | null {
-		const workflowIssues: IWorkflowIssues = {};
-
-		let checkNodes: string[] = [];
-		if (inputData.destinationNode) {
-			// If a destination node is given we have to check all the nodes
-			// leading up to it
-			checkNodes = this.getParentNodes(inputData.destinationNode);
-			checkNodes.push(inputData.destinationNode);
-		} else if (inputData.startNode) {
-			// If a start node is given we have to check all nodes which
-			// come after it
-			checkNodes = this.getChildNodes(inputData.startNode);
-			checkNodes.push(inputData.startNode);
-		}
-
-		for (const nodeName of checkNodes) {
-			let nodeIssues: INodeIssues | null = null;
-			const node = this.nodes[nodeName];
-
-			if (node.disabled === true) {
-				continue;
-			}
-
-			const nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
-
-			if (nodeType === undefined) {
-				// Node type is not known
-				nodeIssues = {
-					typeUnknown: true,
-				};
-			} else {
-				nodeIssues = NodeHelpers.getNodeParametersIssues(
-					nodeType.description.properties,
-					node,
-					inputData.pinDataNodeNames,
-				);
-			}
-
-			if (nodeIssues !== null) {
-				workflowIssues[node.name] = nodeIssues;
-			}
-		}
-
-		if (Object.keys(workflowIssues).length === 0) {
-			return null;
-		}
-
-		return workflowIssues;
-	}
-
 	/**
 	 * Returns the static data of the workflow.
 	 * It gets saved with the workflow and will be the same for
@@ -1058,437 +933,6 @@ export class Workflow {
 
 		return this.__getStartNode(Object.keys(this.nodes));
 	}
-
-	async createWebhookIfNotExists(
-		webhookData: IWebhookData,
-		nodeExecuteFunctions: INodeExecuteFunctions,
-		mode: WorkflowExecuteMode,
-		activation: WorkflowActivateMode,
-	): Promise<void> {
-		const webhookExists = await this.runWebhookMethod(
-			'checkExists',
-			webhookData,
-			nodeExecuteFunctions,
-			mode,
-			activation,
-		);
-		if (!webhookExists) {
-			// If webhook does not exist yet create it
-			await this.runWebhookMethod('create', webhookData, nodeExecuteFunctions, mode, activation);
-		}
-	}
-
-	async deleteWebhook(
-		webhookData: IWebhookData,
-		nodeExecuteFunctions: INodeExecuteFunctions,
-		mode: WorkflowExecuteMode,
-		activation: WorkflowActivateMode,
-	) {
-		await this.runWebhookMethod('delete', webhookData, nodeExecuteFunctions, mode, activation);
-	}
-
-	private async runWebhookMethod(
-		method: WebhookSetupMethodNames,
-		webhookData: IWebhookData,
-		nodeExecuteFunctions: INodeExecuteFunctions,
-		mode: WorkflowExecuteMode,
-		activation: WorkflowActivateMode,
-	): Promise<boolean | undefined> {
-		const node = this.getNode(webhookData.node);
-
-		if (!node) return;
-
-		const nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
-
-		const webhookFn = nodeType.webhookMethods?.[webhookData.webhookDescription.name]?.[method];
-		if (webhookFn === undefined) return;
-
-		const thisArgs = nodeExecuteFunctions.getExecuteHookFunctions(
-			this,
-			node,
-			webhookData.workflowExecuteAdditionalData,
-			mode,
-			activation,
-			webhookData,
-		);
-
-		return await webhookFn.call(thisArgs);
-	}
-
-	/**
-	 * Runs the given trigger node so that it can trigger the workflow
-	 * when the node has data.
-	 *
-	 */
-	async runTrigger(
-		node: INode,
-		getTriggerFunctions: IGetExecuteTriggerFunctions,
-		additionalData: IWorkflowExecuteAdditionalData,
-		mode: WorkflowExecuteMode,
-		activation: WorkflowActivateMode,
-	): Promise<ITriggerResponse | undefined> {
-		const triggerFunctions = getTriggerFunctions(this, node, additionalData, mode, activation);
-
-		const nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
-
-		if (nodeType === undefined) {
-			throw new ApplicationError('Node with unknown node type', {
-				extra: { nodeName: node.name },
-				tags: { nodeType: node.type },
-			});
-		}
-
-		if (!nodeType.trigger) {
-			throw new ApplicationError('Node type does not have a trigger function defined', {
-				extra: { nodeName: node.name },
-				tags: { nodeType: node.type },
-			});
-		}
-
-		if (mode === 'manual') {
-			// In manual mode we do not just start the trigger function we also
-			// want to be able to get informed as soon as the first data got emitted
-			const triggerResponse = await nodeType.trigger.call(triggerFunctions);
-
-			// Add the manual trigger response which resolves when the first time data got emitted
-			triggerResponse!.manualTriggerResponse = new Promise((resolve, reject) => {
-				triggerFunctions.emit = (
-					(resolveEmit) =>
-					(
-						data: INodeExecutionData[][],
-						responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>,
-						donePromise?: IDeferredPromise<IRun>,
-					) => {
-						additionalData.hooks!.hookFunctions.sendResponse = [
-							async (response: IExecuteResponsePromiseData): Promise<void> => {
-								if (responsePromise) {
-									responsePromise.resolve(response);
-								}
-							},
-						];
-
-						if (donePromise) {
-							additionalData.hooks!.hookFunctions.workflowExecuteAfter?.unshift(
-								async (runData: IRun): Promise<void> => {
-									return donePromise.resolve(runData);
-								},
-							);
-						}
-
-						resolveEmit(data);
-					}
-				)(resolve);
-				triggerFunctions.emitError = (
-					(rejectEmit) =>
-					(error: Error, responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>) => {
-						additionalData.hooks!.hookFunctions.sendResponse = [
-							async (): Promise<void> => {
-								if (responsePromise) {
-									responsePromise.reject(error);
-								}
-							},
-						];
-
-						rejectEmit(error);
-					}
-				)(reject);
-			});
-
-			return triggerResponse;
-		}
-		// In all other modes simply start the trigger
-		return await nodeType.trigger.call(triggerFunctions);
-	}
-
-	/**
-	 * Runs the given trigger node so that it can trigger the workflow
-	 * when the node has data.
-	 *
-	 */
-
-	async runPoll(
-		node: INode,
-		pollFunctions: IPollFunctions,
-	): Promise<INodeExecutionData[][] | null> {
-		const nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
-
-		if (nodeType === undefined) {
-			throw new ApplicationError('Node with unknown node type', {
-				extra: { nodeName: node.name },
-				tags: { nodeType: node.type },
-			});
-		}
-
-		if (!nodeType.poll) {
-			throw new ApplicationError('Node type does not have a poll function defined', {
-				extra: { nodeName: node.name },
-				tags: { nodeType: node.type },
-			});
-		}
-
-		return await nodeType.poll.call(pollFunctions);
-	}
-
-	/**
-	 * Executes the webhook data to see what it should return and if the
-	 * workflow should be started or not
-	 *
-	 */
-	async runWebhook(
-		webhookData: IWebhookData,
-		node: INode,
-		additionalData: IWorkflowExecuteAdditionalData,
-		nodeExecuteFunctions: INodeExecuteFunctions,
-		mode: WorkflowExecuteMode,
-		runExecutionData: IRunExecutionData | null,
-	): Promise<IWebhookResponseData> {
-		const nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
-		if (nodeType === undefined) {
-			throw new ApplicationError('Unknown node type of webhook node', {
-				extra: { nodeName: node.name },
-			});
-		} else if (nodeType.webhook === undefined) {
-			throw new ApplicationError('Node does not have any webhooks defined', {
-				extra: { nodeName: node.name },
-			});
-		}
-
-		const closeFunctions: CloseFunction[] = [];
-
-		const context = nodeExecuteFunctions.getExecuteWebhookFunctions(
-			this,
-			node,
-			additionalData,
-			mode,
-			webhookData,
-			closeFunctions,
-			runExecutionData,
-		);
-		return nodeType instanceof Node
-			? await nodeType.webhook(context)
-			: await nodeType.webhook.call(context);
-	}
-
-	/**
-	 * Executes the given node.
-	 *
-	 */
-	// eslint-disable-next-line complexity
-	async runNode(
-		executionData: IExecuteData,
-		runExecutionData: IRunExecutionData,
-		runIndex: number,
-		additionalData: IWorkflowExecuteAdditionalData,
-		nodeExecuteFunctions: INodeExecuteFunctions,
-		mode: WorkflowExecuteMode,
-		abortSignal?: AbortSignal,
-	): Promise<IRunNodeResponse> {
-		const { node } = executionData;
-		let inputData = executionData.data;
-
-		if (node.disabled === true) {
-			// If node is disabled simply pass the data through
-			// return NodeRunHelpers.
-			if (inputData.hasOwnProperty('main') && inputData.main.length > 0) {
-				// If the node is disabled simply return the data from the first main input
-				if (inputData.main[0] === null) {
-					return { data: undefined };
-				}
-				return { data: [inputData.main[0]] };
-			}
-			return { data: undefined };
-		}
-
-		const nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
-		if (nodeType === undefined) {
-			throw new ApplicationError('Node type is unknown so cannot run it', {
-				tags: { nodeType: node.type },
-			});
-		}
-
-		let connectionInputData: INodeExecutionData[] = [];
-		if (nodeType.execute || (!nodeType.poll && !nodeType.trigger && !nodeType.webhook)) {
-			// Only stop if first input is empty for execute runs. For all others run anyways
-			// because then it is a trigger node. As they only pass data through and so the input-data
-			// becomes output-data it has to be possible.
-
-			if (inputData.main?.length > 0) {
-				// We always use the data of main input and the first input for execute
-				connectionInputData = inputData.main[0] as INodeExecutionData[];
-			}
-
-			const forceInputNodeExecution = this.settings.executionOrder !== 'v1';
-			if (!forceInputNodeExecution) {
-				// If the nodes do not get force executed data of some inputs may be missing
-				// for that reason do we use the data of the first one that contains any
-				for (const mainData of inputData.main) {
-					if (mainData?.length) {
-						connectionInputData = mainData;
-						break;
-					}
-				}
-			}
-
-			if (connectionInputData.length === 0) {
-				// No data for node so return
-				return { data: undefined };
-			}
-		}
-
-		if (
-			runExecutionData.resultData.lastNodeExecuted === node.name &&
-			runExecutionData.resultData.error !== undefined
-		) {
-			// The node did already fail. So throw an error here that it displays and logs it correctly.
-			// Does get used by webhook and trigger nodes in case they throw an error that it is possible
-			// to log the error and display in Editor-UI.
-			if (
-				runExecutionData.resultData.error.name === 'NodeOperationError' ||
-				runExecutionData.resultData.error.name === 'NodeApiError'
-			) {
-				throw runExecutionData.resultData.error;
-			}
-
-			const error = new Error(runExecutionData.resultData.error.message);
-			error.stack = runExecutionData.resultData.error.stack;
-			throw error;
-		}
-
-		if (node.executeOnce === true) {
-			// If node should be executed only once so use only the first input item
-			const newInputData: ITaskDataConnections = {};
-			for (const inputName of Object.keys(inputData)) {
-				newInputData[inputName] = inputData[inputName].map((input) => {
-					// eslint-disable-next-line @typescript-eslint/prefer-optional-chain
-					return input && input.slice(0, 1);
-				});
-			}
-			inputData = newInputData;
-		}
-
-		if (nodeType.execute) {
-			const closeFunctions: CloseFunction[] = [];
-			const context = nodeExecuteFunctions.getExecuteFunctions(
-				this,
-				runExecutionData,
-				runIndex,
-				connectionInputData,
-				inputData,
-				node,
-				additionalData,
-				executionData,
-				mode,
-				closeFunctions,
-				abortSignal,
-			);
-			const data =
-				nodeType instanceof Node
-					? await nodeType.execute(context)
-					: await nodeType.execute.call(context);
-
-			const closeFunctionsResults = await Promise.allSettled(
-				closeFunctions.map(async (fn) => await fn()),
-			);
-
-			const closingErrors = closeFunctionsResults
-				.filter((result): result is PromiseRejectedResult => result.status === 'rejected')
-				.map((result) => result.reason);
-
-			if (closingErrors.length > 0) {
-				if (closingErrors[0] instanceof Error) throw closingErrors[0];
-				throw new ApplicationError("Error on execution node's close function(s)", {
-					extra: { nodeName: node.name },
-					tags: { nodeType: node.type },
-					cause: closingErrors,
-				});
-			}
-
-			return { data };
-		} else if (nodeType.poll) {
-			if (mode === 'manual') {
-				// In manual mode run the poll function
-				const thisArgs = nodeExecuteFunctions.getExecutePollFunctions(
-					this,
-					node,
-					additionalData,
-					mode,
-					'manual',
-				);
-				return { data: await nodeType.poll.call(thisArgs) };
-			}
-			// In any other mode pass data through as it already contains the result of the poll
-			return { data: inputData.main as INodeExecutionData[][] };
-		} else if (nodeType.trigger) {
-			if (mode === 'manual') {
-				// In manual mode start the trigger
-				const triggerResponse = await this.runTrigger(
-					node,
-					nodeExecuteFunctions.getExecuteTriggerFunctions,
-					additionalData,
-					mode,
-					'manual',
-				);
-
-				if (triggerResponse === undefined) {
-					return { data: null };
-				}
-
-				let closeFunction;
-				if (triggerResponse.closeFunction) {
-					// In manual mode we return the trigger closeFunction. That allows it to be called directly
-					// but we do not have to wait for it to finish. That is important for things like queue-nodes.
-					// There the full close will may be delayed till a message gets acknowledged after the execution.
-					// If we would not be able to wait for it to close would it cause problems with "own" mode as the
-					// process would be killed directly after it and so the acknowledge would not have been finished yet.
-					closeFunction = triggerResponse.closeFunction;
-
-					// Manual testing of Trigger nodes creates an execution. If the execution is cancelled, `closeFunction` should be called to cleanup any open connections/consumers
-					abortSignal?.addEventListener('abort', closeFunction);
-				}
-
-				if (triggerResponse.manualTriggerFunction !== undefined) {
-					// If a manual trigger function is defined call it and wait till it did run
-					await triggerResponse.manualTriggerFunction();
-				}
-
-				const response = await triggerResponse.manualTriggerResponse!;
-
-				if (response.length === 0) {
-					return { data: null, closeFunction };
-				}
-
-				return { data: response, closeFunction };
-			}
-			// For trigger nodes in any mode except "manual" do we simply pass the data through
-			return { data: inputData.main as INodeExecutionData[][] };
-		} else if (nodeType.webhook) {
-			// For webhook nodes always simply pass the data through
-			return { data: inputData.main as INodeExecutionData[][] };
-		} else {
-			// For nodes which have routing information on properties
-
-			const routingNode = new RoutingNode(
-				this,
-				node,
-				connectionInputData,
-				runExecutionData ?? null,
-				additionalData,
-				mode,
-			);
-
-			return {
-				data: await routingNode.runNode(
-					inputData,
-					runIndex,
-					nodeType,
-					executionData,
-					nodeExecuteFunctions,
-					undefined,
-					abortSignal,
-				),
-			};
-		}
-	}
 }
 
 function hasDotNotationBannedChar(nodeName: string) {
diff --git a/packages/workflow/src/WorkflowDataProxy.ts b/packages/workflow/src/WorkflowDataProxy.ts
index ea167f50b31fb..ef314cee18e25 100644
--- a/packages/workflow/src/WorkflowDataProxy.ts
+++ b/packages/workflow/src/WorkflowDataProxy.ts
@@ -945,10 +945,11 @@ export class WorkflowDataProxy {
 			_type: string = 'string',
 			defaultValue?: unknown,
 		) => {
+			const { itemIndex, runIndex } = that;
 			if (!name || name === '') {
 				throw new ExpressionError("Add a key, e.g. $fromAI('placeholder_name')", {
-					runIndex: that.runIndex,
-					itemIndex: that.itemIndex,
+					runIndex,
+					itemIndex,
 				});
 			}
 			const nameValidationRegex = /^[a-zA-Z0-9_-]{0,64}$/;
@@ -956,24 +957,29 @@ export class WorkflowDataProxy {
 				throw new ExpressionError(
 					'Invalid parameter key, must be between 1 and 64 characters long and only contain lowercase letters, uppercase letters, numbers, underscores, and hyphens',
 					{
-						runIndex: that.runIndex,
-						itemIndex: that.itemIndex,
+						runIndex,
+						itemIndex,
 					},
 				);
 			}
+			const inputData =
+				that.runExecutionData?.resultData.runData[that.activeNodeName]?.[runIndex].inputOverride;
 			const placeholdersDataInputData =
-				that.runExecutionData?.resultData.runData[that.activeNodeName]?.[0].inputOverride?.[
-					NodeConnectionType.AiTool
-				]?.[0]?.[0].json;
+				inputData?.[NodeConnectionType.AiTool]?.[0]?.[itemIndex].json;
 
 			if (Boolean(!placeholdersDataInputData)) {
 				throw new ExpressionError('No execution data available', {
-					runIndex: that.runIndex,
-					itemIndex: that.itemIndex,
+					runIndex,
+					itemIndex,
 					type: 'no_execution_data',
 				});
 			}
-			return placeholdersDataInputData?.[name] ?? defaultValue;
+			return (
+				// TS does not know that the key exists, we need to address this in refactor
+				(placeholdersDataInputData?.query as Record<string, unknown>)?.[name] ??
+				placeholdersDataInputData?.[name] ??
+				defaultValue
+			);
 		};
 
 		const base = {
diff --git a/packages/workflow/src/errors/index.ts b/packages/workflow/src/errors/index.ts
index 5dea5b9e6d8b6..653f4d2f00d93 100644
--- a/packages/workflow/src/errors/index.ts
+++ b/packages/workflow/src/errors/index.ts
@@ -1,4 +1,4 @@
-export { ApplicationError } from './application.error';
+export { ApplicationError, type ReportingOptions } from './application.error';
 export { ExpressionError } from './expression.error';
 export { CredentialAccessError } from './credential-access-error';
 export { ExecutionCancelledError } from './execution-cancelled.error';
diff --git a/packages/workflow/src/index.ts b/packages/workflow/src/index.ts
index 8c304664f1305..992a27921fa38 100644
--- a/packages/workflow/src/index.ts
+++ b/packages/workflow/src/index.ts
@@ -1,5 +1,4 @@
 import * as LoggerProxy from './LoggerProxy';
-export * as ErrorReporterProxy from './ErrorReporterProxy';
 export * as ExpressionEvaluatorProxy from './ExpressionEvaluatorProxy';
 import * as NodeHelpers from './NodeHelpers';
 import * as ObservableObject from './ObservableObject';
@@ -15,7 +14,6 @@ export * from './MessageEventBus';
 export * from './ExecutionStatus';
 export * from './Expression';
 export * from './NodeHelpers';
-export * from './RoutingNode';
 export * from './Workflow';
 export * from './WorkflowDataProxy';
 export * from './WorkflowDataProxyEnvProvider';
diff --git a/packages/workflow/test/Helpers.ts b/packages/workflow/test/Helpers.ts
index f72c041c69ed5..c8b1c200e3417 100644
--- a/packages/workflow/test/Helpers.ts
+++ b/packages/workflow/test/Helpers.ts
@@ -1,70 +1,16 @@
 import { readFileSync } from 'fs';
-import { mock } from 'jest-mock-extended';
-import get from 'lodash/get';
 import path from 'path';
 
-import type {
-	IExecuteSingleFunctions,
-	IHttpRequestOptions,
-	IN8nHttpFullResponse,
-	IN8nHttpResponse,
-	INode,
-	INodeTypes,
-	IRunExecutionData,
-} from '@/Interfaces';
-import type { Workflow } from '@/Workflow';
+import type { INodeTypes } from '@/Interfaces';
 
 import { NodeTypes as NodeTypesClass } from './NodeTypes';
 
-export function getExecuteSingleFunctions(
-	workflow: Workflow,
-	runExecutionData: IRunExecutionData,
-	runIndex: number,
-	node: INode,
-	itemIndex: number,
-): IExecuteSingleFunctions {
-	return mock<IExecuteSingleFunctions>({
-		getItemIndex: () => itemIndex,
-		getNodeParameter: (parameterName: string) => {
-			return workflow.expression.getParameterValue(
-				get(node.parameters, parameterName),
-				runExecutionData,
-				runIndex,
-				itemIndex,
-				node.name,
-				[],
-				'internal',
-				{},
-			);
-		},
-		getWorkflow: () => ({
-			id: workflow.id,
-			name: workflow.name,
-			active: workflow.active,
-		}),
-		helpers: mock<IExecuteSingleFunctions['helpers']>({
-			async httpRequest(
-				requestOptions: IHttpRequestOptions,
-			): Promise<IN8nHttpFullResponse | IN8nHttpResponse> {
-				return {
-					body: {
-						headers: {},
-						statusCode: 200,
-						requestOptions,
-					},
-				};
-			},
-		}),
-	});
-}
-
 let nodeTypesInstance: NodeTypesClass | undefined;
 
 export function NodeTypes(): INodeTypes {
 	if (nodeTypesInstance === undefined) {
 		nodeTypesInstance = new NodeTypesClass();
 	}
-
 	return nodeTypesInstance;
 }
 
diff --git a/packages/workflow/test/NodeHelpers.test.ts b/packages/workflow/test/NodeHelpers.test.ts
index 09e036fc94607..8b3d9b3b02c43 100644
--- a/packages/workflow/test/NodeHelpers.test.ts
+++ b/packages/workflow/test/NodeHelpers.test.ts
@@ -1,5 +1,6 @@
 import {
 	NodeConnectionType,
+	type INodeIssues,
 	type INode,
 	type INodeParameters,
 	type INodeProperties,
@@ -9,10 +10,9 @@ import {
 import {
 	getNodeParameters,
 	getNodeHints,
-	isSingleExecution,
 	isSubNodeType,
 	applyDeclarativeNodeOptionParameters,
-	convertNodeToAiTool,
+	getParameterIssues,
 } from '@/NodeHelpers';
 import type { Workflow } from '@/Workflow';
 
@@ -3542,34 +3542,6 @@ describe('NodeHelpers', () => {
 		});
 	});
 
-	describe('isSingleExecution', () => {
-		test('should determine based on node parameters if it would be executed once', () => {
-			expect(isSingleExecution('n8n-nodes-base.code', {})).toEqual(true);
-			expect(isSingleExecution('n8n-nodes-base.code', { mode: 'runOnceForEachItem' })).toEqual(
-				false,
-			);
-			expect(isSingleExecution('n8n-nodes-base.executeWorkflow', {})).toEqual(true);
-			expect(isSingleExecution('n8n-nodes-base.executeWorkflow', { mode: 'each' })).toEqual(false);
-			expect(isSingleExecution('n8n-nodes-base.crateDb', {})).toEqual(true);
-			expect(isSingleExecution('n8n-nodes-base.crateDb', { operation: 'update' })).toEqual(true);
-			expect(isSingleExecution('n8n-nodes-base.timescaleDb', {})).toEqual(true);
-			expect(isSingleExecution('n8n-nodes-base.timescaleDb', { operation: 'update' })).toEqual(
-				true,
-			);
-			expect(isSingleExecution('n8n-nodes-base.microsoftSql', {})).toEqual(true);
-			expect(isSingleExecution('n8n-nodes-base.microsoftSql', { operation: 'update' })).toEqual(
-				true,
-			);
-			expect(isSingleExecution('n8n-nodes-base.microsoftSql', { operation: 'delete' })).toEqual(
-				true,
-			);
-			expect(isSingleExecution('n8n-nodes-base.questDb', {})).toEqual(true);
-			expect(isSingleExecution('n8n-nodes-base.mongoDb', { operation: 'insert' })).toEqual(true);
-			expect(isSingleExecution('n8n-nodes-base.mongoDb', { operation: 'update' })).toEqual(true);
-			expect(isSingleExecution('n8n-nodes-base.redis', {})).toEqual(true);
-		});
-	});
-
 	describe('isSubNodeType', () => {
 		const tests: Array<[boolean, Pick<INodeTypeDescription, 'outputs'> | null]> = [
 			[false, null],
@@ -3638,176 +3610,589 @@ describe('NodeHelpers', () => {
 		});
 	});
 
-	describe('convertNodeToAiTool', () => {
-		let fullNodeWrapper: { description: INodeTypeDescription };
-
-		beforeEach(() => {
-			fullNodeWrapper = {
-				description: {
-					displayName: 'Test Node',
-					name: 'testNode',
-					group: ['test'],
-					description: 'A test node',
-					version: 1,
-					defaults: {},
-					inputs: [NodeConnectionType.Main],
-					outputs: [NodeConnectionType.Main],
-					properties: [],
-				},
-			};
-		});
-
-		it('should modify the name and displayName correctly', () => {
-			const result = convertNodeToAiTool(fullNodeWrapper);
-			expect(result.description.name).toBe('testNodeTool');
-			expect(result.description.displayName).toBe('Test Node Tool');
-		});
-
-		it('should update inputs and outputs', () => {
-			const result = convertNodeToAiTool(fullNodeWrapper);
-			expect(result.description.inputs).toEqual([]);
-			expect(result.description.outputs).toEqual([NodeConnectionType.AiTool]);
-		});
-
-		it('should remove the usableAsTool property', () => {
-			fullNodeWrapper.description.usableAsTool = true;
-			const result = convertNodeToAiTool(fullNodeWrapper);
-			expect(result.description.usableAsTool).toBeUndefined();
-		});
-
-		it("should add toolDescription property if it doesn't exist", () => {
-			const result = convertNodeToAiTool(fullNodeWrapper);
-			const toolDescriptionProp = result.description.properties.find(
-				(prop) => prop.name === 'toolDescription',
-			);
-			expect(toolDescriptionProp).toBeDefined();
-			expect(toolDescriptionProp?.type).toBe('string');
-			expect(toolDescriptionProp?.default).toBe(fullNodeWrapper.description.description);
-		});
-
-		it('should set codex categories correctly', () => {
-			const result = convertNodeToAiTool(fullNodeWrapper);
-			expect(result.description.codex).toEqual({
-				categories: ['AI'],
-				subcategories: {
-					AI: ['Tools'],
-					Tools: ['Other Tools'],
-				},
-				resources: {},
-			});
-		});
-
-		it('should preserve existing properties', () => {
-			const existingProp: INodeProperties = {
-				displayName: 'Existing Prop',
-				name: 'existingProp',
-				type: 'string',
-				default: 'test',
-			};
-			fullNodeWrapper.description.properties = [existingProp];
-			const result = convertNodeToAiTool(fullNodeWrapper);
-			expect(result.description.properties).toHaveLength(3); // Existing prop + toolDescription + notice
-			expect(result.description.properties).toContainEqual(existingProp);
-		});
-
-		it('should handle nodes with resource property', () => {
-			const resourceProp: INodeProperties = {
-				displayName: 'Resource',
-				name: 'resource',
-				type: 'options',
-				options: [{ name: 'User', value: 'user' }],
-				default: 'user',
-			};
-			fullNodeWrapper.description.properties = [resourceProp];
-			const result = convertNodeToAiTool(fullNodeWrapper);
-			expect(result.description.properties[1].name).toBe('descriptionType');
-			expect(result.description.properties[2].name).toBe('toolDescription');
-			expect(result.description.properties[3]).toEqual(resourceProp);
-		});
-
-		it('should handle nodes with operation property', () => {
-			const operationProp: INodeProperties = {
-				displayName: 'Operation',
-				name: 'operation',
-				type: 'options',
-				options: [{ name: 'Create', value: 'create' }],
-				default: 'create',
-			};
-			fullNodeWrapper.description.properties = [operationProp];
-			const result = convertNodeToAiTool(fullNodeWrapper);
-			expect(result.description.properties[1].name).toBe('descriptionType');
-			expect(result.description.properties[2].name).toBe('toolDescription');
-			expect(result.description.properties[3]).toEqual(operationProp);
-		});
-
-		it('should handle nodes with both resource and operation properties', () => {
-			const resourceProp: INodeProperties = {
-				displayName: 'Resource',
-				name: 'resource',
-				type: 'options',
-				options: [{ name: 'User', value: 'user' }],
-				default: 'user',
-			};
-			const operationProp: INodeProperties = {
-				displayName: 'Operation',
-				name: 'operation',
-				type: 'options',
-				options: [{ name: 'Create', value: 'create' }],
-				default: 'create',
+	describe('getParameterIssues', () => {
+		const tests: Array<{
+			description: string;
+			input: {
+				nodeProperties: INodeProperties;
+				nodeValues: INodeParameters;
+				path: string;
+				node: INode;
 			};
-			fullNodeWrapper.description.properties = [resourceProp, operationProp];
-			const result = convertNodeToAiTool(fullNodeWrapper);
-			expect(result.description.properties[1].name).toBe('descriptionType');
-			expect(result.description.properties[2].name).toBe('toolDescription');
-			expect(result.description.properties[3]).toEqual(resourceProp);
-			expect(result.description.properties[4]).toEqual(operationProp);
-		});
-
-		it('should handle nodes with empty properties', () => {
-			fullNodeWrapper.description.properties = [];
-			const result = convertNodeToAiTool(fullNodeWrapper);
-			expect(result.description.properties).toHaveLength(2);
-			expect(result.description.properties[1].name).toBe('toolDescription');
-		});
-
-		it('should handle nodes with existing codex property', () => {
-			fullNodeWrapper.description.codex = {
-				categories: ['Existing'],
-				subcategories: {
-					Existing: ['Category'],
+			output: INodeIssues;
+		}> = [
+			{
+				description:
+					'Fixed collection::Should not return issues if minimum or maximum field count is not set',
+				input: {
+					nodeProperties: {
+						displayName: 'Workflow Inputs',
+						name: 'workflowInputs',
+						placeholder: 'Add Field',
+						type: 'fixedCollection',
+						description:
+							'Define expected input fields. If no inputs are provided, all data from the calling workflow will be passed through.',
+						typeOptions: {
+							multipleValues: true,
+							sortable: true,
+						},
+						displayOptions: {
+							show: {
+								'@version': [
+									{
+										_cnd: {
+											gte: 1.1,
+										},
+									},
+								],
+								inputSource: ['workflowInputs'],
+							},
+						},
+						default: {},
+						options: [
+							{
+								name: 'values',
+								displayName: 'Values',
+								values: [
+									{
+										displayName: 'Name',
+										name: 'name',
+										type: 'string',
+										default: '',
+										placeholder: 'e.g. fieldName',
+										description: 'Name of the field',
+										noDataExpression: true,
+									},
+									{
+										displayName: 'Type',
+										name: 'type',
+										type: 'options',
+										description: 'The field value type',
+										options: [
+											{
+												name: 'Allow Any Type',
+												value: 'any',
+											},
+											{
+												name: 'String',
+												value: 'string',
+											},
+											{
+												name: 'Number',
+												value: 'number',
+											},
+											{
+												name: 'Boolean',
+												value: 'boolean',
+											},
+											{
+												name: 'Array',
+												value: 'array',
+											},
+											{
+												name: 'Object',
+												value: 'object',
+											},
+										],
+										default: 'string',
+										noDataExpression: true,
+									},
+								],
+							},
+						],
+					},
+					nodeValues: {
+						events: 'worklfow_call',
+						inputSource: 'workflowInputs',
+						workflowInputs: {},
+						inputOptions: {},
+					},
+					path: '',
+					node: {
+						parameters: {
+							events: 'worklfow_call',
+							inputSource: 'workflowInputs',
+							workflowInputs: {},
+							inputOptions: {},
+						},
+						type: 'n8n-nodes-base.executeWorkflowTrigger',
+						typeVersion: 1.1,
+						position: [-140, -20],
+						id: '9abdbdac-5f32-4876-b4d5-895d8ca4cb00',
+						name: 'Test Node',
+					} as INode,
 				},
-				resources: {
-					primaryDocumentation: [{ url: 'https://example.com' }],
+				output: {},
+			},
+			{
+				description:
+					'Fixed collection::Should not return issues if field count is within the specified range',
+				input: {
+					nodeProperties: {
+						displayName: 'Workflow Inputs',
+						name: 'workflowInputs',
+						placeholder: 'Add Field',
+						type: 'fixedCollection',
+						description:
+							'Define expected input fields. If no inputs are provided, all data from the calling workflow will be passed through.',
+						typeOptions: {
+							multipleValues: true,
+							sortable: true,
+							minRequiredFields: 1,
+							maxAllowedFields: 3,
+						},
+						displayOptions: {
+							show: {
+								'@version': [
+									{
+										_cnd: {
+											gte: 1.1,
+										},
+									},
+								],
+								inputSource: ['workflowInputs'],
+							},
+						},
+						default: {},
+						options: [
+							{
+								name: 'values',
+								displayName: 'Values',
+								values: [
+									{
+										displayName: 'Name',
+										name: 'name',
+										type: 'string',
+										default: '',
+										placeholder: 'e.g. fieldName',
+										description: 'Name of the field',
+										noDataExpression: true,
+									},
+									{
+										displayName: 'Type',
+										name: 'type',
+										type: 'options',
+										description: 'The field value type',
+										options: [
+											{
+												name: 'Allow Any Type',
+												value: 'any',
+											},
+											{
+												name: 'String',
+												value: 'string',
+											},
+											{
+												name: 'Number',
+												value: 'number',
+											},
+											{
+												name: 'Boolean',
+												value: 'boolean',
+											},
+											{
+												name: 'Array',
+												value: 'array',
+											},
+											{
+												name: 'Object',
+												value: 'object',
+											},
+										],
+										default: 'string',
+										noDataExpression: true,
+									},
+								],
+							},
+						],
+					},
+					nodeValues: {
+						events: 'worklfow_call',
+						inputSource: 'workflowInputs',
+						workflowInputs: {
+							values: [
+								{
+									name: 'field1',
+									type: 'string',
+								},
+								{
+									name: 'field2',
+									type: 'string',
+								},
+							],
+						},
+						inputOptions: {},
+					},
+					path: '',
+					node: {
+						parameters: {
+							events: 'worklfow_call',
+							inputSource: 'workflowInputs',
+							workflowInputs: {},
+							inputOptions: {},
+						},
+						type: 'n8n-nodes-base.executeWorkflowTrigger',
+						typeVersion: 1.1,
+						position: [-140, -20],
+						id: '9abdbdac-5f32-4876-b4d5-895d8ca4cb00',
+						name: 'Test Node',
+					} as INode,
 				},
-			};
-			const result = convertNodeToAiTool(fullNodeWrapper);
-			expect(result.description.codex).toEqual({
-				categories: ['AI'],
-				subcategories: {
-					AI: ['Tools'],
-					Tools: ['Other Tools'],
+				output: {},
+			},
+			{
+				description:
+					'Fixed collection::Should return an issue if field count is lower than minimum specified',
+				input: {
+					nodeProperties: {
+						displayName: 'Workflow Inputs',
+						name: 'workflowInputs',
+						placeholder: 'Add Field',
+						type: 'fixedCollection',
+						description:
+							'Define expected input fields. If no inputs are provided, all data from the calling workflow will be passed through.',
+						typeOptions: {
+							multipleValues: true,
+							sortable: true,
+							minRequiredFields: 1,
+						},
+						displayOptions: {
+							show: {
+								'@version': [
+									{
+										_cnd: {
+											gte: 1.1,
+										},
+									},
+								],
+								inputSource: ['workflowInputs'],
+							},
+						},
+						default: {},
+						options: [
+							{
+								name: 'values',
+								displayName: 'Values',
+								values: [
+									{
+										displayName: 'Name',
+										name: 'name',
+										type: 'string',
+										default: '',
+										placeholder: 'e.g. fieldName',
+										description: 'Name of the field',
+										noDataExpression: true,
+									},
+									{
+										displayName: 'Type',
+										name: 'type',
+										type: 'options',
+										description: 'The field value type',
+										options: [
+											{
+												name: 'Allow Any Type',
+												value: 'any',
+											},
+											{
+												name: 'String',
+												value: 'string',
+											},
+											{
+												name: 'Number',
+												value: 'number',
+											},
+											{
+												name: 'Boolean',
+												value: 'boolean',
+											},
+											{
+												name: 'Array',
+												value: 'array',
+											},
+											{
+												name: 'Object',
+												value: 'object',
+											},
+										],
+										default: 'string',
+										noDataExpression: true,
+									},
+								],
+							},
+						],
+					},
+					nodeValues: {
+						events: 'worklfow_call',
+						inputSource: 'workflowInputs',
+						workflowInputs: {},
+						inputOptions: {},
+					},
+					path: '',
+					node: {
+						parameters: {
+							events: 'worklfow_call',
+							inputSource: 'workflowInputs',
+							workflowInputs: {},
+							inputOptions: {},
+						},
+						type: 'n8n-nodes-base.executeWorkflowTrigger',
+						typeVersion: 1.1,
+						position: [-140, -20],
+						id: '9abdbdac-5f32-4876-b4d5-895d8ca4cb00',
+						name: 'Test Node',
+					} as INode,
 				},
-				resources: {
-					primaryDocumentation: [{ url: 'https://example.com' }],
+				output: {
+					parameters: {
+						workflowInputs: ['At least 1 field is required.'],
+					},
 				},
-			});
-		});
-
-		it('should handle nodes with very long names', () => {
-			fullNodeWrapper.description.name = 'veryLongNodeNameThatExceedsNormalLimits'.repeat(10);
-			fullNodeWrapper.description.displayName =
-				'Very Long Node Name That Exceeds Normal Limits'.repeat(10);
-			const result = convertNodeToAiTool(fullNodeWrapper);
-			expect(result.description.name.endsWith('Tool')).toBe(true);
-			expect(result.description.displayName.endsWith('Tool')).toBe(true);
-		});
+			},
+			{
+				description:
+					'Fixed collection::Should return an issue if field count is higher than maximum specified',
+				input: {
+					nodeProperties: {
+						displayName: 'Workflow Inputs',
+						name: 'workflowInputs',
+						placeholder: 'Add Field',
+						type: 'fixedCollection',
+						description:
+							'Define expected input fields. If no inputs are provided, all data from the calling workflow will be passed through.',
+						typeOptions: {
+							multipleValues: true,
+							sortable: true,
+							maxAllowedFields: 1,
+						},
+						displayOptions: {
+							show: {
+								'@version': [
+									{
+										_cnd: {
+											gte: 1.1,
+										},
+									},
+								],
+								inputSource: ['workflowInputs'],
+							},
+						},
+						default: {},
+						options: [
+							{
+								name: 'values',
+								displayName: 'Values',
+								values: [
+									{
+										displayName: 'Name',
+										name: 'name',
+										type: 'string',
+										default: '',
+										placeholder: 'e.g. fieldName',
+										description: 'Name of the field',
+										noDataExpression: true,
+									},
+									{
+										displayName: 'Type',
+										name: 'type',
+										type: 'options',
+										description: 'The field value type',
+										options: [
+											{
+												name: 'Allow Any Type',
+												value: 'any',
+											},
+											{
+												name: 'String',
+												value: 'string',
+											},
+											{
+												name: 'Number',
+												value: 'number',
+											},
+											{
+												name: 'Boolean',
+												value: 'boolean',
+											},
+											{
+												name: 'Array',
+												value: 'array',
+											},
+											{
+												name: 'Object',
+												value: 'object',
+											},
+										],
+										default: 'string',
+										noDataExpression: true,
+									},
+								],
+							},
+						],
+					},
+					nodeValues: {
+						events: 'worklfow_call',
+						inputSource: 'workflowInputs',
+						workflowInputs: {
+							values: [
+								{
+									name: 'field1',
+									type: 'string',
+								},
+								{
+									name: 'field2',
+									type: 'string',
+								},
+							],
+						},
+						inputOptions: {},
+					},
+					path: '',
+					node: {
+						parameters: {
+							events: 'worklfow_call',
+							inputSource: 'workflowInputs',
+							workflowInputs: {},
+							inputOptions: {},
+						},
+						type: 'n8n-nodes-base.executeWorkflowTrigger',
+						typeVersion: 1.1,
+						position: [-140, -20],
+						id: '9abdbdac-5f32-4876-b4d5-895d8ca4cb00',
+						name: 'Test Node',
+					} as INode,
+				},
+				output: {
+					parameters: {
+						workflowInputs: ['At most 1 field is allowed.'],
+					},
+				},
+			},
+			{
+				description: 'Fixed collection::Should not return issues if the collection is hidden',
+				input: {
+					nodeProperties: {
+						displayName: 'Workflow Inputs',
+						name: 'workflowInputs',
+						placeholder: 'Add Field',
+						type: 'fixedCollection',
+						description:
+							'Define expected input fields. If no inputs are provided, all data from the calling workflow will be passed through.',
+						typeOptions: {
+							multipleValues: true,
+							sortable: true,
+							maxAllowedFields: 1,
+						},
+						displayOptions: {
+							show: {
+								'@version': [
+									{
+										_cnd: {
+											gte: 1.1,
+										},
+									},
+								],
+								inputSource: ['workflowInputs'],
+							},
+						},
+						default: {},
+						options: [
+							{
+								name: 'values',
+								displayName: 'Values',
+								values: [
+									{
+										displayName: 'Name',
+										name: 'name',
+										type: 'string',
+										default: '',
+										placeholder: 'e.g. fieldName',
+										description: 'Name of the field',
+										noDataExpression: true,
+									},
+									{
+										displayName: 'Type',
+										name: 'type',
+										type: 'options',
+										description: 'The field value type',
+										options: [
+											{
+												name: 'Allow Any Type',
+												value: 'any',
+											},
+											{
+												name: 'String',
+												value: 'string',
+											},
+											{
+												name: 'Number',
+												value: 'number',
+											},
+											{
+												name: 'Boolean',
+												value: 'boolean',
+											},
+											{
+												name: 'Array',
+												value: 'array',
+											},
+											{
+												name: 'Object',
+												value: 'object',
+											},
+										],
+										default: 'string',
+										noDataExpression: true,
+									},
+								],
+							},
+						],
+					},
+					nodeValues: {
+						events: 'worklfow_call',
+						inputSource: 'somethingElse',
+						workflowInputs: {
+							values: [
+								{
+									name: 'field1',
+									type: 'string',
+								},
+								{
+									name: 'field2',
+									type: 'string',
+								},
+							],
+						},
+						inputOptions: {},
+					},
+					path: '',
+					node: {
+						parameters: {
+							events: 'worklfow_call',
+							inputSource: 'workflowInputs',
+							workflowInputs: {},
+							inputOptions: {},
+						},
+						type: 'n8n-nodes-base.executeWorkflowTrigger',
+						typeVersion: 1.1,
+						position: [-140, -20],
+						id: '9abdbdac-5f32-4876-b4d5-895d8ca4cb00',
+						name: 'Test Node',
+					} as INode,
+				},
+				output: {},
+			},
+		];
 
-		it('should handle nodes with special characters in name and displayName', () => {
-			fullNodeWrapper.description.name = 'special@#$%Node';
-			fullNodeWrapper.description.displayName = 'Special @#$% Node';
-			const result = convertNodeToAiTool(fullNodeWrapper);
-			expect(result.description.name).toBe('special@#$%NodeTool');
-			expect(result.description.displayName).toBe('Special @#$% Node Tool');
-		});
+		for (const testData of tests) {
+			test(testData.description, () => {
+				const result = getParameterIssues(
+					testData.input.nodeProperties,
+					testData.input.nodeValues,
+					testData.input.path,
+					testData.input.node,
+				);
+				expect(result).toEqual(testData.output);
+			});
+		}
 	});
 });
diff --git a/packages/workflow/test/TelemetryHelpers.test.ts b/packages/workflow/test/TelemetryHelpers.test.ts
index 526b4797f6c7e..65ae9f31b27a9 100644
--- a/packages/workflow/test/TelemetryHelpers.test.ts
+++ b/packages/workflow/test/TelemetryHelpers.test.ts
@@ -1093,9 +1093,7 @@ function generateTestWorkflowAndRunData(): { workflow: Partial<IWorkflowBase>; r
 			},
 			Switch: {
 				main: [
-					// @ts-ignore
 					null,
-					// @ts-ignore
 					null,
 					[
 						{
diff --git a/packages/workflow/test/Workflow.test.ts b/packages/workflow/test/Workflow.test.ts
index ded592c9a609e..88c41e8d9f2b7 100644
--- a/packages/workflow/test/Workflow.test.ts
+++ b/packages/workflow/test/Workflow.test.ts
@@ -6,22 +6,14 @@ import type {
 	IBinaryKeyData,
 	IConnections,
 	IDataObject,
-	IExecuteData,
 	INode,
-	INodeExecuteFunctions,
 	INodeExecutionData,
 	INodeParameters,
-	INodeType,
-	INodeTypeDescription,
 	INodeTypes,
 	IRunExecutionData,
-	ITriggerFunctions,
-	ITriggerResponse,
-	IWorkflowExecuteAdditionalData,
 	NodeParameterValueType,
 } from '@/Interfaces';
-import * as NodeHelpers from '@/NodeHelpers';
-import { Workflow, type WorkflowParameters } from '@/Workflow';
+import { Workflow } from '@/Workflow';
 
 process.env.TEST_VARIABLE_1 = 'valueEnvVariable1';
 
@@ -33,126 +25,6 @@ interface StubNode {
 }
 
 describe('Workflow', () => {
-	describe('checkIfWorkflowCanBeActivated', () => {
-		const disabledNode = mock<INode>({ type: 'triggerNode', disabled: true });
-		const unknownNode = mock<INode>({ type: 'unknownNode' });
-		const noTriggersNode = mock<INode>({ type: 'noTriggersNode' });
-		const pollNode = mock<INode>({ type: 'pollNode' });
-		const triggerNode = mock<INode>({ type: 'triggerNode' });
-		const webhookNode = mock<INode>({ type: 'webhookNode' });
-
-		const nodeTypes = mock<INodeTypes>();
-		nodeTypes.getByNameAndVersion.mockImplementation((type) => {
-			// TODO: getByNameAndVersion signature needs to be updated to allow returning undefined
-			if (type === 'unknownNode') return undefined as unknown as INodeType;
-			const partial: Partial<INodeType> = {
-				poll: undefined,
-				trigger: undefined,
-				webhook: undefined,
-				description: mock<INodeTypeDescription>({
-					properties: [],
-				}),
-			};
-			if (type === 'pollNode') partial.poll = jest.fn();
-			if (type === 'triggerNode') partial.trigger = jest.fn();
-			if (type === 'webhookNode') partial.webhook = jest.fn();
-			return mock(partial);
-		});
-
-		test.each([
-			['should skip disabled nodes', disabledNode, [], false],
-			['should skip nodes marked as ignored', triggerNode, ['triggerNode'], false],
-			['should skip unknown nodes', unknownNode, [], false],
-			['should skip nodes with no trigger method', noTriggersNode, [], false],
-			['should activate if poll method exists', pollNode, [], true],
-			['should activate if trigger method exists', triggerNode, [], true],
-			['should activate if webhook method exists', webhookNode, [], true],
-		])('%s', async (_, node, ignoredNodes, expected) => {
-			const params = mock<WorkflowParameters>({ nodeTypes });
-			params.nodes = [node];
-			const workflow = new Workflow(params);
-			expect(workflow.checkIfWorkflowCanBeActivated(ignoredNodes)).toBe(expected);
-		});
-	});
-
-	describe('checkReadyForExecution', () => {
-		const disabledNode = mock<INode>({ name: 'Disabled Node', disabled: true });
-		const startNode = mock<INode>({ name: 'Start Node' });
-		const unknownNode = mock<INode>({ name: 'Unknown Node', type: 'unknownNode' });
-
-		const nodeParamIssuesSpy = jest.spyOn(NodeHelpers, 'getNodeParametersIssues');
-
-		const nodeTypes = mock<INodeTypes>();
-		nodeTypes.getByNameAndVersion.mockImplementation((type) => {
-			// TODO: getByNameAndVersion signature needs to be updated to allow returning undefined
-			if (type === 'unknownNode') return undefined as unknown as INodeType;
-			return mock<INodeType>({
-				description: {
-					properties: [],
-				},
-			});
-		});
-
-		beforeEach(() => jest.clearAllMocks());
-
-		it('should return null if there are no nodes', () => {
-			const workflow = new Workflow({
-				nodes: [],
-				connections: {},
-				active: false,
-				nodeTypes,
-			});
-
-			const issues = workflow.checkReadyForExecution();
-			expect(issues).toBe(null);
-			expect(nodeTypes.getByNameAndVersion).not.toHaveBeenCalled();
-			expect(nodeParamIssuesSpy).not.toHaveBeenCalled();
-		});
-
-		it('should return null if there are no enabled nodes', () => {
-			const workflow = new Workflow({
-				nodes: [disabledNode],
-				connections: {},
-				active: false,
-				nodeTypes,
-			});
-
-			const issues = workflow.checkReadyForExecution({ startNode: disabledNode.name });
-			expect(issues).toBe(null);
-			expect(nodeTypes.getByNameAndVersion).toHaveBeenCalledTimes(1);
-			expect(nodeParamIssuesSpy).not.toHaveBeenCalled();
-		});
-
-		it('should return typeUnknown for unknown nodes', () => {
-			const workflow = new Workflow({
-				nodes: [unknownNode],
-				connections: {},
-				active: false,
-				nodeTypes,
-			});
-
-			const issues = workflow.checkReadyForExecution({ startNode: unknownNode.name });
-			expect(issues).toEqual({ [unknownNode.name]: { typeUnknown: true } });
-			expect(nodeTypes.getByNameAndVersion).toHaveBeenCalledTimes(2);
-			expect(nodeParamIssuesSpy).not.toHaveBeenCalled();
-		});
-
-		it('should return issues for regular nodes', () => {
-			const workflow = new Workflow({
-				nodes: [startNode],
-				connections: {},
-				active: false,
-				nodeTypes,
-			});
-			nodeParamIssuesSpy.mockReturnValue({ execution: false });
-
-			const issues = workflow.checkReadyForExecution({ startNode: startNode.name });
-			expect(issues).toEqual({ [startNode.name]: { execution: false } });
-			expect(nodeTypes.getByNameAndVersion).toHaveBeenCalledTimes(2);
-			expect(nodeParamIssuesSpy).toHaveBeenCalled();
-		});
-	});
-
 	describe('renameNodeInParameterValue', () => {
 		describe('for expressions', () => {
 			const tests = [
@@ -2023,69 +1895,6 @@ describe('Workflow', () => {
 		});
 	});
 
-	describe('runNode', () => {
-		const nodeTypes = mock<INodeTypes>();
-		const triggerNode = mock<INode>();
-		const triggerResponse = mock<ITriggerResponse>({
-			closeFunction: jest.fn(),
-			// This node should never trigger, or return
-			manualTriggerFunction: async () => await new Promise(() => {}),
-		});
-		const triggerNodeType = mock<INodeType>({
-			description: {
-				properties: [],
-			},
-			execute: undefined,
-			poll: undefined,
-			webhook: undefined,
-			async trigger(this: ITriggerFunctions) {
-				return triggerResponse;
-			},
-		});
-
-		nodeTypes.getByNameAndVersion.mockReturnValue(triggerNodeType);
-
-		const workflow = new Workflow({
-			nodeTypes,
-			nodes: [triggerNode],
-			connections: {},
-			active: false,
-		});
-
-		const executionData = mock<IExecuteData>();
-		const runExecutionData = mock<IRunExecutionData>();
-		const additionalData = mock<IWorkflowExecuteAdditionalData>();
-		const nodeExecuteFunctions = mock<INodeExecuteFunctions>();
-		const triggerFunctions = mock<ITriggerFunctions>();
-		nodeExecuteFunctions.getExecuteTriggerFunctions.mockReturnValue(triggerFunctions);
-		const abortController = new AbortController();
-
-		test('should call closeFunction when manual trigger is aborted', async () => {
-			const runPromise = workflow.runNode(
-				executionData,
-				runExecutionData,
-				0,
-				additionalData,
-				nodeExecuteFunctions,
-				'manual',
-				abortController.signal,
-			);
-			// Yield back to the event-loop to let async parts of `runNode` execute
-			await new Promise((resolve) => setImmediate(resolve));
-
-			let isSettled = false;
-			void runPromise.then(() => {
-				isSettled = true;
-			});
-			expect(isSettled).toBe(false);
-			expect(abortController.signal.aborted).toBe(false);
-			expect(triggerResponse.closeFunction).not.toHaveBeenCalled();
-
-			abortController.abort();
-			expect(triggerResponse.closeFunction).toHaveBeenCalled();
-		});
-	});
-
 	describe('__getConnectionsByDestination', () => {
 		it('should return empty object when there are no connections', () => {
 			const workflow = new Workflow({
diff --git a/packages/workflow/test/WorkflowDataProxy.test.ts b/packages/workflow/test/WorkflowDataProxy.test.ts
index 89b0751321543..8c41b0571cb47 100644
--- a/packages/workflow/test/WorkflowDataProxy.test.ts
+++ b/packages/workflow/test/WorkflowDataProxy.test.ts
@@ -1,11 +1,12 @@
 import { ExpressionError } from '@/errors/expression.error';
-import type {
-	IExecuteData,
-	INode,
-	IPinData,
-	IRun,
-	IWorkflowBase,
-	WorkflowExecuteMode,
+import {
+	NodeConnectionType,
+	type IExecuteData,
+	type INode,
+	type IPinData,
+	type IRun,
+	type IWorkflowBase,
+	type WorkflowExecuteMode,
 } from '@/Interfaces';
 import { Workflow } from '@/Workflow';
 import { WorkflowDataProxy } from '@/WorkflowDataProxy';
@@ -26,10 +27,15 @@ const getProxyFromFixture = (
 	run: IRun | null,
 	activeNode: string,
 	mode?: WorkflowExecuteMode,
-	opts?: { throwOnMissingExecutionData: boolean },
+	opts?: {
+		throwOnMissingExecutionData: boolean;
+		connectionType?: NodeConnectionType;
+		runIndex?: number;
+	},
 ) => {
-	const taskData = run?.data.resultData.runData[activeNode]?.[0];
-	const lastNodeConnectionInputData = taskData?.data?.main[0];
+	const taskData = run?.data.resultData.runData[activeNode]?.[opts?.runIndex ?? 0];
+	const lastNodeConnectionInputData =
+		taskData?.data?.[opts?.connectionType ?? NodeConnectionType.Main]?.[0];
 
 	let executeData: IExecuteData | undefined;
 
@@ -38,7 +44,7 @@ const getProxyFromFixture = (
 			data: taskData.data!,
 			node: workflow.nodes.find((node) => node.name === activeNode) as INode,
 			source: {
-				main: taskData.source,
+				[opts?.connectionType ?? NodeConnectionType.Main]: taskData.source,
 			},
 		};
 	}
@@ -64,7 +70,7 @@ const getProxyFromFixture = (
 			pinData,
 		}),
 		run?.data ?? null,
-		0,
+		opts?.runIndex ?? 0,
 		0,
 		activeNode,
 		lastNodeConnectionInputData ?? [],
@@ -443,4 +449,41 @@ describe('WorkflowDataProxy', () => {
 			});
 		});
 	});
+
+	describe('$fromAI', () => {
+		const fixture = loadFixture('from_ai_multiple_items');
+		const getFromAIProxy = (runIndex = 0) =>
+			getProxyFromFixture(fixture.workflow, fixture.run, 'Google Sheets1', 'manual', {
+				connectionType: NodeConnectionType.AiTool,
+				throwOnMissingExecutionData: false,
+				runIndex,
+			});
+
+		test('Retrieves values for first item', () => {
+			expect(getFromAIProxy().$fromAI('full_name')).toEqual('Mr. Input 1');
+			expect(getFromAIProxy().$fromAI('email')).toEqual('input1@n8n.io');
+		});
+
+		test('Retrieves values for second item', () => {
+			expect(getFromAIProxy(1).$fromAI('full_name')).toEqual('Mr. Input 2');
+			expect(getFromAIProxy(1).$fromAI('email')).toEqual('input2@n8n.io');
+		});
+
+		test('Case variants: $fromAi and $fromai', () => {
+			expect(getFromAIProxy().$fromAi('full_name')).toEqual('Mr. Input 1');
+			expect(getFromAIProxy().$fromai('email')).toEqual('input1@n8n.io');
+		});
+
+		test('Returns default value when key not found', () => {
+			expect(
+				getFromAIProxy().$fromAI('non_existent_key', 'description', 'string', 'default_value'),
+			).toEqual('default_value');
+		});
+
+		test('Throws an error when a key is invalid (e.g. empty string)', () => {
+			expect(() => getFromAIProxy().$fromAI('')).toThrow(ExpressionError);
+			expect(() => getFromAIProxy().$fromAI('invalid key')).toThrow(ExpressionError);
+			expect(() => getFromAIProxy().$fromAI('invalid!')).toThrow(ExpressionError);
+		});
+	});
 });
diff --git a/packages/workflow/test/fixtures/WorkflowDataProxy/from_ai_multiple_items_run.json b/packages/workflow/test/fixtures/WorkflowDataProxy/from_ai_multiple_items_run.json
new file mode 100644
index 0000000000000..563e52f15a38b
--- /dev/null
+++ b/packages/workflow/test/fixtures/WorkflowDataProxy/from_ai_multiple_items_run.json
@@ -0,0 +1,221 @@
+{
+	"data": {
+		"startData": {},
+		"resultData": {
+			"runData": {
+				"When clicking ‘Test workflow’": [
+					{
+						"hints": [],
+						"startTime": 1733478795595,
+						"executionTime": 0,
+						"source": [],
+						"executionStatus": "success",
+						"data": {
+							"main": [
+								[
+									{
+										"json": {},
+										"pairedItem": {
+											"item": 0
+										}
+									}
+								]
+							]
+						}
+					}
+				],
+				"Code": [
+					{
+						"hints": [
+							{
+								"message": "To make sure expressions after this node work, return the input items that produced each output item. <a target=\"_blank\" href=\"https://docs.n8n.io/data/data-mapping/data-item-linking/item-linking-code-node/\">More info</a>",
+								"location": "outputPane"
+							}
+						],
+						"startTime": 1733478795595,
+						"executionTime": 2,
+						"source": [
+							{
+								"previousNode": "When clicking ‘Test workflow’"
+							}
+						],
+						"executionStatus": "success",
+						"data": {
+							"main": [
+								[
+									{
+										"json": {
+											"full_name": "Mr. Input 1",
+											"email": "input1@n8n.io"
+										},
+										"pairedItem": {
+											"item": 0
+										}
+									},
+									{
+										"json": {
+											"full_name": "Mr. Input 2",
+											"email": "input2@n8n.io"
+										},
+										"pairedItem": {
+											"item": 0
+										}
+									}
+								]
+							]
+						}
+					}
+				],
+				"Google Sheets1": [
+					{
+						"startTime": 1733478796468,
+						"executionTime": 1417,
+						"executionStatus": "success",
+						"source": [null],
+						"data": {
+							"ai_tool": [
+								[
+									{
+										"json": {
+											"response": [
+												{
+													"full name": "Mr. Input 1",
+													"email": "input1@n8n.io"
+												},
+												{},
+												{}
+											]
+										}
+									}
+								]
+							]
+						},
+						"inputOverride": {
+							"ai_tool": [
+								[
+									{
+										"json": {
+											"full_name": "Mr. Input 1",
+											"email": "input1@n8n.io"
+										}
+									}
+								]
+							]
+						},
+						"metadata": {
+							"subRun": [
+								{
+									"node": "Google Sheets1",
+									"runIndex": 0
+								},
+								{
+									"node": "Google Sheets1",
+									"runIndex": 1
+								}
+							]
+						}
+					},
+					{
+						"startTime": 1733478799915,
+						"executionTime": 1271,
+						"executionStatus": "success",
+						"source": [null],
+						"data": {
+							"ai_tool": [
+								[
+									{
+										"json": {
+											"response": [
+												{
+													"full name": "Mr. Input 1",
+													"email": "input1@n8n.io"
+												},
+												{},
+												{}
+											]
+										}
+									}
+								]
+							]
+						},
+						"inputOverride": {
+							"ai_tool": [
+								[
+									{
+										"json": {
+											"full_name": "Mr. Input 2",
+											"email": "input2@n8n.io"
+										}
+									}
+								]
+							]
+						}
+					}
+				],
+				"Agent single list with multiple tool calls": [
+					{
+						"hints": [],
+						"startTime": 1733478795597,
+						"executionTime": 9157,
+						"source": [
+							{
+								"previousNode": "Code"
+							}
+						],
+						"executionStatus": "success",
+						"data": {
+							"main": [
+								[
+									{
+										"json": {
+											"output": "The user \"Mr. Input 1\" with the email \"input1@n8n.io\" has been successfully added to your Users sheet."
+										},
+										"pairedItem": {
+											"item": 0
+										}
+									},
+									{
+										"json": {
+											"output": "The user \"Mr. Input 2\" with the email \"input2@n8n.io\" has been successfully added to your Users sheet."
+										},
+										"pairedItem": {
+											"item": 1
+										}
+									}
+								]
+							]
+						}
+					}
+				]
+			},
+			"pinData": {},
+			"lastNodeExecuted": "Agent single list with multiple tool calls"
+		},
+		"executionData": {
+			"contextData": {},
+			"nodeExecutionStack": [],
+			"metadata": {
+				"Google Sheets1": [
+					{
+						"subRun": [
+							{
+								"node": "Google Sheets1",
+								"runIndex": 0
+							},
+							{
+								"node": "Google Sheets1",
+								"runIndex": 1
+							}
+						]
+					}
+				]
+			},
+			"waitingExecution": {},
+			"waitingExecutionSource": {}
+		}
+	},
+	"mode": "manual",
+	"startedAt": "2024-02-08T15:45:18.848Z",
+	"stoppedAt": "2024-02-08T15:45:18.862Z",
+	"status": "running"
+}
diff --git a/packages/workflow/test/fixtures/WorkflowDataProxy/from_ai_multiple_items_workflow.json b/packages/workflow/test/fixtures/WorkflowDataProxy/from_ai_multiple_items_workflow.json
new file mode 100644
index 0000000000000..9f3f75970e1f7
--- /dev/null
+++ b/packages/workflow/test/fixtures/WorkflowDataProxy/from_ai_multiple_items_workflow.json
@@ -0,0 +1,112 @@
+{
+	"id": "8d7lUG8IdEyvIUim",
+	"name": "Multiple items tool",
+	"active": false,
+	"nodes": [
+		{
+			"parameters": {
+				"mode": "runOnceForAllItems",
+				"language": "javaScript",
+				"jsCode": "return [\n  { \"full_name\": \"Mr. Input 1\", \"email\": \"input1@n8n.io\" }, \n  { \"full_name\": \"Mr. Input 2\", \"email\": \"input2@n8n.io\" }\n]",
+				"notice": ""
+			},
+			"id": "cb19a188-12ae-4d46-86df-4a2044ec3346",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 2,
+			"position": [-160, 480]
+		},
+		{
+			"parameters": { "notice": "", "model": "gpt-4o-mini", "options": {} },
+			"id": "c448b6b4-9e11-4044-96e5-f4138534ae52",
+			"name": "OpenAI Chat Model1",
+			"type": "@n8n/n8n-nodes-langchain.lmChatOpenAi",
+			"typeVersion": 1,
+			"position": [40, 700]
+		},
+		{
+			"parameters": {
+				"descriptionType": "manual",
+				"toolDescription": "Add row to Users sheet",
+				"authentication": "oAuth2",
+				"resource": "sheet",
+				"operation": "append",
+				"columns": {
+					"mappingMode": "defineBelow",
+					"value": {
+						"full name": "={{ $fromAI('full_name') }}",
+						"email": "={{ $fromAI('email') }}"
+					},
+					"matchingColumns": [],
+					"schema": [
+						{
+							"id": "full name",
+							"displayName": "full name",
+							"required": false,
+							"defaultMatch": false,
+							"display": true,
+							"type": "string",
+							"canBeUsedToMatch": true
+						},
+						{
+							"id": "email",
+							"displayName": "email",
+							"required": false,
+							"defaultMatch": false,
+							"display": true,
+							"type": "string",
+							"canBeUsedToMatch": true
+						}
+					]
+				},
+				"options": { "useAppend": true }
+			},
+			"id": "d8b40267-9397-45b6-8a64-ee7e8f9eb8a8",
+			"name": "Google Sheets1",
+			"type": "n8n-nodes-base.googleSheetsTool",
+			"typeVersion": 4.5,
+			"position": [240, 700]
+		},
+		{
+			"parameters": {
+				"notice_tip": "",
+				"agent": "toolsAgent",
+				"promptType": "define",
+				"text": "=Add this user to my Users sheet:\n{{ $json.toJsonString() }}",
+				"hasOutputParser": false,
+				"options": {},
+				"credentials": ""
+			},
+			"id": "0d6c1bd7-cc91-4571-8fdb-c875a1af44c7",
+			"name": "Agent single list with multiple tool calls",
+			"type": "@n8n/n8n-nodes-langchain.agent",
+			"typeVersion": 1.7,
+			"position": [40, 480]
+		}
+	],
+	"connections": {
+		"When clicking ‘Test workflow’": { "main": [[{ "node": "Code", "type": "main", "index": 0 }]] },
+		"Code": {
+			"main": [
+				[{ "node": "Agent single list with multiple tool calls", "type": "main", "index": 0 }]
+			]
+		},
+		"OpenAI Chat Model1": {
+			"ai_languageModel": [
+				[
+					{
+						"node": "Agent single list with multiple tool calls",
+						"type": "ai_languageModel",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Google Sheets1": {
+			"ai_tool": [
+				[{ "node": "Agent single list with multiple tool calls", "type": "ai_tool", "index": 0 }]
+			]
+		}
+	},
+	"pinData": {}
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 55c52b25cafd1..a42e5578268d6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,12 +9,9 @@ catalogs:
     '@langchain/core':
       specifier: 0.3.19
       version: 0.3.19
-    '@sentry/integrations':
-      specifier: 7.87.0
-      version: 7.87.0
     '@sentry/node':
-      specifier: 7.87.0
-      version: 7.87.0
+      specifier: 8.42.0
+      version: 8.42.0
     '@types/basic-auth':
       specifier: ^1.1.3
       version: 1.1.3
@@ -55,8 +52,8 @@ catalogs:
       specifier: 3.4.4
       version: 3.4.4
     nanoid:
-      specifier: 3.3.6
-      version: 3.3.6
+      specifier: 3.3.8
+      version: 3.3.8
     typedi:
       specifier: 0.10.0
       version: 0.10.0
@@ -242,7 +239,7 @@ importers:
         version: 4.17.21
       nanoid:
         specifier: 'catalog:'
-        version: 3.3.6
+        version: 3.3.8
       start-server-and-test:
         specifier: ^2.0.8
         version: 2.0.8
@@ -292,7 +289,7 @@ importers:
         version: 8.6.0
       nanoid:
         specifier: 'catalog:'
-        version: 3.3.6
+        version: 3.3.8
       zx:
         specifier: ^8.1.4
         version: 8.1.4
@@ -500,7 +497,7 @@ importers:
         version: link:../json-schema-to-zod
       '@n8n/typeorm':
         specifier: 0.3.20-12
-        version: 0.3.20-12(@sentry/node@7.87.0)(ioredis@5.3.2)(mssql@10.0.2)(mysql2@3.11.0)(pg@8.12.0)(redis@4.6.12)(sqlite3@5.1.7)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2))
+        version: 0.3.20-12(@sentry/node@8.42.0)(ioredis@5.3.2)(mssql@10.0.2)(mysql2@3.11.0)(pg@8.12.0)(redis@4.6.12)(sqlite3@5.1.7)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2))
       '@n8n/vm2':
         specifier: 3.9.25
         version: 3.9.25
@@ -666,18 +663,18 @@ importers:
       '@n8n/config':
         specifier: workspace:*
         version: link:../config
-      '@sentry/integrations':
-        specifier: 'catalog:'
-        version: 7.87.0
       '@sentry/node':
         specifier: 'catalog:'
-        version: 7.87.0
+        version: 8.42.0
       acorn:
         specifier: 8.14.0
         version: 8.14.0
       acorn-walk:
         specifier: 8.3.4
         version: 8.3.4
+      lodash:
+        specifier: 'catalog:'
+        version: 4.17.21
       n8n-core:
         specifier: workspace:*
         version: link:../../core
@@ -685,8 +682,8 @@ importers:
         specifier: workspace:*
         version: link:../../workflow
       nanoid:
-        specifier: ^3.3.6
-        version: 3.3.7
+        specifier: 'catalog:'
+        version: 3.3.8
       typedi:
         specifier: 'catalog:'
         version: 0.10.0(patch_hash=sk6omkefrosihg7lmqbzh7vfxe)
@@ -694,6 +691,9 @@ importers:
         specifier: '>=8.17.1'
         version: 8.17.1
     devDependencies:
+      '@types/lodash':
+        specifier: 'catalog:'
+        version: 4.14.195
       luxon:
         specifier: 'catalog:'
         version: 3.4.4
@@ -717,7 +717,7 @@ importers:
         version: 8.57.0
       eslint-config-airbnb-typescript:
         specifier: ^18.0.0
-        version: 18.0.0(@typescript-eslint/eslint-plugin@7.2.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint@8.57.0)(typescript@5.7.2))(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0))(eslint@8.57.0)
+        version: 18.0.0(@typescript-eslint/eslint-plugin@7.2.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint@8.57.0)(typescript@5.7.2))(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0)
       eslint-config-prettier:
         specifier: ^9.1.0
         version: 9.1.0(eslint@8.57.0)
@@ -780,7 +780,7 @@ importers:
         version: link:../@n8n/task-runner
       '@n8n/typeorm':
         specifier: 0.3.20-12
-        version: 0.3.20-12(@sentry/node@7.87.0)(ioredis@5.3.2)(mssql@10.0.2)(mysql2@3.11.0)(pg@8.12.0)(redis@4.6.14)(sqlite3@5.1.7)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2))
+        version: 0.3.20-12(@sentry/node@8.42.0)(ioredis@5.3.2)(mssql@10.0.2)(mysql2@3.11.0)(pg@8.12.0)(redis@4.6.14)(sqlite3@5.1.7)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2))
       '@n8n_io/ai-assistant-sdk':
         specifier: 1.12.0
         version: 1.12.0
@@ -793,12 +793,9 @@ importers:
       '@rudderstack/rudder-sdk-node':
         specifier: 2.0.9
         version: 2.0.9(tslib@2.6.2)
-      '@sentry/integrations':
-        specifier: 'catalog:'
-        version: 7.87.0
       '@sentry/node':
         specifier: 'catalog:'
-        version: 7.87.0
+        version: 8.42.0
       aws4:
         specifier: 1.11.0
         version: 1.11.0
@@ -924,7 +921,7 @@ importers:
         version: link:../workflow
       nanoid:
         specifier: 'catalog:'
-        version: 3.3.6
+        version: 3.3.8
       nodemailer:
         specifier: 6.9.9
         version: 6.9.9
@@ -1123,19 +1120,25 @@ importers:
     dependencies:
       '@langchain/core':
         specifier: 'catalog:'
-        version: 0.3.19(openai@4.73.1(zod@3.23.8))
+        version: 0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8))
       '@n8n/client-oauth2':
         specifier: workspace:*
         version: link:../@n8n/client-oauth2
       '@n8n/config':
         specifier: workspace:*
         version: link:../@n8n/config
+      '@sentry/node':
+        specifier: 'catalog:'
+        version: 8.42.0
       aws4:
         specifier: 1.11.0
         version: 1.11.0
       axios:
         specifier: 'catalog:'
         version: 1.7.4
+      chardet:
+        specifier: 2.0.0
+        version: 2.0.0
       concat-stream:
         specifier: 2.0.0
         version: 2.0.0
@@ -1168,7 +1171,7 @@ importers:
         version: link:../workflow
       nanoid:
         specifier: 'catalog:'
-        version: 3.3.6
+        version: 3.3.8
       oauth-1.0a:
         specifier: 2.2.6
         version: 2.2.6
@@ -1311,7 +1314,7 @@ importers:
         version: 0.19.0(@vue/compiler-sfc@3.5.13)
       unplugin-vue-components:
         specifier: ^0.27.2
-        version: 0.27.3(@babel/parser@7.25.6)(rollup@4.24.0)(vue@3.5.13(typescript@5.7.2))
+        version: 0.27.3(@babel/parser@7.26.3)(rollup@4.24.0)(vue@3.5.13(typescript@5.7.2))
       vite:
         specifier: catalog:frontend
         version: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
@@ -1406,20 +1409,20 @@ importers:
         specifier: catalog:frontend
         version: 8.33.1(vue@3.5.13(typescript@5.7.2))
       '@vue-flow/background':
-        specifier: ^1.3.1
-        version: 1.3.1(@vue-flow/core@1.41.4(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
+        specifier: ^1.3.2
+        version: 1.3.2(@vue-flow/core@1.41.6(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
       '@vue-flow/controls':
         specifier: ^1.1.2
-        version: 1.1.2(@vue-flow/core@1.41.4(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
+        version: 1.1.2(@vue-flow/core@1.41.6(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
       '@vue-flow/core':
-        specifier: ^1.41.4
-        version: 1.41.4(vue@3.5.13(typescript@5.7.2))
+        specifier: ^1.41.6
+        version: 1.41.6(vue@3.5.13(typescript@5.7.2))
       '@vue-flow/minimap':
         specifier: ^1.5.0
-        version: 1.5.0(@vue-flow/core@1.41.4(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
+        version: 1.5.0(@vue-flow/core@1.41.6(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
       '@vue-flow/node-resizer':
         specifier: ^1.4.0
-        version: 1.4.0(@vue-flow/core@1.41.4(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
+        version: 1.4.0(@vue-flow/core@1.41.6(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
       '@vueuse/components':
         specifier: ^10.11.0
         version: 10.11.0(vue@3.5.13(typescript@5.7.2))
@@ -1531,6 +1534,9 @@ importers:
       vue3-touch-events:
         specifier: ^4.1.3
         version: 4.1.3
+      vuedraggable:
+        specifier: 4.1.0
+        version: 4.1.0(vue@3.5.13(typescript@5.7.2))
       xss:
         specifier: 'catalog:'
         version: 1.0.15
@@ -1565,12 +1571,18 @@ importers:
       '@types/uuid':
         specifier: 'catalog:'
         version: 10.0.0
+      '@vitejs/plugin-legacy':
+        specifier: ^6.0.0
+        version: 6.0.0(terser@5.16.1)(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))
       '@vitejs/plugin-vue':
         specifier: catalog:frontend
         version: 5.2.1(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))(vue@3.5.13(typescript@5.7.2))
       '@vitest/coverage-v8':
         specifier: catalog:frontend
         version: 2.1.8(vitest@2.1.8(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
+      browserslist-to-esbuild:
+        specifier: ^2.1.1
+        version: 2.1.1(browserslist@4.24.2)
       miragejs:
         specifier: ^0.1.48
         version: 0.1.48
@@ -1579,10 +1591,13 @@ importers:
         version: 0.19.0(@vue/compiler-sfc@3.5.13)
       unplugin-vue-components:
         specifier: ^0.27.2
-        version: 0.27.3(@babel/parser@7.25.6)(rollup@4.24.0)(vue@3.5.13(typescript@5.7.2))
+        version: 0.27.3(@babel/parser@7.26.3)(rollup@4.24.0)(vue@3.5.13(typescript@5.7.2))
       vite:
         specifier: catalog:frontend
         version: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
+      vite-svg-loader:
+        specifier: 5.1.0
+        version: 5.1.0(vue@3.5.13(typescript@5.7.2))
       vitest:
         specifier: catalog:frontend
         version: 2.1.8(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
@@ -1683,6 +1698,9 @@ importers:
       fflate:
         specifier: 0.7.4
         version: 0.7.4
+      generate-schema:
+        specifier: 2.6.0
+        version: 2.6.0
       get-system-fonts:
         specifier: 2.0.2
         version: 2.0.2
@@ -1960,7 +1978,7 @@ importers:
     devDependencies:
       '@langchain/core':
         specifier: 'catalog:'
-        version: 0.3.19(openai@4.73.1)
+        version: 0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8))
       '@types/deep-equal':
         specifier: ^1.0.1
         version: 1.0.1
@@ -2332,14 +2350,26 @@ packages:
     resolution: {integrity: sha512-ZJhac6FkEd1yhG2AHOmfcXG4ceoLltoCVJjN5XsWN9BifBQr+cHJbWi0h68HZuSORq+3WtJ2z0hwF2NG1b5kcA==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/code-frame@7.26.2':
+    resolution: {integrity: sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/compat-data@7.23.5':
     resolution: {integrity: sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/compat-data@7.26.3':
+    resolution: {integrity: sha512-nHIxvKPniQXpmQLb0vhY3VaFb3S0YrTAwpOWJZh1wn3oJPjJk9Asva204PsBdmAE8vpzfHudT8DB0scYvy9q0g==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/core@7.24.0':
     resolution: {integrity: sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/core@7.26.0':
+    resolution: {integrity: sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/generator@7.22.9':
     resolution: {integrity: sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==}
     engines: {node: '>=6.9.0'}
@@ -2348,10 +2378,39 @@ packages:
     resolution: {integrity: sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/generator@7.26.3':
+    resolution: {integrity: sha512-6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-annotate-as-pure@7.25.9':
+    resolution: {integrity: sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-compilation-targets@7.23.6':
     resolution: {integrity: sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-compilation-targets@7.25.9':
+    resolution: {integrity: sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-create-class-features-plugin@7.25.9':
+    resolution: {integrity: sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-create-regexp-features-plugin@7.26.3':
+    resolution: {integrity: sha512-G7ZRb40uUgdKOQqPLjfD12ZmGA54PzqDFUv2BKImnC9QIfGhIHKvVML0oN8IUiDq4iRqpq74ABpvOaerfWdong==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-define-polyfill-provider@0.6.3':
+    resolution: {integrity: sha512-HK7Bi+Hj6H+VTHA3ZvBis7V/6hu9QuTrnMXNybfUf2iiuU/N97I8VjB+KbhFF8Rld/Lx5MzoCwPCpPjfK+n8Cg==}
+    peerDependencies:
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
+
   '@babel/helper-environment-visitor@7.22.20':
     resolution: {integrity: sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==}
     engines: {node: '>=6.9.0'}
@@ -2364,24 +2423,62 @@ packages:
     resolution: {integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-member-expression-to-functions@7.25.9':
+    resolution: {integrity: sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-module-imports@7.22.15':
     resolution: {integrity: sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-module-imports@7.25.9':
+    resolution: {integrity: sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-module-transforms@7.23.3':
     resolution: {integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
+  '@babel/helper-module-transforms@7.26.0':
+    resolution: {integrity: sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-optimise-call-expression@7.25.9':
+    resolution: {integrity: sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-plugin-utils@7.22.5':
     resolution: {integrity: sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-plugin-utils@7.25.9':
+    resolution: {integrity: sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-remap-async-to-generator@7.25.9':
+    resolution: {integrity: sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-replace-supers@7.25.9':
+    resolution: {integrity: sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
   '@babel/helper-simple-access@7.22.5':
     resolution: {integrity: sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-skip-transparent-expression-wrappers@7.25.9':
+    resolution: {integrity: sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-split-export-declaration@7.22.6':
     resolution: {integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==}
     engines: {node: '>=6.9.0'}
@@ -2390,6 +2487,10 @@ packages:
     resolution: {integrity: sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-string-parser@7.25.9':
+    resolution: {integrity: sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-validator-identifier@7.22.20':
     resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==}
     engines: {node: '>=6.9.0'}
@@ -2398,14 +2499,30 @@ packages:
     resolution: {integrity: sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-validator-identifier@7.25.9':
+    resolution: {integrity: sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-validator-option@7.23.5':
     resolution: {integrity: sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-validator-option@7.25.9':
+    resolution: {integrity: sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-wrap-function@7.25.9':
+    resolution: {integrity: sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helpers@7.24.0':
     resolution: {integrity: sha512-ulDZdc0Aj5uLc5nETsa7EPx2L7rM0YJM8r7ck7U73AXi7qOV44IHHRAYZHY6iU1rr3C5N4NtTmMRUJP6kwCWeA==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helpers@7.26.0':
+    resolution: {integrity: sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/highlight@7.24.6':
     resolution: {integrity: sha512-2YnuOp4HAk2BsBrJJvYCbItHx0zWscI1C3zgWkz+wDyD9I7GIVrfnLyrR4Y1VR+7p+chAEcrgRQYZAGIKMV7vQ==}
     engines: {node: '>=6.9.0'}
@@ -2415,6 +2532,52 @@ packages:
     engines: {node: '>=6.0.0'}
     hasBin: true
 
+  '@babel/parser@7.26.2':
+    resolution: {integrity: sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+
+  '@babel/parser@7.26.3':
+    resolution: {integrity: sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+
+  '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.9':
+    resolution: {integrity: sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.25.9':
+    resolution: {integrity: sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.25.9':
+    resolution: {integrity: sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.25.9':
+    resolution: {integrity: sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.13.0
+
+  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.25.9':
+    resolution: {integrity: sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2':
+    resolution: {integrity: sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
   '@babel/plugin-syntax-async-generators@7.8.4':
     resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
     peerDependencies:
@@ -2430,6 +2593,18 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
+  '@babel/plugin-syntax-import-assertions@7.26.0':
+    resolution: {integrity: sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-import-attributes@7.26.0':
+    resolution: {integrity: sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
   '@babel/plugin-syntax-import-meta@7.10.4':
     resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
     peerDependencies:
@@ -2488,119 +2663,452 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
-  '@babel/runtime@7.24.7':
-    resolution: {integrity: sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw==}
+  '@babel/plugin-syntax-unicode-sets-regex@7.18.6':
+    resolution: {integrity: sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==}
     engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
 
-  '@babel/template@7.24.0':
-    resolution: {integrity: sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==}
+  '@babel/plugin-transform-arrow-functions@7.25.9':
+    resolution: {integrity: sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==}
     engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@babel/traverse@7.24.0':
-    resolution: {integrity: sha512-HfuJlI8qq3dEDmNU5ChzzpZRWq+oxCZQyMzIMEqLho+AQnhMnKQUzH6ydo3RBl/YjPCuk68Y6s0Gx0AeyULiWw==}
+  '@babel/plugin-transform-async-generator-functions@7.25.9':
+    resolution: {integrity: sha512-RXV6QAzTBbhDMO9fWwOmwwTuYaiPbggWQ9INdZqAYeSHyG7FzQ+nOZaUUjNwKv9pV3aE4WFqFm1Hnbci5tBCAw==}
     engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@babel/types@7.25.6':
-    resolution: {integrity: sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==}
+  '@babel/plugin-transform-async-to-generator@7.25.9':
+    resolution: {integrity: sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==}
     engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@bcoe/v8-coverage@0.2.3':
-    resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
-
-  '@biomejs/biome@1.9.0':
-    resolution: {integrity: sha512-NlWh2F1wbxB3O/wE+aohGL0BziTS6e+6+dyFvpdeqLsbQZY7EsiklFb9W5Xs41U4vEmY7ANgdNp+oVDij6sQdA==}
-    engines: {node: '>=14.21.3'}
-    hasBin: true
+  '@babel/plugin-transform-block-scoped-functions@7.25.9':
+    resolution: {integrity: sha512-toHc9fzab0ZfenFpsyYinOX0J/5dgJVA2fm64xPewu7CoYHWEivIWKxkK2rMi4r3yQqLnVmheMXRdG+k239CgA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@biomejs/cli-darwin-arm64@1.9.0':
-    resolution: {integrity: sha512-2w9v/NRtYSmodx5QWQ49OGcyGKSECdWKbzc7n532Iq5sBhkKk996fd19icT6BuL54f01KFKRCRibAW+A2rg1Kw==}
-    engines: {node: '>=14.21.3'}
-    cpu: [arm64]
-    os: [darwin]
+  '@babel/plugin-transform-block-scoping@7.25.9':
+    resolution: {integrity: sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@biomejs/cli-darwin-x64@1.9.0':
-    resolution: {integrity: sha512-fBVt8jJQi0zX0SJ1C+tdzUbRpuX/07sgtBXEhunWRkPjdi6W/2S1sYHQ1wKn4OKiRAKfHM2Cf2FNO7hQvY61dA==}
-    engines: {node: '>=14.21.3'}
-    cpu: [x64]
-    os: [darwin]
+  '@babel/plugin-transform-class-properties@7.25.9':
+    resolution: {integrity: sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@biomejs/cli-linux-arm64-musl@1.9.0':
-    resolution: {integrity: sha512-Jy84mZ4vcppdmWMgQWOCfd8qIVC/vHmlaS5gy7GXkdWlBKSQ56YxEXTU58MHTbZ16LwJQpK2IulqRCC/rqWLBA==}
-    engines: {node: '>=14.21.3'}
-    cpu: [arm64]
-    os: [linux]
+  '@babel/plugin-transform-class-static-block@7.26.0':
+    resolution: {integrity: sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.12.0
 
-  '@biomejs/cli-linux-arm64@1.9.0':
-    resolution: {integrity: sha512-l8U2lcqsl9yKPP5WUdIrKH//C1pWyM2cSUfcTBn6GSvXmsSjBNEdGSdM4Wfne777Oe/9ONaD1Ga53U2HksHHLw==}
-    engines: {node: '>=14.21.3'}
-    cpu: [arm64]
-    os: [linux]
+  '@babel/plugin-transform-classes@7.25.9':
+    resolution: {integrity: sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@biomejs/cli-linux-x64-musl@1.9.0':
-    resolution: {integrity: sha512-N3enoFoIrkB6qJWyYfTiYmFdB1R/Mrij1dd1xBHqxxCKZY9GRkEswRX3F1Uqzo5T+9Iu8nAQobDqI/ygicYy/Q==}
-    engines: {node: '>=14.21.3'}
-    cpu: [x64]
-    os: [linux]
+  '@babel/plugin-transform-computed-properties@7.25.9':
+    resolution: {integrity: sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@biomejs/cli-linux-x64@1.9.0':
-    resolution: {integrity: sha512-8jAzjrrJTj510pwq4aVs7ZKkOvEy1D+nzl9DKvrPh4TOyUw5Ie+0EDwXGE2RAkCKHkGNOQBZ78WtIdsATgz5sA==}
-    engines: {node: '>=14.21.3'}
-    cpu: [x64]
-    os: [linux]
+  '@babel/plugin-transform-destructuring@7.25.9':
+    resolution: {integrity: sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@biomejs/cli-win32-arm64@1.9.0':
-    resolution: {integrity: sha512-AIjwJTGfdWGMRluSQ9pDB29nzce077dfHh0/HMqzztKzgD3spyuo2R9VoaFpbR0hLHPWEH6g6OxxDO7hfkXNkQ==}
-    engines: {node: '>=14.21.3'}
-    cpu: [arm64]
-    os: [win32]
+  '@babel/plugin-transform-dotall-regex@7.25.9':
+    resolution: {integrity: sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@biomejs/cli-win32-x64@1.9.0':
-    resolution: {integrity: sha512-4/4wTjNSoyNkm1SzcUaStDx46baX1VJRXtUoeEHjX9LfedR5N3qwZz5KfrRUnCd2fl5bmXK1CwMqKBkoF6zEiA==}
-    engines: {node: '>=14.21.3'}
-    cpu: [x64]
-    os: [win32]
+  '@babel/plugin-transform-duplicate-keys@7.25.9':
+    resolution: {integrity: sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@cfaester/enzyme-adapter-react-18@0.8.0':
-    resolution: {integrity: sha512-3Z3ThTUouHwz8oIyhTYQljEMNRFtlVyc3VOOHCbxs47U6cnXs8K9ygi/c1tv49s7MBlTXeIcuN+Ttd9aPtILFQ==}
+  '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.25.9':
+    resolution: {integrity: sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      enzyme: ^3.11.0
-      react: '>=18'
-      react-dom: '>=18'
+      '@babel/core': ^7.0.0
 
-  '@chromatic-com/storybook@3.2.2':
-    resolution: {integrity: sha512-xmXt/GW0hAPbzNTrxYuVo43Adrtjue4DeVrsoIIEeJdGaPNNeNf+DHMlJKOBdlHmCnFUoe9R/0mLM9zUp5bKWw==}
-    engines: {node: '>=16.0.0', yarn: '>=1.22.18'}
+  '@babel/plugin-transform-dynamic-import@7.25.9':
+    resolution: {integrity: sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0
+      '@babel/core': ^7.0.0-0
 
-  '@codemirror/autocomplete@6.16.0':
-    resolution: {integrity: sha512-P/LeCTtZHRTCU4xQsa89vSKWecYv1ZqwzOd5topheGRf+qtacFgBeIMQi3eL8Kt/BUNvxUWkx+5qP2jlGoARrg==}
+  '@babel/plugin-transform-exponentiation-operator@7.26.3':
+    resolution: {integrity: sha512-7CAHcQ58z2chuXPWblnn1K6rLDnDWieghSOEmqQsrBenH0P9InCUtOJYD89pvngljmZlJcz3fcmgYsXFNGa1ZQ==}
+    engines: {node: '>=6.9.0'}
     peerDependencies:
-      '@codemirror/language': ^6.0.0
-      '@codemirror/state': ^6.0.0
-      '@codemirror/view': ^6.0.0
-      '@lezer/common': ^1.0.0
+      '@babel/core': ^7.0.0-0
 
-  '@codemirror/commands@6.5.0':
-    resolution: {integrity: sha512-rK+sj4fCAN/QfcY9BEzYMgp4wwL/q5aj/VfNSoH1RWPF9XS/dUwBkvlL3hpWgEjOqlpdN1uLC9UkjJ4tmyjJYg==}
+  '@babel/plugin-transform-export-namespace-from@7.25.9':
+    resolution: {integrity: sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@codemirror/lang-css@6.0.1':
-    resolution: {integrity: sha512-rlLq1Dt0WJl+2epLQeAsfqIsx3lGu4HStHCJu95nGGuz2P2fNugbU3dQYafr2VRjM4eMC9HviI6jvS98CNtG5w==}
+  '@babel/plugin-transform-for-of@7.25.9':
+    resolution: {integrity: sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@codemirror/lang-javascript@6.2.2':
-    resolution: {integrity: sha512-VGQfY+FCc285AhWuwjYxQyUQcYurWlxdKYT4bqwr3Twnd5wP5WSeu52t4tvvuWmljT4EmgEgZCqSieokhtY8hg==}
+  '@babel/plugin-transform-function-name@7.25.9':
+    resolution: {integrity: sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@codemirror/lang-json@6.0.1':
-    resolution: {integrity: sha512-+T1flHdgpqDDlJZ2Lkil/rLiRy684WMLc74xUnjJH48GQdfJo/pudlTRreZmKwzP8/tGdKf83wlbAdOCzlJOGQ==}
+  '@babel/plugin-transform-json-strings@7.25.9':
+    resolution: {integrity: sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@codemirror/lang-python@6.1.6':
-    resolution: {integrity: sha512-ai+01WfZhWqM92UqjnvorkxosZ2aq2u28kHvr+N3gu012XqY2CThD67JPMHnGceRfXPDBmn1HnyqowdpF57bNg==}
+  '@babel/plugin-transform-literals@7.25.9':
+    resolution: {integrity: sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@codemirror/language@6.10.1':
-    resolution: {integrity: sha512-5GrXzrhq6k+gL5fjkAwt90nYDmjlzTIJV8THnxNFtNKWotMIlzzN+CpqxqwXOECnUdOndmSeWntVrVcv5axWRQ==}
+  '@babel/plugin-transform-logical-assignment-operators@7.25.9':
+    resolution: {integrity: sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
 
-  '@codemirror/language@6.9.3':
-    resolution: {integrity: sha512-qq48pYzoi6ldYWV/52+Z9Ou6QouVI+8YwvxFbUypI33NbjG2UeRHKENRyhwljTTiOqjQ33FjyZj6EREQ9apAOQ==}
+  '@babel/plugin-transform-member-expression-literals@7.25.9':
+    resolution: {integrity: sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-modules-amd@7.25.9':
+    resolution: {integrity: sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-modules-commonjs@7.26.3':
+    resolution: {integrity: sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-modules-systemjs@7.25.9':
+    resolution: {integrity: sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-modules-umd@7.25.9':
+    resolution: {integrity: sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-named-capturing-groups-regex@7.25.9':
+    resolution: {integrity: sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-transform-new-target@7.25.9':
+    resolution: {integrity: sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-nullish-coalescing-operator@7.25.9':
+    resolution: {integrity: sha512-ENfftpLZw5EItALAD4WsY/KUWvhUlZndm5GC7G3evUsVeSJB6p0pBeLQUnRnBCBx7zV0RKQjR9kCuwrsIrjWog==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-numeric-separator@7.25.9':
+    resolution: {integrity: sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-object-rest-spread@7.25.9':
+    resolution: {integrity: sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-object-super@7.25.9':
+    resolution: {integrity: sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-optional-catch-binding@7.25.9':
+    resolution: {integrity: sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-optional-chaining@7.25.9':
+    resolution: {integrity: sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-parameters@7.25.9':
+    resolution: {integrity: sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-private-methods@7.25.9':
+    resolution: {integrity: sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-private-property-in-object@7.25.9':
+    resolution: {integrity: sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-property-literals@7.25.9':
+    resolution: {integrity: sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-regenerator@7.25.9':
+    resolution: {integrity: sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-regexp-modifiers@7.26.0':
+    resolution: {integrity: sha512-vN6saax7lrA2yA/Pak3sCxuD6F5InBjn9IcrIKQPjpsLvuHYLVroTxjdlVRHjjBWxKOqIwpTXDkOssYT4BFdRw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-transform-reserved-words@7.25.9':
+    resolution: {integrity: sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-shorthand-properties@7.25.9':
+    resolution: {integrity: sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-spread@7.25.9':
+    resolution: {integrity: sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-sticky-regex@7.25.9':
+    resolution: {integrity: sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-template-literals@7.25.9':
+    resolution: {integrity: sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-typeof-symbol@7.25.9':
+    resolution: {integrity: sha512-v61XqUMiueJROUv66BVIOi0Fv/CUuZuZMl5NkRoCVxLAnMexZ0A3kMe7vvZ0nulxMuMp0Mk6S5hNh48yki08ZA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-unicode-escapes@7.25.9':
+    resolution: {integrity: sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-unicode-property-regex@7.25.9':
+    resolution: {integrity: sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-unicode-regex@7.25.9':
+    resolution: {integrity: sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-unicode-sets-regex@7.25.9':
+    resolution: {integrity: sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/preset-env@7.26.0':
+    resolution: {integrity: sha512-H84Fxq0CQJNdPFT2DrfnylZ3cf5K43rGfWK4LJGPpjKHiZlk0/RzwEus3PDDZZg+/Er7lCA03MVacueUuXdzfw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/preset-modules@0.1.6-no-external-plugins':
+    resolution: {integrity: sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0 || ^8.0.0-0 <8.0.0
+
+  '@babel/runtime@7.24.7':
+    resolution: {integrity: sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/template@7.24.0':
+    resolution: {integrity: sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/template@7.25.9':
+    resolution: {integrity: sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/traverse@7.24.0':
+    resolution: {integrity: sha512-HfuJlI8qq3dEDmNU5ChzzpZRWq+oxCZQyMzIMEqLho+AQnhMnKQUzH6ydo3RBl/YjPCuk68Y6s0Gx0AeyULiWw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/traverse@7.26.3':
+    resolution: {integrity: sha512-yTmc8J+Sj8yLzwr4PD5Xb/WF3bOYu2C2OoSZPzbuqRm4n98XirsbzaX+GloeO376UnSYIYJ4NCanwV5/ugZkwA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/types@7.25.6':
+    resolution: {integrity: sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/types@7.26.0':
+    resolution: {integrity: sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/types@7.26.3':
+    resolution: {integrity: sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==}
+    engines: {node: '>=6.9.0'}
+
+  '@bcoe/v8-coverage@0.2.3':
+    resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
+
+  '@biomejs/biome@1.9.0':
+    resolution: {integrity: sha512-NlWh2F1wbxB3O/wE+aohGL0BziTS6e+6+dyFvpdeqLsbQZY7EsiklFb9W5Xs41U4vEmY7ANgdNp+oVDij6sQdA==}
+    engines: {node: '>=14.21.3'}
+    hasBin: true
+
+  '@biomejs/cli-darwin-arm64@1.9.0':
+    resolution: {integrity: sha512-2w9v/NRtYSmodx5QWQ49OGcyGKSECdWKbzc7n532Iq5sBhkKk996fd19icT6BuL54f01KFKRCRibAW+A2rg1Kw==}
+    engines: {node: '>=14.21.3'}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@biomejs/cli-darwin-x64@1.9.0':
+    resolution: {integrity: sha512-fBVt8jJQi0zX0SJ1C+tdzUbRpuX/07sgtBXEhunWRkPjdi6W/2S1sYHQ1wKn4OKiRAKfHM2Cf2FNO7hQvY61dA==}
+    engines: {node: '>=14.21.3'}
+    cpu: [x64]
+    os: [darwin]
+
+  '@biomejs/cli-linux-arm64-musl@1.9.0':
+    resolution: {integrity: sha512-Jy84mZ4vcppdmWMgQWOCfd8qIVC/vHmlaS5gy7GXkdWlBKSQ56YxEXTU58MHTbZ16LwJQpK2IulqRCC/rqWLBA==}
+    engines: {node: '>=14.21.3'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@biomejs/cli-linux-arm64@1.9.0':
+    resolution: {integrity: sha512-l8U2lcqsl9yKPP5WUdIrKH//C1pWyM2cSUfcTBn6GSvXmsSjBNEdGSdM4Wfne777Oe/9ONaD1Ga53U2HksHHLw==}
+    engines: {node: '>=14.21.3'}
+    cpu: [arm64]
+    os: [linux]
+
+  '@biomejs/cli-linux-x64-musl@1.9.0':
+    resolution: {integrity: sha512-N3enoFoIrkB6qJWyYfTiYmFdB1R/Mrij1dd1xBHqxxCKZY9GRkEswRX3F1Uqzo5T+9Iu8nAQobDqI/ygicYy/Q==}
+    engines: {node: '>=14.21.3'}
+    cpu: [x64]
+    os: [linux]
+
+  '@biomejs/cli-linux-x64@1.9.0':
+    resolution: {integrity: sha512-8jAzjrrJTj510pwq4aVs7ZKkOvEy1D+nzl9DKvrPh4TOyUw5Ie+0EDwXGE2RAkCKHkGNOQBZ78WtIdsATgz5sA==}
+    engines: {node: '>=14.21.3'}
+    cpu: [x64]
+    os: [linux]
+
+  '@biomejs/cli-win32-arm64@1.9.0':
+    resolution: {integrity: sha512-AIjwJTGfdWGMRluSQ9pDB29nzce077dfHh0/HMqzztKzgD3spyuo2R9VoaFpbR0hLHPWEH6g6OxxDO7hfkXNkQ==}
+    engines: {node: '>=14.21.3'}
+    cpu: [arm64]
+    os: [win32]
+
+  '@biomejs/cli-win32-x64@1.9.0':
+    resolution: {integrity: sha512-4/4wTjNSoyNkm1SzcUaStDx46baX1VJRXtUoeEHjX9LfedR5N3qwZz5KfrRUnCd2fl5bmXK1CwMqKBkoF6zEiA==}
+    engines: {node: '>=14.21.3'}
+    cpu: [x64]
+    os: [win32]
+
+  '@cfaester/enzyme-adapter-react-18@0.8.0':
+    resolution: {integrity: sha512-3Z3ThTUouHwz8oIyhTYQljEMNRFtlVyc3VOOHCbxs47U6cnXs8K9ygi/c1tv49s7MBlTXeIcuN+Ttd9aPtILFQ==}
+    peerDependencies:
+      enzyme: ^3.11.0
+      react: '>=18'
+      react-dom: '>=18'
+
+  '@chromatic-com/storybook@3.2.2':
+    resolution: {integrity: sha512-xmXt/GW0hAPbzNTrxYuVo43Adrtjue4DeVrsoIIEeJdGaPNNeNf+DHMlJKOBdlHmCnFUoe9R/0mLM9zUp5bKWw==}
+    engines: {node: '>=16.0.0', yarn: '>=1.22.18'}
+    peerDependencies:
+      storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0
+
+  '@codemirror/autocomplete@6.16.0':
+    resolution: {integrity: sha512-P/LeCTtZHRTCU4xQsa89vSKWecYv1ZqwzOd5topheGRf+qtacFgBeIMQi3eL8Kt/BUNvxUWkx+5qP2jlGoARrg==}
+    peerDependencies:
+      '@codemirror/language': ^6.0.0
+      '@codemirror/state': ^6.0.0
+      '@codemirror/view': ^6.0.0
+      '@lezer/common': ^1.0.0
+
+  '@codemirror/commands@6.5.0':
+    resolution: {integrity: sha512-rK+sj4fCAN/QfcY9BEzYMgp4wwL/q5aj/VfNSoH1RWPF9XS/dUwBkvlL3hpWgEjOqlpdN1uLC9UkjJ4tmyjJYg==}
+
+  '@codemirror/lang-css@6.0.1':
+    resolution: {integrity: sha512-rlLq1Dt0WJl+2epLQeAsfqIsx3lGu4HStHCJu95nGGuz2P2fNugbU3dQYafr2VRjM4eMC9HviI6jvS98CNtG5w==}
+
+  '@codemirror/lang-javascript@6.2.2':
+    resolution: {integrity: sha512-VGQfY+FCc285AhWuwjYxQyUQcYurWlxdKYT4bqwr3Twnd5wP5WSeu52t4tvvuWmljT4EmgEgZCqSieokhtY8hg==}
+
+  '@codemirror/lang-json@6.0.1':
+    resolution: {integrity: sha512-+T1flHdgpqDDlJZ2Lkil/rLiRy684WMLc74xUnjJH48GQdfJo/pudlTRreZmKwzP8/tGdKf83wlbAdOCzlJOGQ==}
+
+  '@codemirror/lang-python@6.1.6':
+    resolution: {integrity: sha512-ai+01WfZhWqM92UqjnvorkxosZ2aq2u28kHvr+N3gu012XqY2CThD67JPMHnGceRfXPDBmn1HnyqowdpF57bNg==}
+
+  '@codemirror/language@6.10.1':
+    resolution: {integrity: sha512-5GrXzrhq6k+gL5fjkAwt90nYDmjlzTIJV8THnxNFtNKWotMIlzzN+CpqxqwXOECnUdOndmSeWntVrVcv5axWRQ==}
+
+  '@codemirror/language@6.9.3':
+    resolution: {integrity: sha512-qq48pYzoi6ldYWV/52+Z9Ou6QouVI+8YwvxFbUypI33NbjG2UeRHKENRyhwljTTiOqjQ33FjyZj6EREQ9apAOQ==}
 
   '@codemirror/lint@6.8.0':
     resolution: {integrity: sha512-lsFofvaw0lnPRJlQylNsC4IRt/1lI4OD/yYslrSGVndOJfStc58v+8p9dgGiD90ktOfL7OhBWns1ZETYgz0EJA==}
@@ -3850,18 +4358,244 @@ packages:
   '@one-ini/wasm@0.1.1':
     resolution: {integrity: sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==}
 
+  '@opentelemetry/api-logs@0.52.1':
+    resolution: {integrity: sha512-qnSqB2DQ9TPP96dl8cDubDvrUyWc0/sK81xHTK8eSUspzDM3bsewX903qclQFvVhgStjRWdC5bLb3kQqMkfV5A==}
+    engines: {node: '>=14'}
+
+  '@opentelemetry/api-logs@0.53.0':
+    resolution: {integrity: sha512-8HArjKx+RaAI8uEIgcORbZIPklyh1YLjPSBus8hjRmvLi6DeFzgOcdZ7KwPabKj8mXF8dX0hyfAyGfycz0DbFw==}
+    engines: {node: '>=14'}
+
+  '@opentelemetry/api-logs@0.54.2':
+    resolution: {integrity: sha512-4MTVwwmLgUh5QrJnZpYo6YRO5IBLAggf2h8gWDblwRagDStY13aEvt7gGk3jewrMaPlHiF83fENhIx0HO97/cQ==}
+    engines: {node: '>=14'}
+
   '@opentelemetry/api@1.2.0':
     resolution: {integrity: sha512-0nBr+VZNKm9tvNDZFstI3Pq1fCTEDK5OZTnVKNvBNAKgd0yIvmwsP4m61rEv7ZP+tOUjWJhROpxK5MsnlF911g==}
     engines: {node: '>=8.0.0'}
 
-  '@otplib/core@12.0.1':
-    resolution: {integrity: sha512-4sGntwbA/AC+SbPhbsziRiD+jNDdIzsZ3JUyfZwjtKyc/wufl1pnSIaG4Uqx8ymPagujub0o92kgBnB89cuAMA==}
-
-  '@otplib/plugin-crypto@12.0.1':
-    resolution: {integrity: sha512-qPuhN3QrT7ZZLcLCyKOSNhuijUi9G5guMRVrxq63r9YNOxxQjPm59gVxLM+7xGnHnM6cimY57tuKsjK7y9LM1g==}
+  '@opentelemetry/api@1.9.0':
+    resolution: {integrity: sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==}
+    engines: {node: '>=8.0.0'}
 
-  '@otplib/plugin-thirty-two@12.0.1':
-    resolution: {integrity: sha512-MtT+uqRso909UkbrrYpJ6XFjj9D+x2Py7KjTO9JDPhL0bJUYVu5kFP4TFZW4NFAywrAtFRxOVY261u0qwb93gA==}
+  '@opentelemetry/context-async-hooks@1.29.0':
+    resolution: {integrity: sha512-TKT91jcFXgHyIDF1lgJF3BHGIakn6x0Xp7Tq3zoS3TMPzT9IlP0xEavWP8C1zGjU9UmZP2VR1tJhW9Az1A3w8Q==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/core@1.26.0':
+    resolution: {integrity: sha512-1iKxXXE8415Cdv0yjG3G6hQnB5eVEsJce3QaawX8SjDn0mAS0ZM8fAbZZJD4ajvhC15cePvosSCut404KrIIvQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/core@1.29.0':
+    resolution: {integrity: sha512-gmT7vAreXl0DTHD2rVZcw3+l2g84+5XiHIqdBUxXbExymPCvSsGOpiwMmn8nkiJur28STV31wnhIDrzWDPzjfA==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/instrumentation-amqplib@0.43.0':
+    resolution: {integrity: sha512-ALjfQC+0dnIEcvNYsbZl/VLh7D2P1HhFF4vicRKHhHFIUV3Shpg4kXgiek5PLhmeKSIPiUB25IYH5RIneclL4A==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-connect@0.40.0':
+    resolution: {integrity: sha512-3aR/3YBQ160siitwwRLjwqrv2KBT16897+bo6yz8wIfel6nWOxTZBJudcbsK3p42pTC7qrbotJ9t/1wRLpv79Q==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-dataloader@0.12.0':
+    resolution: {integrity: sha512-pnPxatoFE0OXIZDQhL2okF//dmbiWFzcSc8pUg9TqofCLYZySSxDCgQc69CJBo5JnI3Gz1KP+mOjS4WAeRIH4g==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-express@0.44.0':
+    resolution: {integrity: sha512-GWgibp6Q0wxyFaaU8ERIgMMYgzcHmGrw3ILUtGchLtLncHNOKk0SNoWGqiylXWWT4HTn5XdV8MGawUgpZh80cA==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-fastify@0.41.0':
+    resolution: {integrity: sha512-pNRjFvf0mvqfJueaeL/qEkuGJwgtE5pgjIHGYwjc2rMViNCrtY9/Sf+Nu8ww6dDd/Oyk2fwZZP7i0XZfCnETrA==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-fs@0.16.0':
+    resolution: {integrity: sha512-hMDRUxV38ln1R3lNz6osj3YjlO32ykbHqVrzG7gEhGXFQfu7LJUx8t9tEwE4r2h3CD4D0Rw4YGDU4yF4mP3ilg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-generic-pool@0.39.0':
+    resolution: {integrity: sha512-y4v8Y+tSfRB3NNBvHjbjrn7rX/7sdARG7FuK6zR8PGb28CTa0kHpEGCJqvL9L8xkTNvTXo+lM36ajFGUaK1aNw==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-graphql@0.44.0':
+    resolution: {integrity: sha512-FYXTe3Bv96aNpYktqm86BFUTpjglKD0kWI5T5bxYkLUPEPvFn38vWGMJTGrDMVou/i55E4jlWvcm6hFIqLsMbg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-hapi@0.41.0':
+    resolution: {integrity: sha512-jKDrxPNXDByPlYcMdZjNPYCvw0SQJjN+B1A+QH+sx+sAHsKSAf9hwFiJSrI6C4XdOls43V/f/fkp9ITkHhKFbQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-http@0.53.0':
+    resolution: {integrity: sha512-H74ErMeDuZfj7KgYCTOFGWF5W9AfaPnqLQQxeFq85+D29wwV2yqHbz2IKLYpkOh7EI6QwDEl7rZCIxjJLyc/CQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-ioredis@0.43.0':
+    resolution: {integrity: sha512-i3Dke/LdhZbiUAEImmRG3i7Dimm/BD7t8pDDzwepSvIQ6s2X6FPia7561gw+64w+nx0+G9X14D7rEfaMEmmjig==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-kafkajs@0.4.0':
+    resolution: {integrity: sha512-I9VwDG314g7SDL4t8kD/7+1ytaDBRbZQjhVaQaVIDR8K+mlsoBhLsWH79yHxhHQKvwCSZwqXF+TiTOhoQVUt7A==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-knex@0.41.0':
+    resolution: {integrity: sha512-OhI1SlLv5qnsnm2dOVrian/x3431P75GngSpnR7c4fcVFv7prXGYu29Z6ILRWJf/NJt6fkbySmwdfUUnFnHCTg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-koa@0.43.0':
+    resolution: {integrity: sha512-lDAhSnmoTIN6ELKmLJBplXzT/Jqs5jGZehuG22EdSMaTwgjMpxMDI1YtlKEhiWPWkrz5LUsd0aOO0ZRc9vn3AQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-lru-memoizer@0.40.0':
+    resolution: {integrity: sha512-21xRwZsEdMPnROu/QsaOIODmzw59IYpGFmuC4aFWvMj6stA8+Ei1tX67nkarJttlNjoM94um0N4X26AD7ff54A==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-mongodb@0.48.0':
+    resolution: {integrity: sha512-9YWvaGvrrcrydMsYGLu0w+RgmosLMKe3kv/UNlsPy8RLnCkN2z+bhhbjjjuxtUmvEuKZMCoXFluABVuBr1yhjw==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-mongoose@0.42.0':
+    resolution: {integrity: sha512-AnWv+RaR86uG3qNEMwt3plKX1ueRM7AspfszJYVkvkehiicC3bHQA6vWdb6Zvy5HAE14RyFbu9+2hUUjR2NSyg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-mysql2@0.41.0':
+    resolution: {integrity: sha512-REQB0x+IzVTpoNgVmy5b+UnH1/mDByrneimP6sbDHkp1j8QOl1HyWOrBH/6YWR0nrbU3l825Em5PlybjT3232g==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-mysql@0.41.0':
+    resolution: {integrity: sha512-jnvrV6BsQWyHS2qb2fkfbfSb1R/lmYwqEZITwufuRl37apTopswu9izc0b1CYRp/34tUG/4k/V39PND6eyiNvw==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-nestjs-core@0.40.0':
+    resolution: {integrity: sha512-WF1hCUed07vKmf5BzEkL0wSPinqJgH7kGzOjjMAiTGacofNXjb/y4KQ8loj2sNsh5C/NN7s1zxQuCgbWbVTGKg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-pg@0.44.0':
+    resolution: {integrity: sha512-oTWVyzKqXud1BYEGX1loo2o4k4vaU1elr3vPO8NZolrBtFvQ34nx4HgUaexUDuEog00qQt+MLR5gws/p+JXMLQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-redis-4@0.42.0':
+    resolution: {integrity: sha512-NaD+t2JNcOzX/Qa7kMy68JbmoVIV37fT/fJYzLKu2Wwd+0NCxt+K2OOsOakA8GVg8lSpFdbx4V/suzZZ2Pvdjg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-tedious@0.15.0':
+    resolution: {integrity: sha512-Kb7yo8Zsq2TUwBbmwYgTAMPK0VbhoS8ikJ6Bup9KrDtCx2JC01nCb+M0VJWXt7tl0+5jARUbKWh5jRSoImxdCw==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-undici@0.6.0':
+    resolution: {integrity: sha512-ABJBhm5OdhGmbh0S/fOTE4N69IZ00CsHC5ijMYfzbw3E5NwLgpQk5xsljaECrJ8wz1SfXbO03FiSuu5AyRAkvQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.7.0
+
+  '@opentelemetry/instrumentation@0.52.1':
+    resolution: {integrity: sha512-uXJbYU/5/MBHjMp1FqrILLRuiJCs3Ofk0MeRDk8g1S1gD47U8X3JnSwcMO1rtRo1x1a7zKaQHaoYu49p/4eSKw==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation@0.53.0':
+    resolution: {integrity: sha512-DMwg0hy4wzf7K73JJtl95m/e0boSoWhH07rfvHvYzQtBD3Bmv0Wc1x733vyZBqmFm8OjJD0/pfiUg1W3JjFX0A==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation@0.54.2':
+    resolution: {integrity: sha512-go6zpOVoZVztT9r1aPd79Fr3OWiD4N24bCPJsIKkBses8oyFo12F/Ew3UBTdIu6hsW4HC4MVEJygG6TEyJI/lg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/redis-common@0.36.2':
+    resolution: {integrity: sha512-faYX1N0gpLhej/6nyp6bgRjzAKXn5GOEMYY7YhciSfCoITAktLUtQ36d24QEWNA1/WA1y6qQunCe0OhHRkVl9g==}
+    engines: {node: '>=14'}
+
+  '@opentelemetry/resources@1.29.0':
+    resolution: {integrity: sha512-s7mLXuHZE7RQr1wwweGcaRp3Q4UJJ0wazeGlc/N5/XSe6UyXfsh1UQGMADYeg7YwD+cEdMtU1yJAUXdnFzYzyQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/sdk-trace-base@1.29.0':
+    resolution: {integrity: sha512-hEOpAYLKXF3wGJpXOtWsxEtqBgde0SCv+w+jvr3/UusR4ll3QrENEGnSl1WDCyRrpqOQ5NCNOvZch9UFVa7MnQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/semantic-conventions@1.27.0':
+    resolution: {integrity: sha512-sAay1RrB+ONOem0OZanAR1ZI/k7yDpnOQSQmTMuGImUQb2y8EbSaCJ94FQluM74xoU03vlb2d2U90hZluL6nQg==}
+    engines: {node: '>=14'}
+
+  '@opentelemetry/semantic-conventions@1.28.0':
+    resolution: {integrity: sha512-lp4qAiMTD4sNWW4DbKLBkfiMZ4jbAboJIGOQr5DvciMRI494OapieI9qiODpOt0XBr1LjIDy1xAGAnVs5supTA==}
+    engines: {node: '>=14'}
+
+  '@opentelemetry/sql-common@0.40.1':
+    resolution: {integrity: sha512-nSDlnHSqzC3pXn/wZEZVLuAuJ1MYMXPBwtv2qAbCa3847SaHItdE7SzUq/Jtb0KZmh1zfAbNi3AAMjztTT4Ugg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.1.0
+
+  '@otplib/core@12.0.1':
+    resolution: {integrity: sha512-4sGntwbA/AC+SbPhbsziRiD+jNDdIzsZ3JUyfZwjtKyc/wufl1pnSIaG4Uqx8ymPagujub0o92kgBnB89cuAMA==}
+
+  '@otplib/plugin-crypto@12.0.1':
+    resolution: {integrity: sha512-qPuhN3QrT7ZZLcLCyKOSNhuijUi9G5guMRVrxq63r9YNOxxQjPm59gVxLM+7xGnHnM6cimY57tuKsjK7y9LM1g==}
+
+  '@otplib/plugin-thirty-two@12.0.1':
+    resolution: {integrity: sha512-MtT+uqRso909UkbrrYpJ6XFjj9D+x2Py7KjTO9JDPhL0bJUYVu5kFP4TFZW4NFAywrAtFRxOVY261u0qwb93gA==}
 
   '@otplib/preset-default@12.0.1':
     resolution: {integrity: sha512-xf1v9oOJRyXfluBhMdpOkr+bsE+Irt+0D5uHtvg6x1eosfmHCsCC6ej/m7FXiWqdo0+ZUI6xSKDhJwc8yfiOPQ==}
@@ -3882,6 +4616,9 @@ packages:
     resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
     engines: {node: '>=14'}
 
+  '@prisma/instrumentation@5.19.1':
+    resolution: {integrity: sha512-VLnzMQq7CWroL5AeaW0Py2huiNKeoMfCH3SUxstdzPrlWQi6UQ9UrfcbUkNHlVFqOMacqy8X/8YtE0kuKDpD9w==}
+
   '@protobufjs/aspromise@1.1.2':
     resolution: {integrity: sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==}
 
@@ -4106,42 +4843,36 @@ packages:
     resolution: {integrity: sha512-fm4coIOjmanU29NOVN9MyaP4fUCOYytbtFqVSKRFNZQ/xAgNeySiBIbUd6IjujMmnOk9bY0WEUMcdm3Uotjdog==}
     engines: {node: '>=14.18'}
 
-  '@sentry-internal/tracing@7.87.0':
-    resolution: {integrity: sha512-HYa0+rfFmYQ/DadXoiuarTSxrcnYDCd/fm0pFuOHjICtfja8IcLegVYP2/r3CgwB+IjquCtJ5kDcqS/NTgUcpA==}
-    engines: {node: '>=8'}
-
   '@sentry/browser@8.33.1':
     resolution: {integrity: sha512-c6zI/igexkLwZuGk+u8Rj26ChjxGgkhe6ZbKFsXCYaKAp5ep5X7HQRkkqgbxApiqlC0LduHdd/ymzh139JLg8w==}
     engines: {node: '>=14.18'}
 
-  '@sentry/core@7.87.0':
-    resolution: {integrity: sha512-jkoXqK/nuYh8DYS+n7uaSuSIdw4HJemyRkXsWjAEPtEgD7taGMafZGbP5pl+XE38SE59jTBxmKnkUEZOFMgZGA==}
-    engines: {node: '>=8'}
-
   '@sentry/core@8.33.1':
     resolution: {integrity: sha512-3SS41suXLFzxL3OQvTMZ6q92ZapELVq2l2SoWlZopcamWhog2Ru0dp2vkunq97kFHb2TzKRTlFH4+4gbT8SJug==}
     engines: {node: '>=14.18'}
 
-  '@sentry/integrations@7.87.0':
-    resolution: {integrity: sha512-xbyOQeyfG1sF2PBMIOz3c3i0Y3+8q4UlxoeOhpFe6Vpjek+I/g7onZT6YevT6cWG083cg+rS0VCgPQSUV2lxIw==}
-    engines: {node: '>=8'}
+  '@sentry/core@8.42.0':
+    resolution: {integrity: sha512-ac6O3pgoIbU6rpwz6LlwW0wp3/GAHuSI0C5IsTgIY6baN8rOBnlAtG6KrHDDkGmUQ2srxkDJu9n1O6Td3cBCqw==}
+    engines: {node: '>=14.18'}
 
-  '@sentry/node@7.87.0':
-    resolution: {integrity: sha512-mGcZMCL3/IMTLIRcWLF+H9z2Bb2d34gKmg2rhXqI8BqhhUA551jMRlZv/y4za2Osjy550KwVoNsA1qtEe5mYyQ==}
-    engines: {node: '>=8'}
+  '@sentry/node@8.42.0':
+    resolution: {integrity: sha512-MsNrmAIwDaxf1jTX1FsgZ+3mUq6G6IuU6FAqyp7TDnvUTsbWUtr0OM6EvVUz0zCImybIh9dcTQ+6KTmUyA7URw==}
+    engines: {node: '>=14.18'}
 
-  '@sentry/types@7.87.0':
-    resolution: {integrity: sha512-w8jKFHq/Llupmr2FezmFgQsnm3y/CnqLjb7s6PstI78E409wrhH7p7oqX/OEuzccH1qNCNwes/3QKvPTRQDB4Q==}
-    engines: {node: '>=8'}
+  '@sentry/opentelemetry@8.42.0':
+    resolution: {integrity: sha512-QPb9kMFgl35TIwIz0u+BFTbPG461CofMiloidJ44GFZ9cB33T5cB0oIN7ut/5tsH/AvqUmucydsV/Nj3HNQx9g==}
+    engines: {node: '>=14.18'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.9.0
+      '@opentelemetry/core': ^1.25.1
+      '@opentelemetry/instrumentation': ^0.54.0
+      '@opentelemetry/sdk-trace-base': ^1.26.0
+      '@opentelemetry/semantic-conventions': ^1.27.0
 
   '@sentry/types@8.33.1':
     resolution: {integrity: sha512-GjoAMvwtpIemoF/IiwZ7A60g4nQv3qwzR21GvJqDVUoKD0e8pv9OLX+HyXoUat4wEDGSuDUcUyUKD2G+od73QA==}
     engines: {node: '>=14.18'}
 
-  '@sentry/utils@7.87.0':
-    resolution: {integrity: sha512-7xgtPTnTNP/4IznFMFXxltuaXfLvzznrYCDMv9ny8EeUjJqlLX3CVA8Qq3YALsLCQCKcrGRARbAcd/EGG//w2w==}
-    engines: {node: '>=8'}
-
   '@sentry/utils@8.33.1':
     resolution: {integrity: sha512-uzuYpiiJuFY3N4WNHMBWUQX5oNv2t/TbG0OHRp3Rr7yeu+HSfD542TIp9/gMZ+G0Cxd8AmVO3wkKIFbk0TL4Qg==}
     engines: {node: '>=14.18'}
@@ -4709,6 +5440,10 @@ packages:
     resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==}
     engines: {node: '>= 10'}
 
+  '@trysound/sax@0.2.0':
+    resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
+    engines: {node: '>=10.13.0'}
+
   '@tsconfig/node10@1.0.11':
     resolution: {integrity: sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==}
 
@@ -4775,6 +5510,9 @@ packages:
   '@types/connect@3.4.35':
     resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==}
 
+  '@types/connect@3.4.36':
+    resolution: {integrity: sha512-P63Zd/JUGq+PdrM1lv0Wv5SBYeA2+CORvbrXbngriYY0jzLUWfQMQQxOhjONEz/wlHOAxOdY7CY65rgQdTjq2w==}
+
   '@types/convict@6.1.1':
     resolution: {integrity: sha512-R+JLaTvhsD06p4jyjUDtbd5xMtZTRE3c0iI+lrFWZogSVEjgTWPYwvJPVf+t92E+yrlbXa4X4Eg9ro6gPdUt4w==}
 
@@ -4955,6 +5693,9 @@ packages:
   '@types/multer@1.4.12':
     resolution: {integrity: sha512-pQ2hoqvXiJt2FP9WQVLPRO+AmiIm/ZYkavPlIQnx282u4ZrVdztx0pkh3jjpQt0Kz+YI0YhSG264y08UJKoUQg==}
 
+  '@types/mysql@2.15.26':
+    resolution: {integrity: sha512-DSLCOXhkvfS5WNNPbfn2KdICAmk8lLc+/PNvnPnF7gOdMZCxopXduqv0OQ13y/yA/zXTSikZZqVgybUxOEg6YQ==}
+
   '@types/node-fetch@2.6.4':
     resolution: {integrity: sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg==}
 
@@ -4967,9 +5708,15 @@ packages:
   '@types/normalize-package-data@2.4.1':
     resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==}
 
+  '@types/pg-pool@2.0.6':
+    resolution: {integrity: sha512-TaAUE5rq2VQYxab5Ts7WZhKNmuN78Q6PiFonTDdpbx8a1H0M1vhy3rhiMjl+e2iHmogyMw7jZF4FrE6eJUy5HQ==}
+
   '@types/pg@8.11.6':
     resolution: {integrity: sha512-/2WmmBXHLsfRqzfHW7BNZ8SbYzE8OSk7i3WjFYvfgRHj7S1xj+16Je5fUKv3lVdVzk/zn9TXOqf+avFCFIE0yQ==}
 
+  '@types/pg@8.6.1':
+    resolution: {integrity: sha512-1Kc4oAGzAl7uqUStZCDvaLFqZrW9qWSjXOmBfdgyBP5La7Us6Mg4GBvRlSoaZMhQF/zSj1C8CtKMBkoiT8eL8w==}
+
   '@types/phoenix@1.6.4':
     resolution: {integrity: sha512-B34A7uot1Cv0XtaHRYDATltAdKx0BvVKNgYNqE4WjtPUa4VQJM7kxeXcVKaH+KS+kCmZ+6w+QaUdcljiheiBJA==}
 
@@ -5033,6 +5780,9 @@ packages:
   '@types/shelljs@0.8.11':
     resolution: {integrity: sha512-x9yaMvEh5BEaZKeVQC4vp3l+QoFj3BXcd4aYfuKSzIIyihjdVARAadYy3SMNIz0WCCdS2vB9JL/U6GQk5PaxQw==}
 
+  '@types/shimmer@1.2.0':
+    resolution: {integrity: sha512-UE7oxhQLLd9gub6JKIAhDq06T0F6FnztwMNRvYgjeQSBeMc1ZG/tA47EwfduvkuQS8apbkM/lpLpWsaCeYsXVg==}
+
   '@types/showdown@1.9.4':
     resolution: {integrity: sha512-50ehC3IAijfkvoNqmQ+VL73S7orOxmAK8ljQAFBv8o7G66lAZyxQj1L3BAv2dD86myLXI+sgKP1kcxAaxW356w==}
 
@@ -5072,6 +5822,9 @@ packages:
   '@types/syslog-client@1.1.2':
     resolution: {integrity: sha512-X8MwGedXYNmYltPDaZQCM9X6cSdfFbJZWhrU81gWKsg+Q6mSgRWs/12Mq9nHaUV4wqMYDNrnytbwbMUiVnWegw==}
 
+  '@types/tedious@4.0.14':
+    resolution: {integrity: sha512-KHPsfX/FoVbUGbyYvk1q9MMQHLPeRZhRJZdO45Q4YjvFkv4hMNghCWTvy7rdKessBsmtz4euWCWAB6/tVpI1Iw==}
+
   '@types/tedious@4.0.9':
     resolution: {integrity: sha512-ipwFvfy9b2m0gjHsIX0D6NAAwGCKokzf5zJqUZHUGt+7uWVlBIy6n2eyMgiKQ8ChLFVxic/zwQUhjLYNzbHDRA==}
 
@@ -5232,6 +5985,13 @@ packages:
   '@ungap/structured-clone@1.2.0':
     resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
 
+  '@vitejs/plugin-legacy@6.0.0':
+    resolution: {integrity: sha512-pWt9cWaGJAKYw+67VLpN8hSP+G+yAQnrf5Pqh/NzSDKFl/4KpxTtwb5OLQezHoZOxghahO/ha3IpvblBbX/t6A==}
+    engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
+    peerDependencies:
+      terser: ^5.16.0
+      vite: ^6.0.0
+
   '@vitejs/plugin-vue@5.2.1':
     resolution: {integrity: sha512-cxh314tzaWwOLqVes2gnnCtvBDcM1UMdn+iFR+UjAn411dPT3tOmqrJjbMd7koZpMAmBM/GqeV4n9ge7JSiJJQ==}
     engines: {node: ^18.0.0 || >=20.0.0}
@@ -5298,8 +6058,8 @@ packages:
   '@volar/typescript@2.4.10':
     resolution: {integrity: sha512-F8ZtBMhSXyYKuBfGpYwqA5rsONnOwAVvjyE7KPYJ7wgZqo2roASqNWUnianOomJX5u1cxeRooHV59N0PhvEOgw==}
 
-  '@vue-flow/background@1.3.1':
-    resolution: {integrity: sha512-8q0lTbvA3A9s0bDnpUIHMZj/HUTdMa3ChGSAw7EBaTKy7qJB21EnKbTIgC2lYweprzxk94vop4YmGfUO1jiqqQ==}
+  '@vue-flow/background@1.3.2':
+    resolution: {integrity: sha512-eJPhDcLj1wEo45bBoqTXw1uhl0yK2RaQGnEINqvvBsAFKh/camHJd5NPmOdS1w+M9lggc9igUewxaEd3iCQX2w==}
     peerDependencies:
       '@vue-flow/core': ^1.23.0
       vue: ^3.3.0
@@ -5310,8 +6070,8 @@ packages:
       '@vue-flow/core': ^1.23.0
       vue: ^3.3.0
 
-  '@vue-flow/core@1.41.4':
-    resolution: {integrity: sha512-OEGI+56DSJ/00fm9SjWgGXtgKJO3Un2/tOEKlCTvL13567VBtdtvNci7f9+6upaR9Eu3oFgbEsF1NiyoQjvB9A==}
+  '@vue-flow/core@1.41.6':
+    resolution: {integrity: sha512-8zxcGRqiudra0obDMLTg9L89WxdlV0QrDOdyPYOKWDcD/UK5aT0MIL3Br9TF9AJmHW2z8QZq4cmmgroREL0jgQ==}
     peerDependencies:
       vue: ^3.3.0
 
@@ -5450,6 +6210,11 @@ packages:
   acorn-globals@7.0.1:
     resolution: {integrity: sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==}
 
+  acorn-import-attributes@1.9.5:
+    resolution: {integrity: sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==}
+    peerDependencies:
+      acorn: ^8
+
   acorn-jsx@5.3.2:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -5794,6 +6559,21 @@ packages:
     resolution: {integrity: sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
+  babel-plugin-polyfill-corejs2@0.4.12:
+    resolution: {integrity: sha512-CPWT6BwvhrTO2d8QVorhTCQw9Y43zOu7G9HigcfxvepOU6b8o3tcWad6oVgZIsZCTt42FFv97aA7ZJsbM4+8og==}
+    peerDependencies:
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
+
+  babel-plugin-polyfill-corejs3@0.10.6:
+    resolution: {integrity: sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA==}
+    peerDependencies:
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
+
+  babel-plugin-polyfill-regenerator@0.6.3:
+    resolution: {integrity: sha512-LiWSbl4CRSIa5x/JAU6jZiG9eit9w6mz+yVMFwDE83LAWvt0AfGBoZ7HS/mkhrKuh2ZlzfVZYKoLjXdqw6Yt7Q==}
+    peerDependencies:
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
+
   babel-preset-current-node-syntax@1.0.1:
     resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==}
     peerDependencies:
@@ -5903,11 +6683,23 @@ packages:
     resolution: {integrity: sha512-YyNI4qJJ+piQG6MMEuo7J3Bzaqssufx04zpEKYfSrl/1Op59HWali9zMtBpXnkmqMcOuWJPZvudrm9wISmnCbg==}
     engines: {'0': node}
 
+  browserslist-to-esbuild@2.1.1:
+    resolution: {integrity: sha512-KN+mty6C3e9AN8Z5dI1xeN15ExcRNeISoC3g7V0Kax/MMF9MSoYA2G7lkTTcVUFntiEjkpI0HNgqJC1NjdyNUw==}
+    engines: {node: '>=18'}
+    hasBin: true
+    peerDependencies:
+      browserslist: '*'
+
   browserslist@4.23.0:
     resolution: {integrity: sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==}
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
     hasBin: true
 
+  browserslist@4.24.2:
+    resolution: {integrity: sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==}
+    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
+    hasBin: true
+
   bs-logger@0.2.6:
     resolution: {integrity: sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==}
     engines: {node: '>= 6'}
@@ -6015,6 +6807,9 @@ packages:
   caniuse-lite@1.0.30001667:
     resolution: {integrity: sha512-7LTwJjcRkzKFmtqGsibMeuXmvFDfZq/nzIjnmgCGzKKRVzjD72selLDK1oPF/Oxzmt4fNcPvTDvGqSDG4tCALw==}
 
+  caniuse-lite@1.0.30001677:
+    resolution: {integrity: sha512-fmfjsOlJUpMWu+mAAtZZZHz7UEwsUxIIvu1TJfO1HqFQvB/B+ii0xr9B5HpbZY/mC4XZ8SvjHJqtAY6pDPQEog==}
+
   capital-case@1.0.4:
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
 
@@ -6053,6 +6848,9 @@ packages:
   chardet@0.7.0:
     resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==}
 
+  chardet@2.0.0:
+    resolution: {integrity: sha512-xVgPpulCooDjY6zH4m9YW3jbkaBe3FKIAvF5sj5t7aBNsVl2ljIE+xwJ4iNgiDZHFQvNIpjdKdVOQvvk5ZfxbQ==}
+
   charenc@0.0.2:
     resolution: {integrity: sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==}
 
@@ -6256,6 +7054,10 @@ packages:
     resolution: {integrity: sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==}
     engines: {node: '>= 6'}
 
+  commander@7.2.0:
+    resolution: {integrity: sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==}
+    engines: {node: '>= 10'}
+
   commander@9.4.1:
     resolution: {integrity: sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==}
     engines: {node: ^12.20.0 || >=14}
@@ -6364,9 +7166,15 @@ packages:
   core-js-compat@3.36.0:
     resolution: {integrity: sha512-iV9Pd/PsgjNWBXeq8XRtWVSgz2tKAfhfvBs7qxYty+RlRd+OCksaWmOnc4JKrTc1cToXL1N0s3l/vwlxPtdElw==}
 
+  core-js-compat@3.39.0:
+    resolution: {integrity: sha512-VgEUx3VwlExr5no0tXlBt+silBvhTryPwCXRI2Id1PN8WTKu7MreethvddqOubrYxkFdv/RnYrqlv1sFNAUelw==}
+
   core-js@3.35.0:
     resolution: {integrity: sha512-ntakECeqg81KqMueeGJ79Q5ZgQNR+6eaE8sxGCx62zMbAIj65q+uYvatToew3m6eAGdU4gNZwpZ34NMe4GYswg==}
 
+  core-js@3.39.0:
+    resolution: {integrity: sha512-raM0ew0/jJUqkJ0E6e8UDtl+y/7ktFivgWvqw8dNSQeNWoSDLvQ1H/RN3aPXB9tBd4/FhyR4RDPGhsNIMsAn7g==}
+
   core-util-is@1.0.2:
     resolution: {integrity: sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==}
 
@@ -6431,6 +7239,14 @@ packages:
   css-to-react-native@3.2.0:
     resolution: {integrity: sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==}
 
+  css-tree@2.2.1:
+    resolution: {integrity: sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==}
+    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0, npm: '>=7.0.0'}
+
+  css-tree@2.3.1:
+    resolution: {integrity: sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==}
+    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0}
+
   css-what@6.1.0:
     resolution: {integrity: sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==}
     engines: {node: '>= 6'}
@@ -6446,6 +7262,10 @@ packages:
   cssfilter@0.0.10:
     resolution: {integrity: sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw==}
 
+  csso@5.0.5:
+    resolution: {integrity: sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==}
+    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0, npm: '>=7.0.0'}
+
   cssom@0.3.8:
     resolution: {integrity: sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==}
 
@@ -6869,6 +7689,9 @@ packages:
   electron-to-chromium@1.4.703:
     resolution: {integrity: sha512-094ZZC4nHXPKl/OwPinSMtLN9+hoFkdfQGKnvXbY+3WEAYtVDpz9UhJIViiY6Zb8agvqxiaJzNG9M+pRZWvSZw==}
 
+  electron-to-chromium@1.5.51:
+    resolution: {integrity: sha512-kKeWV57KSS8jH4alKt/jKnvHPmJgBxXzGUSbMd4eQF+iOsVPl7bz2KUmu6eo80eMP8wVioTfTyTzdMgM15WXNg==}
+
   element-plus@2.4.3:
     resolution: {integrity: sha512-b3q26j+lM4SBqiyzw8HybybGnP2pk4MWgrnzzzYW5qKQUgV6EG1Zg7nMCfgCVccI8tNvZoTiUHb2mFaiB9qT8w==}
     peerDependencies:
@@ -7023,6 +7846,10 @@ packages:
     resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
     engines: {node: '>=6'}
 
+  escalade@3.2.0:
+    resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==}
+    engines: {node: '>=6'}
+
   escape-goat@3.0.0:
     resolution: {integrity: sha512-w3PwNZJwRxlp47QGzhuEBldEqVHHhh8/tIPcl6ecf2Bou99cdAt0knihBV0Ecc7CGxYduXVBDheH1K2oADRlvw==}
     engines: {node: '>=10'}
@@ -7977,6 +8804,9 @@ packages:
     resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
     engines: {node: '>=6'}
 
+  import-in-the-middle@1.11.3:
+    resolution: {integrity: sha512-tNpKEb4AjZrCyrxi+Eyu43h5ig0O8ZRFSXPHh/00/o+4P4pKzVEW/m5lsVtsAT7fCIgmQOAPjdqecGDsBXRxsw==}
+
   import-lazy@4.0.0:
     resolution: {integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==}
     engines: {node: '>=8'}
@@ -8810,9 +9640,6 @@ packages:
   libqp@2.0.1:
     resolution: {integrity: sha512-Ka0eC5LkF3IPNQHJmYBWljJsw0UvM6j+QdKRbWyCdTmYwvIDE6a7bCm0UkTAL/K+3KXK5qXT/ClcInU01OpdLg==}
 
-  lie@3.1.1:
-    resolution: {integrity: sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==}
-
   lie@3.3.0:
     resolution: {integrity: sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==}
 
@@ -8846,9 +9673,6 @@ packages:
     resolution: {integrity: sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==}
     engines: {node: '>=14'}
 
-  localforage@1.10.0:
-    resolution: {integrity: sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==}
-
   locate-path@5.0.0:
     resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
     engines: {node: '>=8'}
@@ -8873,6 +9697,9 @@ packages:
   lodash.clonedeep@4.5.0:
     resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
 
+  lodash.debounce@4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+
   lodash.defaults@4.2.0:
     resolution: {integrity: sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==}
 
@@ -9008,9 +9835,6 @@ packages:
   magic-string@0.30.10:
     resolution: {integrity: sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==}
 
-  magic-string@0.30.11:
-    resolution: {integrity: sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==}
-
   magic-string@0.30.14:
     resolution: {integrity: sha512-5c99P1WKTed11ZC0HMJOj6CDIue6F8ySu+bJL+85q1zBEIY8IklrJ1eiKC2NDRh3Ct3FcvmJPyQHb9erXMTJNw==}
 
@@ -9079,6 +9903,12 @@ packages:
   md5@2.3.0:
     resolution: {integrity: sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==}
 
+  mdn-data@2.0.28:
+    resolution: {integrity: sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==}
+
+  mdn-data@2.0.30:
+    resolution: {integrity: sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==}
+
   mdurl@1.0.1:
     resolution: {integrity: sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==}
 
@@ -9102,6 +9932,10 @@ packages:
   mensch@0.3.4:
     resolution: {integrity: sha512-IAeFvcOnV9V0Yk+bFhYR07O3yNina9ANIN5MoXBKYJ/RLYPurd2d0yw14MDhpr9/momp0WofT1bPUh3hkzdi/g==}
 
+  meow@13.2.0:
+    resolution: {integrity: sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA==}
+    engines: {node: '>=18'}
+
   merge-descriptors@1.0.3:
     resolution: {integrity: sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==}
 
@@ -9380,6 +10214,9 @@ packages:
   mobx@6.12.0:
     resolution: {integrity: sha512-Mn6CN6meXEnMa0a5u6a5+RKrqRedHBhZGd15AWLk9O6uFY4KYHzImdt8JI8WODo1bjTSRnwXhJox+FCUZhCKCQ==}
 
+  module-details-from-path@1.0.3:
+    resolution: {integrity: sha512-ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A==}
+
   moment-timezone@0.5.37:
     resolution: {integrity: sha512-uEDzDNFhfaywRl+vwXxffjjq1q0Vzr+fcQpQ1bU0kbzorfS7zVtZnCnGc8mhWmF39d4g4YriF6kwA75mJKE/Zg==}
 
@@ -9483,13 +10320,8 @@ packages:
   nanoclone@0.2.1:
     resolution: {integrity: sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==}
 
-  nanoid@3.3.6:
-    resolution: {integrity: sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==}
-    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
-    hasBin: true
-
-  nanoid@3.3.7:
-    resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==}
+  nanoid@3.3.8:
+    resolution: {integrity: sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
@@ -9598,6 +10430,9 @@ packages:
   node-releases@2.0.14:
     resolution: {integrity: sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==}
 
+  node-releases@2.0.18:
+    resolution: {integrity: sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==}
+
   node-rsa@1.1.1:
     resolution: {integrity: sha512-Jd4cvbJMryN21r5HgxQOpMEqv+ooke/korixNNK3mGqfGJmy0M77WDDzo/05969+OkMy3XW1UuZsSmW9KQm7Fw==}
 
@@ -10566,9 +11401,19 @@ packages:
   reftools@1.1.9:
     resolution: {integrity: sha512-OVede/NQE13xBQ+ob5CKd5KyeJYU2YInb1bmV4nRoOfquZPkAkxuOXicSe1PvqIuZZ4kD13sPKBbR7UFDmli6w==}
 
+  regenerate-unicode-properties@10.2.0:
+    resolution: {integrity: sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==}
+    engines: {node: '>=4'}
+
+  regenerate@1.4.2:
+    resolution: {integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==}
+
   regenerator-runtime@0.14.1:
     resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==}
 
+  regenerator-transform@0.15.2:
+    resolution: {integrity: sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==}
+
   regexp-tree@0.1.27:
     resolution: {integrity: sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==}
     hasBin: true
@@ -10585,10 +11430,21 @@ packages:
     resolution: {integrity: sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==}
     engines: {node: '>= 0.4'}
 
+  regexpu-core@6.2.0:
+    resolution: {integrity: sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==}
+    engines: {node: '>=4'}
+
+  regjsgen@0.8.0:
+    resolution: {integrity: sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==}
+
   regjsparser@0.10.0:
     resolution: {integrity: sha512-qx+xQGZVsy55CH0a1hiVwHmqjLryfh7wQyF5HO07XJ9f7dQMY/gPQHhlyDkIzJKC+x2fUCpCcUODUUUFrm7SHA==}
     hasBin: true
 
+  regjsparser@0.12.0:
+    resolution: {integrity: sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==}
+    hasBin: true
+
   reinterval@1.1.0:
     resolution: {integrity: sha512-QIRet3SYrGp0HUHO88jVskiG6seqUGC5iAG7AwI/BV4ypGcuqk9Du6YQBUOUqm9c8pw1eyLoIaONifRua1lsEQ==}
 
@@ -10618,6 +11474,10 @@ packages:
     resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
     engines: {node: '>=0.10.0'}
 
+  require-in-the-middle@7.4.0:
+    resolution: {integrity: sha512-X34iHADNbNDfr6OTStIAHWSAvvKQRYgLO6duASaVf7J2VA3lvmNYboAHOuLC2huav1IwgZJtyEcJCKVzFxOSMQ==}
+    engines: {node: '>=8.6.0'}
+
   requires-port@1.0.0:
     resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
 
@@ -10874,6 +11734,9 @@ packages:
     engines: {node: '>=4'}
     hasBin: true
 
+  shimmer@1.2.1:
+    resolution: {integrity: sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==}
+
   should-equal@2.0.0:
     resolution: {integrity: sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==}
 
@@ -10977,6 +11840,9 @@ packages:
     resolution: {integrity: sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==}
     engines: {node: '>= 10.0.0', npm: '>= 3.0.0'}
 
+  sortablejs@1.14.0:
+    resolution: {integrity: sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==}
+
   source-map-js@1.2.0:
     resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==}
     engines: {node: '>=0.10.0'}
@@ -11278,6 +12144,11 @@ packages:
     resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
     engines: {node: '>= 0.4'}
 
+  svgo@3.3.2:
+    resolution: {integrity: sha512-OoohrmuUlBs8B8o6MB2Aevn+pRIH9zDALSR+6hhqVfa6fRwG/Qw9VUMSMW9VNg2CFc/MTIfabtdOVl9ODIJjpw==}
+    engines: {node: '>=14.0.0'}
+    hasBin: true
+
   swagger-ui-dist@5.11.0:
     resolution: {integrity: sha512-j0PIATqQSEFGOLmiJOJZj1X1Jt6bFIur3JpY7+ghliUnfZs0fpWDdHEkn9q7QUlBtKbkn6TepvSxTqnE8l3s0A==}
 
@@ -11297,6 +12168,9 @@ packages:
   syslog-client@1.1.1:
     resolution: {integrity: sha512-c3qKw8JzCuHt0mwrzKQr8eqOc3RB28HgOpFuwGMO3GLscVpfR+0ECevWLZq/yIJTbx3WTb3QXBFVpTFtKAPDrw==}
 
+  systemjs@6.15.1:
+    resolution: {integrity: sha512-Nk8c4lXvMB98MtbmjX7JwJRgJOL8fluecYCfCeYBznwmpOs8Bf15hLM6z4z71EDAhQVrQrI+wt1aLWSXZq+hXA==}
+
   tailwindcss@3.4.3:
     resolution: {integrity: sha512-U7sxQk/n397Bmx4JHbJx/iSOOv5G+II3f1kpLpY2QeUv5DcPdcTsYLlusZfq1NthHS1c1cZoyFmmkex1rzke0A==}
     engines: {node: '>=14.0.0'}
@@ -11769,6 +12643,22 @@ packages:
     resolution: {integrity: sha512-HR3W/bMGPSr90i8AAp2C4DM3wChFdJPLrWYpIS++LxS8K+W535qftjt+4MyjNYHeWabMj1nvtmLIi7l++iq91A==}
     engines: {node: '>=18.17'}
 
+  unicode-canonical-property-names-ecmascript@2.0.1:
+    resolution: {integrity: sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==}
+    engines: {node: '>=4'}
+
+  unicode-match-property-ecmascript@2.0.0:
+    resolution: {integrity: sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==}
+    engines: {node: '>=4'}
+
+  unicode-match-property-value-ecmascript@2.2.0:
+    resolution: {integrity: sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==}
+    engines: {node: '>=4'}
+
+  unicode-property-aliases-ecmascript@2.1.0:
+    resolution: {integrity: sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==}
+    engines: {node: '>=4'}
+
   unique-filename@1.1.1:
     resolution: {integrity: sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==}
 
@@ -11838,6 +12728,12 @@ packages:
     peerDependencies:
       browserslist: '>= 4.21.0'
 
+  update-browserslist-db@1.1.1:
+    resolution: {integrity: sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==}
+    hasBin: true
+    peerDependencies:
+      browserslist: '>= 4.21.0'
+
   upper-case-first@2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
 
@@ -11949,6 +12845,11 @@ packages:
       vite:
         optional: true
 
+  vite-svg-loader@5.1.0:
+    resolution: {integrity: sha512-M/wqwtOEjgb956/+m5ZrYT/Iq6Hax0OakWbokj8+9PXOnB7b/4AxESHieEtnNEy7ZpjsjYW1/5nK8fATQMmRxw==}
+    peerDependencies:
+      vue: '>=3.2.13'
+
   vite@5.4.11:
     resolution: {integrity: sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==}
     engines: {node: ^18.0.0 || >=20.0.0}
@@ -12167,6 +13068,11 @@ packages:
       typescript:
         optional: true
 
+  vuedraggable@4.1.0:
+    resolution: {integrity: sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==}
+    peerDependencies:
+      vue: ^3.0.1
+
   w3c-keyname@2.2.6:
     resolution: {integrity: sha512-f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg==}
 
@@ -13544,8 +14450,16 @@ snapshots:
       '@babel/highlight': 7.24.6
       picocolors: 1.0.1
 
+  '@babel/code-frame@7.26.2':
+    dependencies:
+      '@babel/helper-validator-identifier': 7.25.9
+      js-tokens: 4.0.0
+      picocolors: 1.0.1
+
   '@babel/compat-data@7.23.5': {}
 
+  '@babel/compat-data@7.26.3': {}
+
   '@babel/core@7.24.0':
     dependencies:
       '@ampproject/remapping': 2.3.0
@@ -13554,10 +14468,30 @@ snapshots:
       '@babel/helper-compilation-targets': 7.23.6
       '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.0)
       '@babel/helpers': 7.24.0
-      '@babel/parser': 7.25.6
+      '@babel/parser': 7.26.2
       '@babel/template': 7.24.0
       '@babel/traverse': 7.24.0
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.0
+      convert-source-map: 2.0.0
+      debug: 4.3.7
+      gensync: 1.0.0-beta.2
+      json5: 2.2.3
+      semver: 7.6.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/core@7.26.0':
+    dependencies:
+      '@ampproject/remapping': 2.3.0
+      '@babel/code-frame': 7.26.2
+      '@babel/generator': 7.26.3
+      '@babel/helper-compilation-targets': 7.25.9
+      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0)
+      '@babel/helpers': 7.26.0
+      '@babel/parser': 7.26.2
+      '@babel/template': 7.25.9
+      '@babel/traverse': 7.26.3
+      '@babel/types': 7.26.0
       convert-source-map: 2.0.0
       debug: 4.3.7
       gensync: 1.0.0-beta.2
@@ -13568,40 +14502,105 @@ snapshots:
 
   '@babel/generator@7.22.9':
     dependencies:
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.0
       '@jridgewell/gen-mapping': 0.3.5
       '@jridgewell/trace-mapping': 0.3.25
       jsesc: 2.5.2
 
   '@babel/generator@7.23.6':
     dependencies:
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.0
       '@jridgewell/gen-mapping': 0.3.5
       '@jridgewell/trace-mapping': 0.3.25
       jsesc: 2.5.2
 
+  '@babel/generator@7.26.3':
+    dependencies:
+      '@babel/parser': 7.26.3
+      '@babel/types': 7.26.3
+      '@jridgewell/gen-mapping': 0.3.5
+      '@jridgewell/trace-mapping': 0.3.25
+      jsesc: 3.0.2
+
+  '@babel/helper-annotate-as-pure@7.25.9':
+    dependencies:
+      '@babel/types': 7.26.0
+
   '@babel/helper-compilation-targets@7.23.6':
     dependencies:
       '@babel/compat-data': 7.23.5
       '@babel/helper-validator-option': 7.23.5
-      browserslist: 4.23.0
+      browserslist: 4.24.2
       lru-cache: 5.1.1
       semver: 7.6.0
 
+  '@babel/helper-compilation-targets@7.25.9':
+    dependencies:
+      '@babel/compat-data': 7.26.3
+      '@babel/helper-validator-option': 7.25.9
+      browserslist: 4.24.2
+      lru-cache: 5.1.1
+      semver: 7.6.0
+
+  '@babel/helper-create-class-features-plugin@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-annotate-as-pure': 7.25.9
+      '@babel/helper-member-expression-to-functions': 7.25.9
+      '@babel/helper-optimise-call-expression': 7.25.9
+      '@babel/helper-replace-supers': 7.25.9(@babel/core@7.26.0)
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+      '@babel/traverse': 7.26.3
+      semver: 7.6.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-create-regexp-features-plugin@7.26.3(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-annotate-as-pure': 7.25.9
+      regexpu-core: 6.2.0
+      semver: 7.6.0
+
+  '@babel/helper-define-polyfill-provider@0.6.3(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-compilation-targets': 7.25.9
+      '@babel/helper-plugin-utils': 7.25.9
+      debug: 4.3.7
+      lodash.debounce: 4.0.8
+      resolve: 1.22.8
+    transitivePeerDependencies:
+      - supports-color
+
   '@babel/helper-environment-visitor@7.22.20': {}
 
   '@babel/helper-function-name@7.23.0':
     dependencies:
       '@babel/template': 7.24.0
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.0
 
   '@babel/helper-hoist-variables@7.22.5':
     dependencies:
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.0
+
+  '@babel/helper-member-expression-to-functions@7.25.9':
+    dependencies:
+      '@babel/traverse': 7.26.3
+      '@babel/types': 7.26.0
+    transitivePeerDependencies:
+      - supports-color
 
   '@babel/helper-module-imports@7.22.15':
     dependencies:
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.0
+
+  '@babel/helper-module-imports@7.25.9':
+    dependencies:
+      '@babel/traverse': 7.26.3
+      '@babel/types': 7.26.0
+    transitivePeerDependencies:
+      - supports-color
 
   '@babel/helper-module-transforms@7.23.3(@babel/core@7.24.0)':
     dependencies:
@@ -13610,34 +14609,93 @@ snapshots:
       '@babel/helper-module-imports': 7.22.15
       '@babel/helper-simple-access': 7.22.5
       '@babel/helper-split-export-declaration': 7.22.6
-      '@babel/helper-validator-identifier': 7.24.7
+      '@babel/helper-validator-identifier': 7.25.9
+
+  '@babel/helper-module-transforms@7.26.0(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-module-imports': 7.25.9
+      '@babel/helper-validator-identifier': 7.25.9
+      '@babel/traverse': 7.26.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-optimise-call-expression@7.25.9':
+    dependencies:
+      '@babel/types': 7.26.0
 
   '@babel/helper-plugin-utils@7.22.5': {}
 
+  '@babel/helper-plugin-utils@7.25.9': {}
+
+  '@babel/helper-remap-async-to-generator@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-annotate-as-pure': 7.25.9
+      '@babel/helper-wrap-function': 7.25.9
+      '@babel/traverse': 7.26.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-replace-supers@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-member-expression-to-functions': 7.25.9
+      '@babel/helper-optimise-call-expression': 7.25.9
+      '@babel/traverse': 7.26.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@babel/helper-simple-access@7.22.5':
     dependencies:
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.0
+
+  '@babel/helper-skip-transparent-expression-wrappers@7.25.9':
+    dependencies:
+      '@babel/traverse': 7.26.3
+      '@babel/types': 7.26.0
+    transitivePeerDependencies:
+      - supports-color
 
   '@babel/helper-split-export-declaration@7.22.6':
     dependencies:
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.0
 
   '@babel/helper-string-parser@7.24.8': {}
 
+  '@babel/helper-string-parser@7.25.9': {}
+
   '@babel/helper-validator-identifier@7.22.20': {}
 
   '@babel/helper-validator-identifier@7.24.7': {}
 
+  '@babel/helper-validator-identifier@7.25.9': {}
+
   '@babel/helper-validator-option@7.23.5': {}
 
+  '@babel/helper-validator-option@7.25.9': {}
+
+  '@babel/helper-wrap-function@7.25.9':
+    dependencies:
+      '@babel/template': 7.25.9
+      '@babel/traverse': 7.26.3
+      '@babel/types': 7.26.0
+    transitivePeerDependencies:
+      - supports-color
+
   '@babel/helpers@7.24.0':
     dependencies:
       '@babel/template': 7.24.0
       '@babel/traverse': 7.24.0
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.0
     transitivePeerDependencies:
       - supports-color
 
+  '@babel/helpers@7.26.0':
+    dependencies:
+      '@babel/template': 7.25.9
+      '@babel/types': 7.26.0
+
   '@babel/highlight@7.24.6':
     dependencies:
       '@babel/helper-validator-identifier': 7.24.7
@@ -13649,6 +14707,53 @@ snapshots:
     dependencies:
       '@babel/types': 7.25.6
 
+  '@babel/parser@7.26.2':
+    dependencies:
+      '@babel/types': 7.26.0
+
+  '@babel/parser@7.26.3':
+    dependencies:
+      '@babel/types': 7.26.3
+
+  '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/traverse': 7.26.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+      '@babel/plugin-transform-optional-chaining': 7.25.9(@babel/core@7.26.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/traverse': 7.26.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+
   '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.24.0)':
     dependencies:
       '@babel/core': 7.24.0
@@ -13659,65 +14764,482 @@ snapshots:
       '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.22.5
 
-  '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.24.0)':
+  '@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.24.0)':
+    dependencies:
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
+
+  '@babel/plugin-syntax-import-assertions@7.26.0(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-syntax-import-attributes@7.26.0(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.24.0)':
+    dependencies:
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
+
+  '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.24.0)':
+    dependencies:
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
+
+  '@babel/plugin-syntax-jsx@7.18.6(@babel/core@7.24.0)':
+    dependencies:
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
+
+  '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.24.0)':
+    dependencies:
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
+
+  '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.24.0)':
+    dependencies:
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
+
+  '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.24.0)':
+    dependencies:
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
+
+  '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.24.0)':
+    dependencies:
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
+
+  '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.24.0)':
+    dependencies:
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
+
+  '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.24.0)':
+    dependencies:
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
+
+  '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.24.0)':
+    dependencies:
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
+
+  '@babel/plugin-syntax-typescript@7.20.0(@babel/core@7.24.0)':
+    dependencies:
+      '@babel/core': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
+
+  '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-arrow-functions@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-async-generator-functions@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-remap-async-to-generator': 7.25.9(@babel/core@7.26.0)
+      '@babel/traverse': 7.26.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-async-to-generator@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-module-imports': 7.25.9
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-remap-async-to-generator': 7.25.9(@babel/core@7.26.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-block-scoped-functions@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-block-scoping@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-class-properties@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-class-static-block@7.26.0(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-classes@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-annotate-as-pure': 7.25.9
+      '@babel/helper-compilation-targets': 7.25.9
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-replace-supers': 7.25.9(@babel/core@7.26.0)
+      '@babel/traverse': 7.26.3
+      globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-computed-properties@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/template': 7.25.9
+
+  '@babel/plugin-transform-destructuring@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-dotall-regex@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-duplicate-keys@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-dynamic-import@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-exponentiation-operator@7.26.3(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-export-namespace-from@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-for-of@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-function-name@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-compilation-targets': 7.25.9
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/traverse': 7.26.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-json-strings@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-literals@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-logical-assignment-operators@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-member-expression-literals@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-modules-amd@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-modules-commonjs@7.26.3(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-modules-systemjs@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-validator-identifier': 7.25.9
+      '@babel/traverse': 7.26.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-modules-umd@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-named-capturing-groups-regex@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-new-target@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-nullish-coalescing-operator@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-numeric-separator@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-object-rest-spread@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-compilation-targets': 7.25.9
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/plugin-transform-parameters': 7.25.9(@babel/core@7.26.0)
+
+  '@babel/plugin-transform-object-super@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-replace-supers': 7.25.9(@babel/core@7.26.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-optional-catch-binding@7.25.9(@babel/core@7.26.0)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
 
-  '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.24.0)':
+  '@babel/plugin-transform-optional-chaining@7.25.9(@babel/core@7.26.0)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-parameters@7.25.9(@babel/core@7.26.0)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
 
-  '@babel/plugin-syntax-jsx@7.18.6(@babel/core@7.24.0)':
+  '@babel/plugin-transform-private-methods@7.25.9(@babel/core@7.26.0)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.0
+      '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.24.0)':
+  '@babel/plugin-transform-private-property-in-object@7.25.9(@babel/core@7.26.0)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.0
+      '@babel/helper-annotate-as-pure': 7.25.9
+      '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-property-literals@7.25.9(@babel/core@7.26.0)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
 
-  '@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.24.0)':
+  '@babel/plugin-transform-regenerator@7.25.9(@babel/core@7.26.0)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      regenerator-transform: 0.15.2
 
-  '@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-regexp-modifiers@7.26.0(@babel/core@7.26.0)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.0
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
 
-  '@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-reserved-words@7.25.9(@babel/core@7.26.0)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
 
-  '@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.24.0)':
+  '@babel/plugin-transform-shorthand-properties@7.25.9(@babel/core@7.26.0)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
 
-  '@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.24.0)':
+  '@babel/plugin-transform-spread@7.25.9(@babel/core@7.26.0)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
 
-  '@babel/plugin-syntax-typescript@7.20.0(@babel/core@7.24.0)':
+  '@babel/plugin-transform-sticky-regex@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-template-literals@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-typeof-symbol@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-unicode-escapes@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-unicode-property-regex@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-unicode-regex@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-unicode-sets-regex@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/preset-env@7.26.0(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/compat-data': 7.26.3
+      '@babel/core': 7.26.0
+      '@babel/helper-compilation-targets': 7.25.9
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-validator-option': 7.25.9
+      '@babel/plugin-bugfix-firefox-class-in-computed-class-key': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-bugfix-safari-class-field-initializer-scope': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.26.0)
+      '@babel/plugin-syntax-import-assertions': 7.26.0(@babel/core@7.26.0)
+      '@babel/plugin-syntax-import-attributes': 7.26.0(@babel/core@7.26.0)
+      '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.26.0)
+      '@babel/plugin-transform-arrow-functions': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-async-generator-functions': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-async-to-generator': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-block-scoped-functions': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-block-scoping': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-class-properties': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-class-static-block': 7.26.0(@babel/core@7.26.0)
+      '@babel/plugin-transform-classes': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-computed-properties': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-destructuring': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-dotall-regex': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-duplicate-keys': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-duplicate-named-capturing-groups-regex': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-dynamic-import': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-exponentiation-operator': 7.26.3(@babel/core@7.26.0)
+      '@babel/plugin-transform-export-namespace-from': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-for-of': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-function-name': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-json-strings': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-literals': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-logical-assignment-operators': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-member-expression-literals': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-modules-amd': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-modules-commonjs': 7.26.3(@babel/core@7.26.0)
+      '@babel/plugin-transform-modules-systemjs': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-modules-umd': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-named-capturing-groups-regex': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-new-target': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-nullish-coalescing-operator': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-numeric-separator': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-object-rest-spread': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-object-super': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-optional-catch-binding': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-optional-chaining': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-parameters': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-private-methods': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-private-property-in-object': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-property-literals': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-regenerator': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-regexp-modifiers': 7.26.0(@babel/core@7.26.0)
+      '@babel/plugin-transform-reserved-words': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-shorthand-properties': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-spread': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-sticky-regex': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-template-literals': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-typeof-symbol': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-unicode-escapes': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-unicode-property-regex': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-unicode-regex': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-unicode-sets-regex': 7.25.9(@babel/core@7.26.0)
+      '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.26.0)
+      babel-plugin-polyfill-corejs2: 0.4.12(@babel/core@7.26.0)
+      babel-plugin-polyfill-corejs3: 0.10.6(@babel/core@7.26.0)
+      babel-plugin-polyfill-regenerator: 0.6.3(@babel/core@7.26.0)
+      core-js-compat: 3.39.0
+      semver: 7.6.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.26.0)':
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/types': 7.26.0
+      esutils: 2.0.3
 
   '@babel/runtime@7.24.7':
     dependencies:
@@ -13726,8 +15248,14 @@ snapshots:
   '@babel/template@7.24.0':
     dependencies:
       '@babel/code-frame': 7.24.6
-      '@babel/parser': 7.25.6
-      '@babel/types': 7.25.6
+      '@babel/parser': 7.26.2
+      '@babel/types': 7.26.0
+
+  '@babel/template@7.25.9':
+    dependencies:
+      '@babel/code-frame': 7.26.2
+      '@babel/parser': 7.26.2
+      '@babel/types': 7.26.0
 
   '@babel/traverse@7.24.0':
     dependencies:
@@ -13737,8 +15265,20 @@ snapshots:
       '@babel/helper-function-name': 7.23.0
       '@babel/helper-hoist-variables': 7.22.5
       '@babel/helper-split-export-declaration': 7.22.6
-      '@babel/parser': 7.25.6
-      '@babel/types': 7.25.6
+      '@babel/parser': 7.26.2
+      '@babel/types': 7.26.0
+      debug: 4.3.7
+      globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/traverse@7.26.3':
+    dependencies:
+      '@babel/code-frame': 7.26.2
+      '@babel/generator': 7.26.3
+      '@babel/parser': 7.26.3
+      '@babel/template': 7.25.9
+      '@babel/types': 7.26.3
       debug: 4.3.7
       globals: 11.12.0
     transitivePeerDependencies:
@@ -13750,6 +15290,16 @@ snapshots:
       '@babel/helper-validator-identifier': 7.24.7
       to-fast-properties: 2.0.0
 
+  '@babel/types@7.26.0':
+    dependencies:
+      '@babel/helper-string-parser': 7.25.9
+      '@babel/helper-validator-identifier': 7.25.9
+
+  '@babel/types@7.26.3':
+    dependencies:
+      '@babel/helper-string-parser': 7.25.9
+      '@babel/helper-validator-identifier': 7.25.9
+
   '@bcoe/v8-coverage@0.2.3': {}
 
   '@biomejs/biome@1.9.0':
@@ -14490,7 +16040,6 @@ snapshots:
     dependencies:
       '@jridgewell/gen-mapping': 0.3.5
       '@jridgewell/trace-mapping': 0.3.25
-    optional: true
 
   '@jridgewell/sourcemap-codec@1.4.15': {}
 
@@ -14677,38 +16226,6 @@ snapshots:
     transitivePeerDependencies:
       - openai
 
-  '@langchain/core@0.3.19(openai@4.73.1(zod@3.23.8))':
-    dependencies:
-      ansi-styles: 5.2.0
-      camelcase: 6.3.0
-      decamelize: 1.2.0
-      js-tiktoken: 1.0.12
-      langsmith: 0.2.3(openai@4.73.1(zod@3.23.8))
-      mustache: 4.2.0
-      p-queue: 6.6.2
-      p-retry: 4.6.2
-      uuid: 10.0.0
-      zod: 3.23.8
-      zod-to-json-schema: 3.23.3(zod@3.23.8)
-    transitivePeerDependencies:
-      - openai
-
-  '@langchain/core@0.3.19(openai@4.73.1)':
-    dependencies:
-      ansi-styles: 5.2.0
-      camelcase: 6.3.0
-      decamelize: 1.2.0
-      js-tiktoken: 1.0.12
-      langsmith: 0.2.3(openai@4.73.1)
-      mustache: 4.2.0
-      p-queue: 6.6.2
-      p-retry: 4.6.2
-      uuid: 10.0.0
-      zod: 3.23.8
-      zod-to-json-schema: 3.23.3(zod@3.23.8)
-    transitivePeerDependencies:
-      - openai
-
   '@langchain/google-common@0.1.3(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(zod@3.23.8)':
     dependencies:
       '@langchain/core': 0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8))
@@ -14950,7 +16467,7 @@ snapshots:
       esprima-next: 5.8.4
       recast: 0.22.0
 
-  '@n8n/typeorm@0.3.20-12(@sentry/node@7.87.0)(ioredis@5.3.2)(mssql@10.0.2)(mysql2@3.11.0)(pg@8.12.0)(redis@4.6.12)(sqlite3@5.1.7)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2))':
+  '@n8n/typeorm@0.3.20-12(@sentry/node@8.42.0)(ioredis@5.3.2)(mssql@10.0.2)(mysql2@3.11.0)(pg@8.12.0)(redis@4.6.12)(sqlite3@5.1.7)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2))':
     dependencies:
       '@n8n/p-retry': 6.2.0-2
       '@sqltools/formatter': 1.2.5
@@ -14970,7 +16487,7 @@ snapshots:
       uuid: 9.0.1
       yargs: 17.7.2
     optionalDependencies:
-      '@sentry/node': 7.87.0
+      '@sentry/node': 8.42.0
       ioredis: 5.3.2
       mssql: 10.0.2
       mysql2: 3.11.0
@@ -14981,7 +16498,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@n8n/typeorm@0.3.20-12(@sentry/node@7.87.0)(ioredis@5.3.2)(mssql@10.0.2)(mysql2@3.11.0)(pg@8.12.0)(redis@4.6.14)(sqlite3@5.1.7)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2))':
+  '@n8n/typeorm@0.3.20-12(@sentry/node@8.42.0)(ioredis@5.3.2)(mssql@10.0.2)(mysql2@3.11.0)(pg@8.12.0)(redis@4.6.14)(sqlite3@5.1.7)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2))':
     dependencies:
       '@n8n/p-retry': 6.2.0-2
       '@sqltools/formatter': 1.2.5
@@ -15001,7 +16518,7 @@ snapshots:
       uuid: 9.0.1
       yargs: 17.7.2
     optionalDependencies:
-      '@sentry/node': 7.87.0
+      '@sentry/node': 8.42.0
       ioredis: 5.3.2
       mssql: 10.0.2
       mysql2: 3.11.0
@@ -15019,73 +16536,367 @@ snapshots:
 
   '@n8n_io/ai-assistant-sdk@1.12.0': {}
 
-  '@n8n_io/license-sdk@2.13.1':
+  '@n8n_io/license-sdk@2.13.1':
+    dependencies:
+      crypto-js: 4.2.0
+      node-machine-id: 1.1.12
+      node-rsa: 1.1.1
+      undici: 6.19.7
+
+  '@n8n_io/riot-tmpl@4.0.0':
+    dependencies:
+      eslint-config-riot: 1.0.0
+
+  '@n8n_io/riot-tmpl@4.0.1':
+    dependencies:
+      eslint-config-riot: 1.0.0
+
+  '@ngneat/falso@7.2.0':
+    dependencies:
+      seedrandom: 3.0.5
+      uuid: 8.3.2
+
+  '@nodelib/fs.scandir@2.1.5':
+    dependencies:
+      '@nodelib/fs.stat': 2.0.5
+      run-parallel: 1.2.0
+
+  '@nodelib/fs.stat@2.0.5': {}
+
+  '@nodelib/fs.walk@1.2.8':
+    dependencies:
+      '@nodelib/fs.scandir': 2.1.5
+      fastq: 1.15.0
+
+  '@npmcli/fs@1.1.1':
+    dependencies:
+      '@gar/promisify': 1.1.3
+      semver: 7.6.0
+    optional: true
+
+  '@npmcli/move-file@1.1.2':
+    dependencies:
+      mkdirp: 1.0.4
+      rimraf: 3.0.2
+    optional: true
+
+  '@oclif/core@4.0.7':
+    dependencies:
+      ansi-escapes: 4.3.2
+      ansis: 3.2.0
+      clean-stack: 3.0.1
+      cli-spinners: 2.9.2
+      debug: 4.3.6(supports-color@8.1.1)
+      ejs: 3.1.10
+      get-package-type: 0.1.0
+      globby: 11.1.0
+      indent-string: 4.0.0
+      is-wsl: 2.2.0
+      lilconfig: 3.1.2
+      minimatch: 9.0.5
+      string-width: 4.2.3
+      supports-color: 8.1.1
+      widest-line: 3.1.0
+      wordwrap: 1.0.0
+      wrap-ansi: 7.0.0
+
+  '@one-ini/wasm@0.1.1': {}
+
+  '@opentelemetry/api-logs@0.52.1':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+
+  '@opentelemetry/api-logs@0.53.0':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+
+  '@opentelemetry/api-logs@0.54.2':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+
+  '@opentelemetry/api@1.2.0': {}
+
+  '@opentelemetry/api@1.9.0': {}
+
+  '@opentelemetry/context-async-hooks@1.29.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+
+  '@opentelemetry/core@1.26.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/semantic-conventions': 1.27.0
+
+  '@opentelemetry/core@1.29.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/semantic-conventions': 1.28.0
+
+  '@opentelemetry/instrumentation-amqplib@0.43.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-connect@0.40.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+      '@types/connect': 3.4.36
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-dataloader@0.12.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-express@0.44.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-fastify@0.41.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-fs@0.16.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-generic-pool@0.39.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-graphql@0.44.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-hapi@0.41.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-http@0.53.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.26.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.27.0
+      semver: 7.6.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-ioredis@0.43.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/redis-common': 0.36.2
+      '@opentelemetry/semantic-conventions': 1.28.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-kafkajs@0.4.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-knex@0.41.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-koa@0.43.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-lru-memoizer@0.40.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-mongodb@0.48.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-mongoose@0.42.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-mysql2@0.41.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+      '@opentelemetry/sql-common': 0.40.1(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-mysql@0.41.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+      '@types/mysql': 2.15.26
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-nestjs-core@0.40.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-pg@0.44.0(@opentelemetry/api@1.9.0)':
     dependencies:
-      crypto-js: 4.2.0
-      node-machine-id: 1.1.12
-      node-rsa: 1.1.1
-      undici: 6.19.7
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+      '@opentelemetry/sql-common': 0.40.1(@opentelemetry/api@1.9.0)
+      '@types/pg': 8.6.1
+      '@types/pg-pool': 2.0.6
+    transitivePeerDependencies:
+      - supports-color
 
-  '@n8n_io/riot-tmpl@4.0.0':
+  '@opentelemetry/instrumentation-redis-4@0.42.0(@opentelemetry/api@1.9.0)':
     dependencies:
-      eslint-config-riot: 1.0.0
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/redis-common': 0.36.2
+      '@opentelemetry/semantic-conventions': 1.28.0
+    transitivePeerDependencies:
+      - supports-color
 
-  '@n8n_io/riot-tmpl@4.0.1':
+  '@opentelemetry/instrumentation-tedious@0.15.0(@opentelemetry/api@1.9.0)':
     dependencies:
-      eslint-config-riot: 1.0.0
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+      '@types/tedious': 4.0.14
+    transitivePeerDependencies:
+      - supports-color
 
-  '@ngneat/falso@7.2.0':
+  '@opentelemetry/instrumentation-undici@0.6.0(@opentelemetry/api@1.9.0)':
     dependencies:
-      seedrandom: 3.0.5
-      uuid: 8.3.2
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
 
-  '@nodelib/fs.scandir@2.1.5':
+  '@opentelemetry/instrumentation@0.52.1(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@nodelib/fs.stat': 2.0.5
-      run-parallel: 1.2.0
-
-  '@nodelib/fs.stat@2.0.5': {}
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api-logs': 0.52.1
+      '@types/shimmer': 1.2.0
+      import-in-the-middle: 1.11.3
+      require-in-the-middle: 7.4.0
+      semver: 7.6.0
+      shimmer: 1.2.1
+    transitivePeerDependencies:
+      - supports-color
 
-  '@nodelib/fs.walk@1.2.8':
+  '@opentelemetry/instrumentation@0.53.0(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@nodelib/fs.scandir': 2.1.5
-      fastq: 1.15.0
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api-logs': 0.53.0
+      '@types/shimmer': 1.2.0
+      import-in-the-middle: 1.11.3
+      require-in-the-middle: 7.4.0
+      semver: 7.6.0
+      shimmer: 1.2.1
+    transitivePeerDependencies:
+      - supports-color
 
-  '@npmcli/fs@1.1.1':
+  '@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0)':
     dependencies:
-      '@gar/promisify': 1.1.3
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api-logs': 0.54.2
+      '@types/shimmer': 1.2.0
+      import-in-the-middle: 1.11.3
+      require-in-the-middle: 7.4.0
       semver: 7.6.0
-    optional: true
+      shimmer: 1.2.1
+    transitivePeerDependencies:
+      - supports-color
 
-  '@npmcli/move-file@1.1.2':
+  '@opentelemetry/redis-common@0.36.2': {}
+
+  '@opentelemetry/resources@1.29.0(@opentelemetry/api@1.9.0)':
     dependencies:
-      mkdirp: 1.0.4
-      rimraf: 3.0.2
-    optional: true
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
 
-  '@oclif/core@4.0.7':
+  '@opentelemetry/sdk-trace-base@1.29.0(@opentelemetry/api@1.9.0)':
     dependencies:
-      ansi-escapes: 4.3.2
-      ansis: 3.2.0
-      clean-stack: 3.0.1
-      cli-spinners: 2.9.2
-      debug: 4.3.6(supports-color@8.1.1)
-      ejs: 3.1.10
-      get-package-type: 0.1.0
-      globby: 11.1.0
-      indent-string: 4.0.0
-      is-wsl: 2.2.0
-      lilconfig: 3.1.2
-      minimatch: 9.0.5
-      string-width: 4.2.3
-      supports-color: 8.1.1
-      widest-line: 3.1.0
-      wordwrap: 1.0.0
-      wrap-ansi: 7.0.0
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
 
-  '@one-ini/wasm@0.1.1': {}
+  '@opentelemetry/semantic-conventions@1.27.0': {}
 
-  '@opentelemetry/api@1.2.0': {}
+  '@opentelemetry/semantic-conventions@1.28.0': {}
+
+  '@opentelemetry/sql-common@0.40.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
 
   '@otplib/core@12.0.1': {}
 
@@ -15125,6 +16936,14 @@ snapshots:
   '@pkgjs/parseargs@0.11.0':
     optional: true
 
+  '@prisma/instrumentation@5.19.1':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 1.29.0(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+
   '@protobufjs/aspromise@1.1.2': {}
 
   '@protobufjs/base64@1.1.2': {}
@@ -15405,12 +17224,6 @@ snapshots:
       '@sentry/types': 8.33.1
       '@sentry/utils': 8.33.1
 
-  '@sentry-internal/tracing@7.87.0':
-    dependencies:
-      '@sentry/core': 7.87.0
-      '@sentry/types': 7.87.0
-      '@sentry/utils': 7.87.0
-
   '@sentry/browser@8.33.1':
     dependencies:
       '@sentry-internal/browser-utils': 8.33.1
@@ -15421,41 +17234,64 @@ snapshots:
       '@sentry/types': 8.33.1
       '@sentry/utils': 8.33.1
 
-  '@sentry/core@7.87.0':
-    dependencies:
-      '@sentry/types': 7.87.0
-      '@sentry/utils': 7.87.0
-
   '@sentry/core@8.33.1':
     dependencies:
       '@sentry/types': 8.33.1
       '@sentry/utils': 8.33.1
 
-  '@sentry/integrations@7.87.0':
-    dependencies:
-      '@sentry/core': 7.87.0
-      '@sentry/types': 7.87.0
-      '@sentry/utils': 7.87.0
-      localforage: 1.10.0
-
-  '@sentry/node@7.87.0':
-    dependencies:
-      '@sentry-internal/tracing': 7.87.0
-      '@sentry/core': 7.87.0
-      '@sentry/types': 7.87.0
-      '@sentry/utils': 7.87.0
-      https-proxy-agent: 5.0.1
+  '@sentry/core@8.42.0': {}
+
+  '@sentry/node@8.42.0':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/context-async-hooks': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-amqplib': 0.43.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-connect': 0.40.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-dataloader': 0.12.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-express': 0.44.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-fastify': 0.41.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-fs': 0.16.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-generic-pool': 0.39.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-graphql': 0.44.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-hapi': 0.41.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-http': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-ioredis': 0.43.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-kafkajs': 0.4.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-knex': 0.41.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-koa': 0.43.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-lru-memoizer': 0.40.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mongodb': 0.48.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mongoose': 0.42.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mysql': 0.41.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mysql2': 0.41.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-nestjs-core': 0.40.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-pg': 0.44.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-redis-4': 0.42.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-tedious': 0.15.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-undici': 0.6.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+      '@prisma/instrumentation': 5.19.1
+      '@sentry/core': 8.42.0
+      '@sentry/opentelemetry': 8.42.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.29.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.29.0(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.28.0)
+      import-in-the-middle: 1.11.3
     transitivePeerDependencies:
       - supports-color
 
-  '@sentry/types@7.87.0': {}
+  '@sentry/opentelemetry@8.42.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.29.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.29.0(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.28.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+      '@sentry/core': 8.42.0
 
   '@sentry/types@8.33.1': {}
 
-  '@sentry/utils@7.87.0':
-    dependencies:
-      '@sentry/types': 7.87.0
-
   '@sentry/utils@8.33.1':
     dependencies:
       '@sentry/types': 8.33.1
@@ -16286,6 +18122,8 @@ snapshots:
 
   '@tootallnate/once@2.0.0': {}
 
+  '@trysound/sax@0.2.0': {}
+
   '@tsconfig/node10@1.0.11':
     optional: true
 
@@ -16316,24 +18154,24 @@ snapshots:
 
   '@types/babel__core@7.20.0':
     dependencies:
-      '@babel/parser': 7.25.6
-      '@babel/types': 7.25.6
+      '@babel/parser': 7.26.2
+      '@babel/types': 7.26.0
       '@types/babel__generator': 7.6.4
       '@types/babel__template': 7.4.1
       '@types/babel__traverse': 7.18.2
 
   '@types/babel__generator@7.6.4':
     dependencies:
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.0
 
   '@types/babel__template@7.4.1':
     dependencies:
-      '@babel/parser': 7.25.6
-      '@babel/types': 7.25.6
+      '@babel/parser': 7.26.2
+      '@babel/types': 7.26.0
 
   '@types/babel__traverse@7.18.2':
     dependencies:
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.0
 
   '@types/basic-auth@1.1.3':
     dependencies:
@@ -16366,6 +18204,10 @@ snapshots:
     dependencies:
       '@types/node': 18.16.16
 
+  '@types/connect@3.4.36':
+    dependencies:
+      '@types/node': 18.16.16
+
   '@types/convict@6.1.1':
     dependencies:
       '@types/node': 18.16.16
@@ -16563,6 +18405,10 @@ snapshots:
     dependencies:
       '@types/express': 4.17.21
 
+  '@types/mysql@2.15.26':
+    dependencies:
+      '@types/node': 18.16.16
+
   '@types/node-fetch@2.6.4':
     dependencies:
       '@types/node': 18.16.16
@@ -16576,12 +18422,22 @@ snapshots:
 
   '@types/normalize-package-data@2.4.1': {}
 
+  '@types/pg-pool@2.0.6':
+    dependencies:
+      '@types/pg': 8.11.6
+
   '@types/pg@8.11.6':
     dependencies:
       '@types/node': 18.16.16
       pg-protocol: 1.6.1
       pg-types: 4.0.2
 
+  '@types/pg@8.6.1':
+    dependencies:
+      '@types/node': 18.16.16
+      pg-protocol: 1.6.1
+      pg-types: 2.2.0
+
   '@types/phoenix@1.6.4': {}
 
   '@types/promise-ftp-common@1.1.0': {}
@@ -16652,6 +18508,8 @@ snapshots:
       '@types/glob': 8.0.0
       '@types/node': 18.16.16
 
+  '@types/shimmer@1.2.0': {}
+
   '@types/showdown@1.9.4': {}
 
   '@types/sinonjs__fake-timers@8.1.1': {}
@@ -16700,6 +18558,10 @@ snapshots:
     dependencies:
       '@types/node': 18.16.16
 
+  '@types/tedious@4.0.14':
+    dependencies:
+      '@types/node': 18.16.16
+
   '@types/tedious@4.0.9':
     dependencies:
       '@types/node': 18.16.16
@@ -16900,6 +18762,21 @@ snapshots:
 
   '@ungap/structured-clone@1.2.0': {}
 
+  '@vitejs/plugin-legacy@6.0.0(terser@5.16.1)(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/preset-env': 7.26.0(@babel/core@7.26.0)
+      browserslist: 4.24.2
+      browserslist-to-esbuild: 2.1.1(browserslist@4.24.2)
+      core-js: 3.39.0
+      magic-string: 0.30.14
+      regenerator-runtime: 0.14.1
+      systemjs: 6.15.1
+      terser: 5.16.1
+      vite: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
+    transitivePeerDependencies:
+      - supports-color
+
   '@vitejs/plugin-vue@5.2.1(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))(vue@3.5.13(typescript@5.7.2))':
     dependencies:
       vite: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
@@ -16997,17 +18874,17 @@ snapshots:
       path-browserify: 1.0.1
       vscode-uri: 3.0.8
 
-  '@vue-flow/background@1.3.1(@vue-flow/core@1.41.4(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))':
+  '@vue-flow/background@1.3.2(@vue-flow/core@1.41.6(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))':
     dependencies:
-      '@vue-flow/core': 1.41.4(vue@3.5.13(typescript@5.7.2))
+      '@vue-flow/core': 1.41.6(vue@3.5.13(typescript@5.7.2))
       vue: 3.5.13(typescript@5.7.2)
 
-  '@vue-flow/controls@1.1.2(@vue-flow/core@1.41.4(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))':
+  '@vue-flow/controls@1.1.2(@vue-flow/core@1.41.6(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))':
     dependencies:
-      '@vue-flow/core': 1.41.4(vue@3.5.13(typescript@5.7.2))
+      '@vue-flow/core': 1.41.6(vue@3.5.13(typescript@5.7.2))
       vue: 3.5.13(typescript@5.7.2)
 
-  '@vue-flow/core@1.41.4(vue@3.5.13(typescript@5.7.2))':
+  '@vue-flow/core@1.41.6(vue@3.5.13(typescript@5.7.2))':
     dependencies:
       '@vueuse/core': 10.11.0(vue@3.5.13(typescript@5.7.2))
       d3-drag: 3.0.0
@@ -17017,16 +18894,16 @@ snapshots:
     transitivePeerDependencies:
       - '@vue/composition-api'
 
-  '@vue-flow/minimap@1.5.0(@vue-flow/core@1.41.4(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))':
+  '@vue-flow/minimap@1.5.0(@vue-flow/core@1.41.6(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))':
     dependencies:
-      '@vue-flow/core': 1.41.4(vue@3.5.13(typescript@5.7.2))
+      '@vue-flow/core': 1.41.6(vue@3.5.13(typescript@5.7.2))
       d3-selection: 3.0.0
       d3-zoom: 3.0.0
       vue: 3.5.13(typescript@5.7.2)
 
-  '@vue-flow/node-resizer@1.4.0(@vue-flow/core@1.41.4(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))':
+  '@vue-flow/node-resizer@1.4.0(@vue-flow/core@1.41.6(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))':
     dependencies:
-      '@vue-flow/core': 1.41.4(vue@3.5.13(typescript@5.7.2))
+      '@vue-flow/core': 1.41.6(vue@3.5.13(typescript@5.7.2))
       d3-drag: 3.0.0
       d3-selection: 3.0.0
       vue: 3.5.13(typescript@5.7.2)
@@ -17052,7 +18929,7 @@ snapshots:
       '@vue/compiler-ssr': 3.5.13
       '@vue/shared': 3.5.13
       estree-walker: 2.0.2
-      magic-string: 0.30.11
+      magic-string: 0.30.14
       postcss: 8.4.49
       source-map-js: 1.2.1
 
@@ -17212,6 +19089,10 @@ snapshots:
       acorn: 8.14.0
       acorn-walk: 8.3.4
 
+  acorn-import-attributes@1.9.5(acorn@8.14.0):
+    dependencies:
+      acorn: 8.14.0
+
   acorn-jsx@5.3.2(acorn@8.14.0):
     dependencies:
       acorn: 8.14.0
@@ -17623,10 +19504,34 @@ snapshots:
   babel-plugin-jest-hoist@29.5.0:
     dependencies:
       '@babel/template': 7.24.0
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.0
       '@types/babel__core': 7.20.0
       '@types/babel__traverse': 7.18.2
 
+  babel-plugin-polyfill-corejs2@0.4.12(@babel/core@7.26.0):
+    dependencies:
+      '@babel/compat-data': 7.26.3
+      '@babel/core': 7.26.0
+      '@babel/helper-define-polyfill-provider': 0.6.3(@babel/core@7.26.0)
+      semver: 7.6.0
+    transitivePeerDependencies:
+      - supports-color
+
+  babel-plugin-polyfill-corejs3@0.10.6(@babel/core@7.26.0):
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-define-polyfill-provider': 0.6.3(@babel/core@7.26.0)
+      core-js-compat: 3.39.0
+    transitivePeerDependencies:
+      - supports-color
+
+  babel-plugin-polyfill-regenerator@0.6.3(@babel/core@7.26.0):
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-define-polyfill-provider': 0.6.3(@babel/core@7.26.0)
+    transitivePeerDependencies:
+      - supports-color
+
   babel-preset-current-node-syntax@1.0.1(@babel/core@7.24.0):
     dependencies:
       '@babel/core': 7.24.0
@@ -17651,7 +19556,7 @@ snapshots:
 
   babel-walk@3.0.0-canary-5:
     dependencies:
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.0
 
   balanced-match@1.0.2: {}
 
@@ -17750,6 +19655,11 @@ snapshots:
 
   browser-request@0.3.3: {}
 
+  browserslist-to-esbuild@2.1.1(browserslist@4.24.2):
+    dependencies:
+      browserslist: 4.24.2
+      meow: 13.2.0
+
   browserslist@4.23.0:
     dependencies:
       caniuse-lite: 1.0.30001667
@@ -17757,6 +19667,13 @@ snapshots:
       node-releases: 2.0.14
       update-browserslist-db: 1.0.13(browserslist@4.23.0)
 
+  browserslist@4.24.2:
+    dependencies:
+      caniuse-lite: 1.0.30001677
+      electron-to-chromium: 1.5.51
+      node-releases: 2.0.18
+      update-browserslist-db: 1.1.1(browserslist@4.24.2)
+
   bs-logger@0.2.6:
     dependencies:
       fast-json-stable-stringify: 2.1.0
@@ -17888,6 +19805,8 @@ snapshots:
 
   caniuse-lite@1.0.30001667: {}
 
+  caniuse-lite@1.0.30001677: {}
+
   capital-case@1.0.4:
     dependencies:
       no-case: 3.0.4
@@ -17945,6 +19864,8 @@ snapshots:
 
   chardet@0.7.0: {}
 
+  chardet@2.0.0: {}
+
   charenc@0.0.2: {}
 
   chart.js@4.4.0:
@@ -18169,6 +20090,8 @@ snapshots:
 
   commander@6.2.1: {}
 
+  commander@7.2.0: {}
+
   commander@9.4.1: {}
 
   commist@3.2.0: {}
@@ -18247,8 +20170,8 @@ snapshots:
 
   constantinople@4.0.1:
     dependencies:
-      '@babel/parser': 7.25.6
-      '@babel/types': 7.25.6
+      '@babel/parser': 7.26.2
+      '@babel/types': 7.26.0
 
   content-disposition@0.5.4:
     dependencies:
@@ -18282,10 +20205,16 @@ snapshots:
 
   core-js-compat@3.36.0:
     dependencies:
-      browserslist: 4.23.0
+      browserslist: 4.24.2
+
+  core-js-compat@3.39.0:
+    dependencies:
+      browserslist: 4.24.2
 
   core-js@3.35.0: {}
 
+  core-js@3.39.0: {}
+
   core-util-is@1.0.2: {}
 
   core-util-is@1.0.3: {}
@@ -18371,6 +20300,16 @@ snapshots:
       css-color-keywords: 1.0.0
       postcss-value-parser: 4.2.0
 
+  css-tree@2.2.1:
+    dependencies:
+      mdn-data: 2.0.28
+      source-map-js: 1.2.1
+
+  css-tree@2.3.1:
+    dependencies:
+      mdn-data: 2.0.30
+      source-map-js: 1.2.1
+
   css-what@6.1.0: {}
 
   css.escape@1.5.1: {}
@@ -18379,6 +20318,10 @@ snapshots:
 
   cssfilter@0.0.10: {}
 
+  csso@5.0.5:
+    dependencies:
+      css-tree: 2.2.1
+
   cssom@0.3.8: {}
 
   cssom@0.5.0: {}
@@ -18825,6 +20768,8 @@ snapshots:
 
   electron-to-chromium@1.4.703: {}
 
+  electron-to-chromium@1.5.51: {}
+
   element-plus@2.4.3(vue@3.5.13(typescript@5.7.2)):
     dependencies:
       '@ctrl/tinycolor': 3.6.0
@@ -19174,6 +21119,8 @@ snapshots:
 
   escalade@3.1.1: {}
 
+  escalade@3.2.0: {}
+
   escape-goat@3.0.0: {}
 
   escape-html@1.0.3: {}
@@ -19202,7 +21149,7 @@ snapshots:
     optionalDependencies:
       source-map: 0.6.1
 
-  eslint-config-airbnb-base@15.0.0(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0))(eslint@8.57.0):
+  eslint-config-airbnb-base@15.0.0(eslint-plugin-import@2.29.1)(eslint@8.57.0):
     dependencies:
       confusing-browser-globals: 1.0.11
       eslint: 8.57.0
@@ -19211,12 +21158,12 @@ snapshots:
       object.entries: 1.1.5
       semver: 7.6.0
 
-  eslint-config-airbnb-typescript@18.0.0(@typescript-eslint/eslint-plugin@7.2.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint@8.57.0)(typescript@5.7.2))(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0))(eslint@8.57.0):
+  eslint-config-airbnb-typescript@18.0.0(@typescript-eslint/eslint-plugin@7.2.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint@8.57.0)(typescript@5.7.2))(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0):
     dependencies:
       '@typescript-eslint/eslint-plugin': 7.2.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint@8.57.0)(typescript@5.7.2)
       '@typescript-eslint/parser': 7.2.0(eslint@8.57.0)(typescript@5.7.2)
       eslint: 8.57.0
-      eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0))(eslint@8.57.0)
+      eslint-config-airbnb-base: 15.0.0(eslint-plugin-import@2.29.1)(eslint@8.57.0)
     transitivePeerDependencies:
       - eslint-plugin-import
 
@@ -19239,7 +21186,7 @@ snapshots:
       debug: 4.3.4
       enhanced-resolve: 5.13.0
       eslint: 8.57.0
-      eslint-module-utils: 2.8.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0)
+      eslint-module-utils: 2.8.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0)
       eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0)
       fast-glob: 3.3.2
       get-tsconfig: 4.5.0
@@ -19251,7 +21198,7 @@ snapshots:
       - eslint-import-resolver-webpack
       - supports-color
 
-  eslint-module-utils@2.8.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0):
+  eslint-module-utils@2.8.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0):
     dependencies:
       debug: 3.2.7(supports-color@5.5.0)
     optionalDependencies:
@@ -19277,7 +21224,7 @@ snapshots:
       doctrine: 2.1.0
       eslint: 8.57.0
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.8.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0)
+      eslint-module-utils: 2.8.0(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.7.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0)
       hasown: 2.0.2
       is-core-module: 2.13.1
       is-glob: 4.0.3
@@ -20368,7 +22315,7 @@ snapshots:
       isstream: 0.1.2
       jsonwebtoken: 9.0.2
       mime-types: 2.1.35
-      retry-axios: 2.6.0(axios@1.7.4(debug@4.3.7))
+      retry-axios: 2.6.0(axios@1.7.4)
       tough-cookie: 4.1.3
     transitivePeerDependencies:
       - supports-color
@@ -20385,7 +22332,7 @@ snapshots:
 
   ics@2.40.0:
     dependencies:
-      nanoid: 3.3.7
+      nanoid: 3.3.8
       yup: 0.32.11
 
   ieee754@1.2.1: {}
@@ -20408,6 +22355,13 @@ snapshots:
       parent-module: 1.0.1
       resolve-from: 4.0.0
 
+  import-in-the-middle@1.11.3:
+    dependencies:
+      acorn: 8.14.0
+      acorn-import-attributes: 1.9.5(acorn@8.14.0)
+      cjs-module-lexer: 1.2.2
+      module-details-from-path: 1.0.3
+
   import-lazy@4.0.0: {}
 
   import-local@3.1.0:
@@ -20688,7 +22642,7 @@ snapshots:
   istanbul-lib-instrument@5.2.1:
     dependencies:
       '@babel/core': 7.24.0
-      '@babel/parser': 7.25.6
+      '@babel/parser': 7.26.2
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-coverage: 3.2.2
       semver: 7.6.0
@@ -21403,28 +23357,6 @@ snapshots:
     optionalDependencies:
       openai: 4.73.1(encoding@0.1.13)(zod@3.23.8)
 
-  langsmith@0.2.3(openai@4.73.1(zod@3.23.8)):
-    dependencies:
-      '@types/uuid': 10.0.0
-      commander: 10.0.1
-      p-queue: 6.6.2
-      p-retry: 4.6.2
-      semver: 7.6.0
-      uuid: 10.0.0
-    optionalDependencies:
-      openai: 4.73.1(zod@3.23.8)
-
-  langsmith@0.2.3(openai@4.73.1):
-    dependencies:
-      '@types/uuid': 10.0.0
-      commander: 10.0.1
-      p-queue: 6.6.2
-      p-retry: 4.6.2
-      semver: 7.6.0
-      uuid: 10.0.0
-    optionalDependencies:
-      openai: 4.73.1(zod@3.23.8)
-
   lazy-ass@1.6.0: {}
 
   ldapts@4.2.6:
@@ -21516,10 +23448,6 @@ snapshots:
 
   libqp@2.0.1: {}
 
-  lie@3.1.1:
-    dependencies:
-      immediate: 3.0.6
-
   lie@3.3.0:
     dependencies:
       immediate: 3.0.6
@@ -21556,10 +23484,6 @@ snapshots:
       mlly: 1.4.2
       pkg-types: 1.0.3
 
-  localforage@1.10.0:
-    dependencies:
-      lie: 3.1.1
-
   locate-path@5.0.0:
     dependencies:
       p-locate: 4.1.0
@@ -21580,6 +23504,8 @@ snapshots:
 
   lodash.clonedeep@4.5.0: {}
 
+  lodash.debounce@4.0.8: {}
+
   lodash.defaults@4.2.0: {}
 
   lodash.escape@4.0.1: {}
@@ -21694,18 +23620,14 @@ snapshots:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.4.15
 
-  magic-string@0.30.11:
-    dependencies:
-      '@jridgewell/sourcemap-codec': 1.5.0
-
   magic-string@0.30.14:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.0
 
   magicast@0.3.5:
     dependencies:
-      '@babel/parser': 7.25.6
-      '@babel/types': 7.25.6
+      '@babel/parser': 7.26.2
+      '@babel/types': 7.26.0
       source-map-js: 1.2.1
 
   mailparser@3.6.7:
@@ -21806,6 +23728,10 @@ snapshots:
       crypt: 0.0.2
       is-buffer: 1.1.6
 
+  mdn-data@2.0.28: {}
+
+  mdn-data@2.0.30: {}
+
   mdurl@1.0.1: {}
 
   media-typer@0.3.0: {}
@@ -21822,6 +23748,8 @@ snapshots:
 
   mensch@0.3.4: {}
 
+  meow@13.2.0: {}
+
   merge-descriptors@1.0.3: {}
 
   merge-stream@2.0.0: {}
@@ -21856,7 +23784,7 @@ snapshots:
   minifaker@1.34.1:
     dependencies:
       '@types/uuid': 8.3.4
-      nanoid: 3.3.7
+      nanoid: 3.3.8
       uuid: 8.3.2
 
   minimalistic-assert@1.0.1: {}
@@ -22277,6 +24205,8 @@ snapshots:
 
   mobx@6.12.0: {}
 
+  module-details-from-path@1.0.3: {}
+
   moment-timezone@0.5.37:
     dependencies:
       moment: 2.29.4
@@ -22409,9 +24339,7 @@ snapshots:
 
   nanoclone@0.2.1: {}
 
-  nanoid@3.3.6: {}
-
-  nanoid@3.3.7: {}
+  nanoid@3.3.8: {}
 
   napi-build-utils@1.0.2: {}
 
@@ -22519,6 +24447,8 @@ snapshots:
 
   node-releases@2.0.14: {}
 
+  node-releases@2.0.18: {}
+
   node-rsa@1.1.1:
     dependencies:
       asn1: 0.2.6
@@ -22759,22 +24689,6 @@ snapshots:
       - encoding
       - supports-color
 
-  openai@4.73.1(zod@3.23.8):
-    dependencies:
-      '@types/node': 18.16.16
-      '@types/node-fetch': 2.6.4
-      abort-controller: 3.0.0
-      agentkeepalive: 4.2.1
-      form-data-encoder: 1.7.2
-      formdata-node: 4.4.1
-      node-fetch: 2.7.0(encoding@0.1.13)
-    optionalDependencies:
-      zod: 3.23.8
-    transitivePeerDependencies:
-      - encoding
-      - supports-color
-    optional: true
-
   openapi-sampler@1.5.1:
     dependencies:
       '@types/json-schema': 7.0.15
@@ -23117,19 +25031,19 @@ snapshots:
 
   postcss@8.4.31:
     dependencies:
-      nanoid: 3.3.7
+      nanoid: 3.3.8
       picocolors: 1.0.1
       source-map-js: 1.2.1
 
   postcss@8.4.38:
     dependencies:
-      nanoid: 3.3.7
+      nanoid: 3.3.8
       picocolors: 1.0.1
       source-map-js: 1.2.0
 
   postcss@8.4.49:
     dependencies:
-      nanoid: 3.3.7
+      nanoid: 3.3.8
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
@@ -23652,8 +25566,18 @@ snapshots:
 
   reftools@1.1.9: {}
 
+  regenerate-unicode-properties@10.2.0:
+    dependencies:
+      regenerate: 1.4.2
+
+  regenerate@1.4.2: {}
+
   regenerator-runtime@0.14.1: {}
 
+  regenerator-transform@0.15.2:
+    dependencies:
+      '@babel/runtime': 7.24.7
+
   regexp-tree@0.1.27: {}
 
   regexp.prototype.flags@1.5.0:
@@ -23676,10 +25600,25 @@ snapshots:
       es-errors: 1.3.0
       set-function-name: 2.0.2
 
+  regexpu-core@6.2.0:
+    dependencies:
+      regenerate: 1.4.2
+      regenerate-unicode-properties: 10.2.0
+      regjsgen: 0.8.0
+      regjsparser: 0.12.0
+      unicode-match-property-ecmascript: 2.0.0
+      unicode-match-property-value-ecmascript: 2.2.0
+
+  regjsgen@0.8.0: {}
+
   regjsparser@0.10.0:
     dependencies:
       jsesc: 0.5.0
 
+  regjsparser@0.12.0:
+    dependencies:
+      jsesc: 3.0.2
+
   reinterval@1.1.0: {}
 
   relateurl@0.2.7: {}
@@ -23706,6 +25645,14 @@ snapshots:
 
   require-from-string@2.0.2: {}
 
+  require-in-the-middle@7.4.0:
+    dependencies:
+      debug: 4.3.7
+      module-details-from-path: 1.0.3
+      resolve: 1.22.8
+    transitivePeerDependencies:
+      - supports-color
+
   requires-port@1.0.0: {}
 
   resolve-cwd@3.0.0:
@@ -23737,9 +25684,9 @@ snapshots:
 
   ret@0.1.15: {}
 
-  retry-axios@2.6.0(axios@1.7.4(debug@4.3.7)):
+  retry-axios@2.6.0(axios@1.7.4):
     dependencies:
-      axios: 1.7.4(debug@4.3.7)
+      axios: 1.7.4
 
   retry-request@7.0.2(encoding@0.1.13):
     dependencies:
@@ -24015,6 +25962,8 @@ snapshots:
       interpret: 1.4.0
       rechoir: 0.6.2
 
+  shimmer@1.2.1: {}
+
   should-equal@2.0.0:
     dependencies:
       should-type: 1.4.0
@@ -24184,6 +26133,8 @@ snapshots:
       smart-buffer: 4.2.0
     optional: true
 
+  sortablejs@1.14.0: {}
+
   source-map-js@1.2.0: {}
 
   source-map-js@1.2.1: {}
@@ -24537,6 +26488,16 @@ snapshots:
 
   supports-preserve-symlinks-flag@1.0.0: {}
 
+  svgo@3.3.2:
+    dependencies:
+      '@trysound/sax': 0.2.0
+      commander: 7.2.0
+      css-select: 5.1.0
+      css-tree: 2.3.1
+      css-what: 6.1.0
+      csso: 5.0.5
+      picocolors: 1.0.1
+
   swagger-ui-dist@5.11.0: {}
 
   swagger-ui-express@5.0.1(express@4.21.1):
@@ -24564,6 +26525,8 @@ snapshots:
 
   syslog-client@1.1.1: {}
 
+  systemjs@6.15.1: {}
+
   tailwindcss@3.4.3(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2)):
     dependencies:
       '@alloc/quick-lru': 5.2.0
@@ -24661,7 +26624,6 @@ snapshots:
       acorn: 8.14.0
       commander: 2.20.3
       source-map-support: 0.5.21
-    optional: true
 
   test-exclude@6.0.0:
     dependencies:
@@ -25057,6 +27019,17 @@ snapshots:
 
   undici@6.19.7: {}
 
+  unicode-canonical-property-names-ecmascript@2.0.1: {}
+
+  unicode-match-property-ecmascript@2.0.0:
+    dependencies:
+      unicode-canonical-property-names-ecmascript: 2.0.1
+      unicode-property-aliases-ecmascript: 2.1.0
+
+  unicode-match-property-value-ecmascript@2.2.0: {}
+
+  unicode-property-aliases-ecmascript@2.1.0: {}
+
   unique-filename@1.1.1:
     dependencies:
       unique-slug: 2.0.2
@@ -25089,7 +27062,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  unplugin-vue-components@0.27.3(@babel/parser@7.25.6)(rollup@4.24.0)(vue@3.5.13(typescript@5.7.2)):
+  unplugin-vue-components@0.27.3(@babel/parser@7.26.3)(rollup@4.24.0)(vue@3.5.13(typescript@5.7.2)):
     dependencies:
       '@antfu/utils': 0.7.10
       '@rollup/pluginutils': 5.1.0(rollup@4.24.0)
@@ -25103,7 +27076,7 @@ snapshots:
       unplugin: 1.11.0
       vue: 3.5.13(typescript@5.7.2)
     optionalDependencies:
-      '@babel/parser': 7.25.6
+      '@babel/parser': 7.26.3
     transitivePeerDependencies:
       - rollup
       - supports-color
@@ -25123,6 +27096,12 @@ snapshots:
       escalade: 3.1.1
       picocolors: 1.0.1
 
+  update-browserslist-db@1.1.1(browserslist@4.24.2):
+    dependencies:
+      browserslist: 4.24.2
+      escalade: 3.2.0
+      picocolors: 1.1.1
+
   upper-case-first@2.0.2:
     dependencies:
       tslib: 2.6.2
@@ -25247,6 +27226,11 @@ snapshots:
       - rollup
       - supports-color
 
+  vite-svg-loader@5.1.0(vue@3.5.13(typescript@5.7.2)):
+    dependencies:
+      svgo: 3.3.2
+      vue: 3.5.13(typescript@5.7.2)
+
   vite@5.4.11(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1):
     dependencies:
       esbuild: 0.24.0
@@ -25438,6 +27422,11 @@ snapshots:
     optionalDependencies:
       typescript: 5.7.2
 
+  vuedraggable@4.1.0(vue@3.5.13(typescript@5.7.2)):
+    dependencies:
+      sortablejs: 1.14.0
+      vue: 3.5.13(typescript@5.7.2)
+
   w3c-keyname@2.2.6: {}
 
   w3c-xmlserializer@3.0.0:
@@ -25586,8 +27575,8 @@ snapshots:
 
   with@7.0.2:
     dependencies:
-      '@babel/parser': 7.25.6
-      '@babel/types': 7.25.6
+      '@babel/parser': 7.26.2
+      '@babel/types': 7.26.0
       assert-never: 1.2.1
       babel-walk: 3.0.0-canary-5
 
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index e3492f37f5ec4..6888cae7ae5f2 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -5,8 +5,7 @@ packages:
   - cypress
 
 catalog:
-  '@sentry/integrations': 7.87.0
-  '@sentry/node': 7.87.0
+  '@sentry/node': 8.42.0
   '@types/basic-auth': ^1.1.3
   '@types/express': ^4.17.21
   '@types/lodash': ^4.14.195
@@ -21,7 +20,7 @@ catalog:
   iconv-lite: 0.6.3
   lodash: 4.17.21
   luxon: 3.4.4
-  nanoid: 3.3.6
+  nanoid: 3.3.8
   typedi: 0.10.0
   uuid: 10.0.0
   xml2js: 0.6.2
diff --git a/turbo.json b/turbo.json
index cd38cc5045f22..911702b0e0b1d 100644
--- a/turbo.json
+++ b/turbo.json
@@ -31,6 +31,7 @@
 				"@n8n/client-oauth2#lint",
 				"@n8n/imap#lint",
 				"@n8n/permissions#lint",
+				"@n8n/task-runner#lint",
 				"n8n-workflow#lint",
 				"n8n-core#lint",
 				"n8n-node-dev#lint",
@@ -59,6 +60,7 @@
 				"@n8n/client-oauth2#test",
 				"@n8n/imap#test",
 				"@n8n/permissions#test",
+				"@n8n/task-runner#test",
 				"n8n-workflow#test",
 				"n8n-core#test",
 				"n8n#test"